------------------------------------------------------------ revno: 3845 [merge] tags: clone-mysql-5.1.47-ndb-7.1.8-src-build committer: Jonas Oreland branch nick: telco-7.1 timestamp: Wed 2010-09-29 13:49:00 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.76.10 [merge] tags: clone-mysql-5.1.47-ndb-7.0.19-src-build committer: Jonas Oreland branch nick: telco-7.0 timestamp: Wed 2010-09-29 13:01:55 +0200 message: ndb merge 63 to 70 ------------------------------------------------------------ revno: 2585.162.2 [merge] tags: clone-mysql-5.1.47-ndb-6.3.38-src-build committer: Martin Skold branch nick: mysql-5.1-telco-6.3 timestamp: Wed 2010-09-29 12:55:48 +0200 message: Merge ------------------------------------------------------------ revno: 2585.162.1 committer: Martin Skold branch nick: mysql-5.1-telco-6.3 timestamp: Mon 2010-09-13 10:06:11 +0200 message: Bug#55909 ndb_binlog_index missing entry on normal mysqld shutdown: Added retry during shutdown ------------------------------------------------------------ revno: 3844 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Wed 2010-09-29 12:45:20 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.76.9 committer: Jonas Oreland branch nick: telco-7.0 timestamp: Wed 2010-09-29 12:40:31 +0200 message: ndb - move NodeRestart to early in testNdbinfo, to avoid problem that mysqld doesnt reconnect after it has finished...makign check-testcase fail ------------------------------------------------------------ revno: 3362.76.8 committer: Jonas Oreland branch nick: telco-7.0 timestamp: Wed 2010-09-29 12:27:39 +0200 message: ndb - fix huge race condition in ndb_team.ndb_restart ------------------------------------------------------------ revno: 3843 [merge] committer: Martin Zaun branch nick: ndb-7.1 timestamp: Wed 2010-09-29 03:07:40 -0700 message: crund - minor improvements ------------------------------------------------------------ revno: 3839.1.4 committer: Martin Zaun branch nick: ndb-7.1-opt32 timestamp: Wed 2010-09-29 03:03:03 -0700 message: crund - minor improvements to Readmes, config files, and code ------------------------------------------------------------ revno: 3839.1.3 committer: Martin Zaun branch nick: ndb-7.1-opt32 timestamp: Wed 2010-09-29 03:02:15 -0700 message: crund - minor improvements to Readmes, config files, and code ------------------------------------------------------------ revno: 3839.1.2 committer: Martin Zaun branch nick: ndb-7.1-opt32 timestamp: Wed 2010-09-29 02:10:34 -0700 message: crund - updated TWS benchmark Readme and configuration files ------------------------------------------------------------ revno: 3839.1.1 committer: Martin Zaun branch nick: ndb-7.1-opt32 timestamp: Wed 2010-09-29 02:09:26 -0700 message: crund - updated TWS benchmark Readme and configuration files ------------------------------------------------------------ revno: 3842 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-09-29 10:55:27 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.76.7 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-09-29 10:54:47 +0200 message: Merge 7.0-bug54226 to 7.0 ------------------------------------------------------------ revno: 3362.69.82 committer: Magnus Bl?udd branch nick: 7.0-bug54226 timestamp: Wed 2010-09-29 10:45:11 +0200 message: Bug#54226 Can't force graceful node STOP that would bring down the cluster - Make it possible to force stop and restart although it would mean that all nodes in the cluster need to be stopped/restarted - Add new MGMAPI functions 'ndb_mgm_stop4' and 'ndb_mgm_restart4' which take a force flag indicating that the node(s) should be gracefully shutdown even if it means shutting down the whole cluster. - Add -F flag to " STOP" and " RESTART" in ndb_mgm> Additionally: - Move version checks in mgmapi _after_ CHECK_CONNECTED, this was a bug in ndb_mgm_start_backup and ndb_mgm_get_configuration. - Add handle::mgmd_version() so it's easy to check version against NDB_MAKE_VERSION(Y,Y,Y) and also make it possible to add asserts for connected and version fetched. - Remove mgmapi only version define from ndb_version.h.in - Reset the mgmd_version_xxx variables as part of connect to safeguard against a handle being used for reconnect to ndb_mgmd with potentially different version. - Add testcase for forced stop and restart ------------------------------------------------------------ revno: 3362.69.81 committer: Magnus Bl?udd branch nick: 7.0-bug54226 timestamp: Wed 2010-09-29 10:32:18 +0200 message: Bug#57088 missing SET_ERROR calls in ndb_mgm_get_version() - Replace the printouts for proper calls to SET_ERROR ------------------------------------------------------------ revno: 3362.69.80 committer: Magnus Bl?udd branch nick: 7.0-bug54226 timestamp: Wed 2010-09-29 10:27:38 +0200 message: Bug#57089 SET_ERROR without CHECK_HANDLE in 'ndb_mgm_stop/restart' - remove the erreounos SET_ERROR calls ------------------------------------------------------------ revno: 3841 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-09-29 09:59:05 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.76.6 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-09-29 09:54:14 +0200 message: Bug#57087 ndb(mt)d printout about "Failed to create directory" during restart - Use ignore_existing flag for NdbDir::create so it don't print the error message when directory already exists. - Add ending new line to the error messages ------------------------------------------------------------ revno: 3840 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Wed 2010-09-29 09:40:55 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.76.5 [merge] committer: Jonas Oreland branch nick: telco-7.0 timestamp: Wed 2010-09-29 09:39:42 +0200 message: ndb merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.63 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Wed 2010-09-29 09:36:31 +0200 message: ndb - bug#55641 - followup fix, fix check_switchover ------------------------------------------------------------ revno: 3839 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Tue 2010-09-28 11:53:19 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.76.4 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Tue 2010-09-28 11:52:48 +0200 message: Merge 6.3 -> 7.0 ------------------------------------------------------------ revno: 2585.159.62 committer: Magnus Bl?udd branch nick: 6.3 timestamp: Tue 2010-09-28 11:50:38 +0200 message: BUG#56116 Remove unmaintained file - Removing the 'cluster_change_hist.txt' file since it has not been maintained since 2007 ------------------------------------------------------------ revno: 3838 [merge] committer: Martin Zaun branch nick: ndb-7.1 timestamp: Tue 2010-09-28 01:21:57 -0700 message: ndbjtie - merge minor fixes of jtie unit tests ------------------------------------------------------------ revno: 3837.1.1 committer: Martin Zaun branch nick: ndb-7.1-opt64-gcc timestamp: Tue 2010-09-28 01:19:43 -0700 message: ndbjtie - minor fixes of jtie unit tests (removed static object construction) ------------------------------------------------------------ revno: 3837 [merge] committer: Martin Zaun branch nick: ndb-7.1 timestamp: Tue 2010-09-28 00:12:26 -0700 message: ndbjtie - merge fix jtie unit test ------------------------------------------------------------ revno: 3836.1.1 committer: Martin Zaun branch nick: ndb-7.1-opt64-gcc-cxx timestamp: Tue 2010-09-28 00:10:20 -0700 message: ndbjtie - fix jtie unit tests on linux and macosx when building with CXX=gcc ------------------------------------------------------------ revno: 3836 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-09-27 10:54:57 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.76.3 [merge] committer: Jonas Oreland branch nick: telco-7.0 timestamp: Mon 2010-09-27 10:52:07 +0200 message: ndb merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.61 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-09-27 10:50:20 +0200 message: ndb - bug-56961 fix bug in bugfix found by autotest ------------------------------------------------------------ revno: 3835 [merge] committer: Martin Zaun branch nick: ndb-7.1 timestamp: Sun 2010-09-26 23:05:24 -0700 message: crund - merge from ndb-7.1-opt32 to ndb-7.1 ------------------------------------------------------------ revno: 3812.1.2 committer: Martin Zaun branch nick: ndb-7.1-opt32 timestamp: Sun 2010-09-26 22:58:05 -0700 message: crund - added tws benchmark code and build scripts ------------------------------------------------------------ revno: 3812.1.1 committer: Martin Zaun branch nick: ndb-7.1-opt32 timestamp: Sun 2010-09-26 22:31:17 -0700 message: crund - minor code and scripts improvements ------------------------------------------------------------ revno: 3834 [merge] committer: Pekka Nousiainen branch nick: ms-bug56829-71 timestamp: Fri 2010-09-24 22:53:35 +0300 message: merge ------------------------------------------------------------ revno: 3362.76.2 [merge] committer: Pekka Nousiainen branch nick: ms-bug56829-70 timestamp: Fri 2010-09-24 22:45:05 +0300 message: merge ------------------------------------------------------------ revno: 3833 [merge] committer: Pekka Nousiainen branch nick: ms-bug56829-71 timestamp: Fri 2010-09-24 22:19:17 +0300 message: merge ------------------------------------------------------------ revno: 3362.76.1 [merge] committer: Pekka Nousiainen branch nick: ms-bug56829-70 timestamp: Fri 2010-09-24 21:19:07 +0300 message: merge ------------------------------------------------------------ revno: 2585.159.60 committer: Pekka Nousiainen branch nick: ms-bug56829-63 timestamp: Fri 2010-09-24 15:16:36 +0300 message: bug#56829 a03_fix.diff tests.txt needs blank line at end ------------------------------------------------------------ revno: 2585.159.59 committer: Pekka Nousiainen branch nick: ms-bug56829-63 timestamp: Fri 2010-09-24 14:06:19 +0300 message: bug#56829 a02_patch.diff the patch ------------------------------------------------------------ revno: 2585.159.58 committer: Pekka Nousiainen branch nick: ms-bug56829-63 timestamp: Fri 2010-09-24 14:01:03 +0300 message: bug#56829 a01_test.diff testIndex -n Bug56829 ------------------------------------------------------------ revno: 3832 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Fri 2010-09-24 17:11:35 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.79 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Fri 2010-09-24 17:10:46 +0200 message: ndb - add missing include of sys/stat.h ------------------------------------------------------------ revno: 3831 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Thu 2010-09-23 14:07:07 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.78 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-09-23 13:57:39 +0200 message: ndb - declare __gcov_flush to have C linkage to avoid link problem when compiling stacktrace.c with C++ compiler. ------------------------------------------------------------ revno: 3830 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Thu 2010-09-23 11:46:07 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.77 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-09-23 11:36:19 +0200 message: ndb - merge in more seagull patches for storage/ndb ------------------------------------------------------------ revno: 3362.71.30 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Wed 2010-08-18 15:09:14 +0200 message: ndb - fixup include files for azio.c, it does not need anything internal from mysys so it can use the public header ------------------------------------------------------------ revno: 3362.71.29 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Wed 2010-08-18 15:06:03 +0200 message: ndb - undef DONT_DEFINE_VOID before including stacktrace.c sicne that file will turn it off itself if needed ------------------------------------------------------------ revno: 3362.71.28 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Wed 2010-08-18 14:55:42 +0200 message: ndb - Add workaround to ndb_global.h to avoid that my_global.h redefines VOID on Windows since that causes compile errors in Windows header files (that uses VOID as a type) ------------------------------------------------------------ revno: 3362.71.27 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Wed 2010-08-18 14:15:36 +0200 message: ndb - move the declaration of ENOTSUP to the only file where it's used in order to reduce MCP ------------------------------------------------------------ revno: 3362.71.26 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Wed 2010-08-18 10:19:43 +0200 message: ndb - move the 'posix_memalign' function into the only file where it's used(especially since it's "hacked" version) on some platforms. ------------------------------------------------------------ revno: 3362.71.25 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Tue 2010-08-17 14:27:44 +0200 message: ndb - Remove unused file transproxy.cpp and it's commented out build rules ------------------------------------------------------------ revno: 3362.71.24 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Tue 2010-08-17 14:25:20 +0200 message: ndb - Remove uneccessary include in ndbfs/ - Remove unused file CircularIndex.cpp and CircularIndex.hpp ------------------------------------------------------------ revno: 3362.71.23 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Tue 2010-08-17 14:19:46 +0200 message: ndb - remove use of my_malloc and my_free in testIndexStat ------------------------------------------------------------ revno: 3362.71.22 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Tue 2010-08-17 14:18:32 +0200 message: ndb - Change to use malloc and free in ndb_restore ------------------------------------------------------------ revno: 3362.71.21 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Tue 2010-08-17 14:17:24 +0200 message: ndb - Hide that azlib include mysys_priv.h in it's impl. file. - Remove unused includes ------------------------------------------------------------ revno: 3362.71.20 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Tue 2010-08-17 13:56:12 +0200 message: Bug#55838 Memory leak in ndb_mgm> "LOG BLOCK=" - A vector of strdup'ed memory was returned from function and never freed by caller - Rewrite to use Vector to get automatic free. ------------------------------------------------------------ revno: 3362.71.19 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Tue 2010-08-17 13:54:21 +0200 message: ndb - Remove the "my_auto_ptr" and include of my_sys.h from NdbAutoPtr.hpp - Replace my_strdup with strdup and my_free with free. - Remove the need for strdup in " ERROR ". - Remove the need for strdup at all in " LOG BLOCK = >" - Return error and print message if 'strdup' fails ------------------------------------------------------------ revno: 3362.69.76 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-09-23 11:22:40 +0200 message: Null merge already fixed my_thread_id problem ------------------------------------------------------------ revno: 3362.71.18 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Tue 2010-08-17 13:50:55 +0200 message: ndb - my_thread_id is not a function but simply a typedef. Wonder how it worked at all(maybe it didn't)? - Use pthread_self and pthread_equal to implement the desired behaviour. ------------------------------------------------------------ revno: 3362.69.75 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-09-23 11:14:32 +0200 message: ndb - merge in seagull patches for storage/ndb ------------------------------------------------------------ revno: 3362.71.17 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Tue 2010-08-17 12:55:34 +0200 message: ndb - remove unused define THREAD_CONTAINER_SIZE from NdbThread.h ------------------------------------------------------------ revno: 3362.69.74 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-09-23 11:10:53 +0200 message: ndb - fix spelling error and remove windows newline ------------------------------------------------------------ revno: 3362.69.73 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-09-23 11:02:47 +0200 message: ndb - add support for ignoring create of directory which already exists to NdbDir - use the new functionality from atrt which create directories multiple times ------------------------------------------------------------ revno: 3829 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Thu 2010-09-23 10:34:07 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.72 committer: Jonas Oreland branch nick: telco-7.0 timestamp: Thu 2010-09-23 10:24:52 +0200 message: ndb - "rm -v" is not portable (even on unix) ------------------------------------------------------------ revno: 3362.69.71 [merge] committer: Magnus Bl?udd branch nick: mysql-5.1-telco-7.0 timestamp: Thu 2010-09-23 10:06:19 +0200 message: Merge ------------------------------------------------------------ revno: 3828 [merge] committer: Magnus Bl?udd branch nick: mysql-5.1-telco-7.1 timestamp: Thu 2010-09-23 09:53:01 +0200 message: Merge ------------------------------------------------------------ revno: 3825.1.2 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Thu 2010-09-23 09:37:15 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.75.2 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-09-23 09:31:51 +0200 message: ndb - Merge NdbDir::chdir to 7.0 ------------------------------------------------------------ revno: 3362.71.16 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Tue 2010-08-17 11:04:41 +0200 message: ndb - Add 'NdbDir::chdir' which is a portable 'chdir' - Use 'NdbDir::chdir' instead of 'my_setwd' - Print warning when chdir fails, but otherwise ignore the error like before. - Add tests to NdbDir-t - Move the close of EvnentLogger in MgmtSrvr to just before the new handler(s) are create to allow warning to be seen if chdir fails. ------------------------------------------------------------ revno: 3825.1.1 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Thu 2010-09-23 09:20:58 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.75.1 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-09-23 09:20:30 +0200 message: Merge 7.0-seagull-move-execute_count_inc -> 7.0 ------------------------------------------------------------ revno: 3362.74.3 committer: Magnus Bl?udd branch nick: 7.0-seagull-move-execute_count_inc timestamp: Wed 2010-09-22 17:27:31 +0200 message: ndb tests for mtr - move even more include files used only in suite/ndb from include/ to suite/ndb/include ------------------------------------------------------------ revno: 3362.74.2 committer: Magnus Bl?udd branch nick: 7.0-seagull-move-execute_count_inc timestamp: Wed 2010-09-22 14:12:14 +0200 message: ndb tests for mtr - move more include files used only in suite/ndb from include/ to suite/ndb/include ------------------------------------------------------------ revno: 3362.74.1 committer: Magnus Bl?udd branch nick: 7.0-seagull-move-execute_count_inc timestamp: Wed 2010-09-22 13:36:01 +0200 message: ndb tests for mtr - move include files used only in suite/ndb from include/ to suite/ndb/include ------------------------------------------------------------ revno: 3827 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Thu 2010-09-23 09:33:08 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.70 [merge] committer: Jonas Oreland branch nick: telco-7.0 timestamp: Thu 2010-09-23 09:31:28 +0200 message: ndb merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.57 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Thu 2010-09-23 09:30:29 +0200 message: ndb - fix win64 compiler warning ------------------------------------------------------------ revno: 3826 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Thu 2010-09-23 09:09:38 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.69 committer: Jonas Oreland branch nick: telco-7.0 timestamp: Thu 2010-09-23 09:07:38 +0200 message: ndb - fix a bunch of DEBUG_REDO printouts ------------------------------------------------------------ revno: 3825 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Thu 2010-09-23 08:29:43 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.68 [merge] committer: Jonas Oreland branch nick: telco-7.0 timestamp: Thu 2010-09-23 08:23:37 +0200 message: ndb - merge bug#56961 into 70 ------------------------------------------------------------ revno: 3362.73.4 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Thu 2010-09-23 08:22:44 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.56 [merge] committer: Jonas Oreland branch nick: telco-6.3 timestamp: Thu 2010-09-23 08:17:24 +0200 message: ndb - bug#56961 - fix redo invalidation handling end of file not written ------------------------------------------------------------ revno: 3362.73.3 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Thu 2010-09-23 08:20:39 +0200 message: ndb - merge 70-main ------------------------------------------------------------ revno: 3362.73.2 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-09-21 08:07:06 +0200 message: ndb merge 70 to 70-redo-bug ------------------------------------------------------------ revno: 3362.73.1 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-09-20 15:09:18 +0200 message: ndb merge 63 to 70 ------------------------------------------------------------ revno: 2585.161.1 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-09-20 14:44:28 +0200 message: ndb - commit to autotest (redo bug) ------------------------------------------------------------ revno: 3824 committer: Bernd Ocklin branch nick: mysql-5.1-telco-7.1 timestamp: Wed 2010-09-22 20:36:02 +0200 message: fixing backslash classpaths ------------------------------------------------------------ revno: 3823 committer: Bernd Ocklin branch nick: mysql-5.1-telco-7.1 timestamp: Wed 2010-09-22 20:34:38 +0200 message: clusterj revno 328 ------------------------------------------------------------ revno: 3822 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-09-22 16:20:09 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.67 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-09-22 16:19:12 +0200 message: Merge 6.3 to 7.0 ------------------------------------------------------------ revno: 2585.159.55 committer: Magnus Bl?udd branch nick: 6.3 timestamp: Wed 2010-09-22 16:10:27 +0200 message: Bug#51310 ndb_mgm_get_version() not documented - Move the function out of DOXYGEN_SHOULD_SKIP_INTERNAL and add doxygen comments describing the function ------------------------------------------------------------ revno: 3821 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-09-22 15:35:02 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.66 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-09-22 15:28:20 +0200 message: ndb - merge in more seagull fixes for storage/ndb/ ------------------------------------------------------------ revno: 3362.71.15 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Mon 2010-08-16 19:07:54 +0200 message: ndb - Use my_progname in ErrorReporter without including all of mysys ------------------------------------------------------------ revno: 3362.71.14 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Mon 2010-08-16 19:06:06 +0200 message: ndb - pass name of the program as first argument to 'angel_run' so it knows which path to use when respawning(without looking at global variable my_progname) ------------------------------------------------------------ revno: 3362.71.13 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Mon 2010-08-16 19:02:58 +0200 message: ndb - remove the program name argument from 'ndb_opt_set_usage_funcs', it should already have been set(currently in mysys's my_progname variable) - remove the progname argument from 'ndb_short_usage_sub' since the name is already known ------------------------------------------------------------ revno: 3362.71.12 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Mon 2010-08-16 16:11:09 +0200 message: ndb - rename arguments to 'ndb_opt_set_usage_funcs' and 'ndb_short_usage_sub' to make clear that they don't use the global variable "my_progname" ------------------------------------------------------------ revno: 3362.71.11 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Mon 2010-08-16 15:54:16 +0200 message: ndb - move include out of "extern C" ------------------------------------------------------------ revno: 3362.71.10 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Mon 2010-08-16 15:51:31 +0200 message: ndb - Remove the unimplemented debug functions and help text from ndb_mgm ------------------------------------------------------------ revno: 3362.71.9 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Mon 2010-08-16 12:25:27 +0200 message: ndb - Add wrapper function for 'strnxfrm' to NdbSqlUtil since it changes prototype in future MySQL Server - Use 'ndb_strnxfrm' in favor of 'strnxfrm' directly ------------------------------------------------------------ revno: 3362.71.8 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Mon 2010-08-16 12:18:33 +0200 message: ndb - compile mysys/stacktrace.c into all NdbTap unit tests ------------------------------------------------------------ revno: 3820 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Wed 2010-09-22 14:11:52 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.65 [merge] committer: Jonas Oreland branch nick: telco-7.0 timestamp: Wed 2010-09-22 14:10:34 +0200 message: ndb merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.54 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Wed 2010-09-22 14:06:29 +0200 message: ndb - bug#56840 - clear dict cache even if no table was present for distributed drop database ------------------------------------------------------------ revno: 3819 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Wed 2010-09-22 14:01:30 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.64 committer: Jonas Oreland branch nick: telco-7.0 timestamp: Wed 2010-09-22 13:53:53 +0200 message: ndb - move "testMgmd -n Bug45495" last in list for more race-hunting ------------------------------------------------------------ revno: 3362.69.63 committer: Jonas Oreland branch nick: telco-7.0 timestamp: Wed 2010-09-22 13:52:37 +0200 message: ndb - fix c++ comment in c file ------------------------------------------------------------ revno: 3818 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-09-22 12:08:39 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.62 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-09-22 12:07:28 +0200 message: Merge in seagull patches for storage/ndb/ ------------------------------------------------------------ revno: 3362.71.7 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Mon 2010-08-16 12:15:43 +0200 message: ndb - move includes out of "extern C" - remove unnecessary includes ------------------------------------------------------------ revno: 3362.71.6 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Fri 2010-08-13 15:04:47 +0200 message: ndb - remove use of my_malloc, my_strdup and my_free in MGM API, replace them with malloc, strdup and free respectively ------------------------------------------------------------ revno: 3362.71.5 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Fri 2010-08-13 14:42:51 +0200 message: ndb - Implement support for millisecond sleep directly in 'NdbSleep_MilliSleep', this avoids the need to convert back and forth to microseconds and avoids the need to include my_sys for this. The my_sys implementation also has a scary busy wait sleep if no select call is found which is now not implemented in NdbSleep ------------------------------------------------------------ revno: 3817 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-09-22 11:22:33 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.61 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-09-22 11:22:08 +0200 message: Merge 7.0 -> 7.0 ------------------------------------------------------------ revno: 3362.72.1 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-09-22 11:19:56 +0200 message: Merge bug#56890 to 7.0 and move all the code into ndbd.cpp ------------------------------------------------------------ revno: 2585.159.53 committer: Magnus Bl?udd branch nick: 6.3 timestamp: Wed 2010-09-22 11:16:46 +0200 message: Bug#56890 Calling typedef my_thread_id in ndbd.cpp - Replace the my_thread_id call and instead use 'pthread_self' and 'pthread_equal' to check if same thread is catching a signal - The thread_id variable can't be initialized so instead a bool variable is used to tell if thread_id has been set. ------------------------------------------------------------ revno: 3816 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-09-22 10:53:04 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.60 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-09-22 10:48:10 +0200 message: ndb - merge in seagull patches for 'NdbCondition_init' ------------------------------------------------------------ revno: 3362.71.4 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Fri 2010-08-13 14:34:57 +0200 message: ndb - remove the use of pthread_mutex and pthread_cond directly, instead use the NdbMutex and NdbCondition functions in portlib ------------------------------------------------------------ revno: 3362.71.3 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Fri 2010-08-13 14:31:20 +0200 message: ndb - Rename 'NdbCondition_Init' -> 'NdbCondition_initialize' (the condition library init function) - Add 'NdbCondition_Init' function used to initialize a condition created on the stack or with file storage ------------------------------------------------------------ revno: 3815 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-09-21 14:03:52 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.59 committer: Jonas Oreland branch nick: telco-7.0 timestamp: Tue 2010-09-21 14:02:05 +0200 message: ndb - fix another race in testMgmd ------------------------------------------------------------ revno: 3814 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-09-21 09:39:10 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.58 committer: Jonas Oreland branch nick: telco-7.0 timestamp: Tue 2010-09-21 09:36:08 +0200 message: ndb - kill a few compiler warnings ------------------------------------------------------------ revno: 3813 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-09-21 08:05:28 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.57 committer: Jonas Oreland branch nick: telco-7.0 timestamp: Tue 2010-09-21 08:04:04 +0200 message: ndb - remove compile problems on a few platforms ------------------------------------------------------------ revno: 3812 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Sat 2010-09-18 16:13:51 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.56 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Sat 2010-09-18 16:11:56 +0200 message: ndb - fix race condition in *testcase* for bug-56844/45495 ------------------------------------------------------------ revno: 3811 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Fri 2010-09-17 16:46:47 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.55 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Fri 2010-09-17 16:44:51 +0200 message: ndb merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.52 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Fri 2010-09-17 16:01:17 +0200 message: ndb - bug#56841 - serialize show table status relative create/drop table ------------------------------------------------------------ revno: 3362.69.54 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Fri 2010-09-17 16:30:59 +0200 message: ndb - bug#56844 - make config change protocol contact nodes in order to avoid deadlock ------------------------------------------------------------ revno: 3810 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Thu 2010-09-16 12:54:29 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.53 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Thu 2010-09-16 12:53:40 +0200 message: ndb - increase tablespace size in ndb_partition_range as it's spuriously gets full ------------------------------------------------------------ revno: 3809 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Wed 2010-09-15 21:34:55 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.52 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Wed 2010-09-15 21:31:03 +0200 message: ndb merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.51 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Wed 2010-09-15 21:09:34 +0200 message: ndb - fix warnings... ------------------------------------------------------------ revno: 3362.69.51 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Wed 2010-09-15 20:38:13 +0200 message: ndb merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.50 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Wed 2010-09-15 20:26:11 +0200 message: ndb - fix race in ndb_multi, add more extra-logging printouts add assert if schema distribution times out (debug) ------------------------------------------------------------ revno: 3808 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.1 timestamp: Wed 2010-09-15 10:45:48 +0100 message: Merge 7.0->7.1 ------------------------------------------------------------ revno: 3362.69.50 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.0 timestamp: Wed 2010-09-15 10:43:39 +0100 message: Merge 6.3->7.0 ------------------------------------------------------------ revno: 2585.159.49 committer: Frazer Clement branch nick: mysql-5.1-telco-6.3 timestamp: Wed 2010-09-15 10:41:50 +0100 message: Fix new warning introduced ------------------------------------------------------------ revno: 3807 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.1 timestamp: Tue 2010-09-14 19:30:45 +0100 message: Merge 7.0->7.1 ------------------------------------------------------------ revno: 3362.69.49 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.0 timestamp: Tue 2010-09-14 19:26:52 +0100 message: Merge 6.3->7.0 ------------------------------------------------------------ revno: 2585.159.48 committer: Frazer Clement branch nick: mysql-5.1-telco-6.3 timestamp: Tue 2010-09-14 19:19:46 +0100 message: Bug#56770 Ndb : Per-row GCIs changed after System Restart Per-row GCIs are restored in raw format from LCP files. The normal operation commit processing then tramples the row GCI. This is avoided by temporarily disabling GCI 'maintenance' during LCP restore in TUP. The testRestartGCI testcase is modified and extended to : 1) Delay when inserting rows to rows with different GCIs in the DB 2) Check that the row GCIs are exactly what they should be 3) Restart twice First time (most likely) data will be restored from Redo Second time data will be restored from LCP as the first restart included an LCP step. Recommit with more frugal use of borrowed storage space to ease 7.0 merge. ------------------------------------------------------------ revno: 3806 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.1 timestamp: Tue 2010-09-14 17:26:15 +0100 message: Merge 7.0->7.1 ------------------------------------------------------------ revno: 3362.69.48 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.0 timestamp: Tue 2010-09-14 17:10:14 +0100 message: Merge 6.3->7.0 ------------------------------------------------------------ revno: 2585.159.47 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-6.3 timestamp: Tue 2010-09-14 16:32:39 +0100 message: Merge 6.2->6.3 ------------------------------------------------------------ revno: 2572.82.29 committer: Frazer Clement branch nick: mysql-5.1-telco-6.2 timestamp: Tue 2010-09-14 15:31:39 +0100 message: Fix compile error in 6.2 + unused arg in later versions ------------------------------------------------------------ revno: 3805 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-09-14 13:09:52 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.47 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-09-14 13:05:50 +0200 message: ndb merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.46 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Tue 2010-09-14 12:58:58 +0200 message: ndb - fix mem leak in patch for bug-56763 ------------------------------------------------------------ revno: 3804 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-09-14 12:00:07 +0200 message: ndb - merge 71-main ------------------------------------------------------------ revno: 3802.1.2 committer: Bernhard Ocklin branch nick: mysql-5.1-telco-7.1 timestamp: Tue 2010-09-14 11:45:53 +0200 message: cleanup subscriber table ------------------------------------------------------------ revno: 3802.1.1 committer: Bernhard Ocklin branch nick: mysql-5.1-telco-7.1 timestamp: Tue 2010-09-14 11:43:52 +0200 message: disable CoordinatedTransactionIdVariableTest ------------------------------------------------------------ revno: 3803 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-09-14 11:58:34 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.46 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-09-14 11:57:29 +0200 message: ndb merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.45 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Tue 2010-09-14 11:25:48 +0200 message: ndb - speedup DDL by using force send=1...this improves startup time for mysqld with many tables a lot ------------------------------------------------------------ revno: 3362.69.45 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-09-14 11:38:41 +0200 message: ndb - change order and increase buffer length to hopefully track random "testMgmd -n Bug45495" failures ------------------------------------------------------------ revno: 3802 committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-09-14 09:03:56 +0200 message: ndb - attempt to fix "warning(junit.framework.TestSuite)junit.framework.AssertionFailedError: No tests found in testsuite.clusterj.CoordinatedTransactionIdVariableTest" by creating an empty test ------------------------------------------------------------ revno: 3801 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-09-14 08:56:56 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.44 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-09-14 08:54:47 +0200 message: ndb merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.44 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Tue 2010-09-14 08:51:53 +0200 message: disable rpl_ndb_typeconv_all on solaris also in 6.3 ------------------------------------------------------------ revno: 2585.159.43 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Tue 2010-09-14 08:45:13 +0200 message: ndb - bug#56763 - fix(unf-k) schema_subscribers-bitmask handling ------------------------------------------------------------ revno: 3800 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-09-13 16:35:15 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.43 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-09-13 16:31:30 +0200 message: ndb merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.42 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-09-13 16:25:36 +0200 message: ndb - speedup schema op syncronization by force-starting micro-gcp after update_slock (etc) ------------------------------------------------------------ revno: 3362.69.42 committer: Bernd Ocklin branch nick: mysql-5.1-telco-7.0 timestamp: Mon 2010-09-13 11:39:27 +0200 message: disable rpl_ndb.rpl_ndb_typeconv_* ------------------------------------------------------------ revno: 3799 committer: Bernd Ocklin branch nick: mysql-5.1-telco-7.1 timestamp: Mon 2010-09-13 13:39:01 +0200 message: remove deleted file from clusterj-test/Makefile.am ------------------------------------------------------------ revno: 3798 committer: Bernd Ocklin branch nick: mysql-5.1-telco-7.1 timestamp: Mon 2010-09-13 12:48:19 +0200 message: clusterj revno 321 ------------------------------------------------------------ revno: 3797 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Thu 2010-09-09 15:37:01 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.41 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Thu 2010-09-09 15:36:06 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.41 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Thu 2010-09-09 15:33:37 +0200 message: ndb - bug#56691 backport mysqldump add-drop-trigger to telco-6.3 ------------------------------------------------------------ revno: 3796 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-09-07 12:14:32 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.40 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-09-07 12:13:06 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.40 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Tue 2010-09-07 12:10:36 +0200 message: ndb - add ATTRIBUTE_NORETURN on functions which aborts ------------------------------------------------------------ revno: 2585.159.39 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Tue 2010-09-07 09:58:29 +0200 message: ndb - bug#39162 - reenable test ------------------------------------------------------------ revno: 3362.69.39 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-09-07 12:04:36 +0200 message: ndb - add AreaAllocator to 70-main ------------------------------------------------------------ revno: 3362.69.38 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-09-07 11:54:47 +0200 message: ndb - ressurect tup-scan of varsize pages ------------------------------------------------------------ revno: 3795 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-09-07 08:47:06 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.37 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-09-07 08:45:41 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.38 [merge] committer: Jonas Oreland branch nick: telco-6.3 timestamp: Tue 2010-09-07 08:41:39 +0200 message: ndb - merge 62 to 63 ------------------------------------------------------------ revno: 2572.82.28 committer: Jonas Oreland branch nick: 62-akk timestamp: Tue 2010-09-07 08:39:57 +0200 message: ndb - bug#56449 - fix copyright header sha1.c ------------------------------------------------------------ revno: 2572.82.27 committer: Jonas Oreland branch nick: 62-akk timestamp: Tue 2010-09-07 08:39:03 +0200 message: ndb - bug#56450 - fix copyright header sha1.h ------------------------------------------------------------ revno: 3362.69.36 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-09-07 08:44:00 +0200 message: ndb - read/update dyn-attr, use AttributeDescptor::getDiskBased instead of hard-coded MM ------------------------------------------------------------ revno: 3794 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-09-06 11:46:20 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.35 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-09-06 11:45:35 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.37 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-09-06 11:44:48 +0200 message: ndb - bug#56579 - remove accidently left incorrect assert ------------------------------------------------------------ revno: 3793 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-09-06 10:22:22 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.34 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-09-06 10:20:33 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.36 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-09-06 10:14:08 +0200 message: ndb - bug#56579 - handle case where all node reply SUB_START_REF ------------------------------------------------------------ revno: 3792 [merge] committer: MZ branch nick: ndb-7.1 timestamp: Fri 2010-09-03 18:37:09 -0700 message: crund - minor improvements ------------------------------------------------------------ revno: 3780.1.2 committer: MZ branch nick: ndb-7.1-opt1 timestamp: Fri 2010-09-03 18:34:54 -0700 message: crund - minor improvements ------------------------------------------------------------ revno: 3780.1.1 committer: MZ branch nick: ndb-7.1-opt1 timestamp: Fri 2010-09-03 18:20:28 -0700 message: crund - minor improvements ------------------------------------------------------------ revno: 3791 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Fri 2010-09-03 08:07:12 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.33 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Fri 2010-09-03 07:35:51 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.35 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Fri 2010-09-03 07:30:17 +0200 message: ndb - bug#56524 - sizeof(CopyTuple::Changemask) might not be equal to cols, due to online add column ------------------------------------------------------------ revno: 3790 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.1 timestamp: Thu 2010-09-02 10:56:06 +0100 message: Merge 7.0->7.1 ------------------------------------------------------------ revno: 3362.69.32 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.0 timestamp: Thu 2010-09-02 10:53:35 +0100 message: Merge 6.3->7.0 ------------------------------------------------------------ revno: 2585.159.34 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-6.3 timestamp: Thu 2010-09-02 10:50:57 +0100 message: Merge 6.2->6.3 ------------------------------------------------------------ revno: 2572.82.26 committer: Frazer Clement branch nick: mysql-5.1-telco-6.2 timestamp: Thu 2010-09-02 10:47:49 +0100 message: bug#52313 selects retrieving many blob rows take too long freeing allocated RAM Release operations between Scan nextResult() calls. This frees internal operations created to read Blob part table rows. This avoids excessive memory consumption when scanning a table containing Blobs. A new bug (56488) NdbApi : Improve Blob/internal operation management has been created to implement a more general solution to this and other problems at the NdbApi level. ------------------------------------------------------------ revno: 3789 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Thu 2010-09-02 08:53:59 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.31 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-09-02 08:52:59 +0200 message: Merge ------------------------------------------------------------ revno: 3362.71.2 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Fri 2010-08-13 14:24:32 +0200 message: ndb - remove unused includes from NDBT_Test.cpp ------------------------------------------------------------ revno: 3362.71.1 committer: Magnus Bl?udd branch nick: 7.0-seagull timestamp: Fri 2010-08-06 13:37:31 +0200 message: ndb - remove unecessary include of NdbMem.h in LocalConfig.cpp - move include of NdbOut.hpp into LocalConfig.cpp - add include of BaseString.hpp to LocalConfig.hpp ------------------------------------------------------------ revno: 3362.69.30 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-09-02 08:50:05 +0200 message: ndb - revert rename of st_ha_create_information::storage_media to st_ha_create_information::default_storage_media. - Reduce MCP ------------------------------------------------------------ revno: 3788 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-09-01 13:40:43 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.29 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-09-01 12:08:49 +0200 message: Merge 6.3 to 7.0 ------------------------------------------------------------ revno: 2585.159.33 committer: Magnus Bl?udd branch nick: 6.3 timestamp: Wed 2010-09-01 12:03:47 +0200 message: ndb - remove use of IF_DBUG - No IF_DBUG in future MySQL Server - Using assert() instead of DBUG_ASSERT() effectively removes the warning ------------------------------------------------------------ revno: 2585.159.32 committer: Magnus Bl?udd branch nick: 6.3 timestamp: Wed 2010-09-01 11:49:29 +0200 message: ndb - Remove use of VOID() - remove (void) in front of pthread_mutex_* function since those are by convention not checked ------------------------------------------------------------ revno: 2585.159.31 committer: Magnus Bl?udd branch nick: 6.3 timestamp: Wed 2010-09-01 11:45:09 +0200 message: ndb - Use the my_hash_* functions directly, the hash->my_hash defines are removed in a future MySQL Server ------------------------------------------------------------ revno: 2585.159.30 committer: Magnus Bl?udd branch nick: 6.3 timestamp: Wed 2010-09-01 11:43:03 +0200 message: ndb - fix warnings about format string ------------------------------------------------------------ revno: 2585.159.29 committer: Magnus Bl?udd branch nick: 6.3 timestamp: Wed 2010-09-01 11:39:38 +0200 message: ndb - remove unused include from ha_ndbcluster.cc ------------------------------------------------------------ revno: 2585.159.28 committer: Magnus Bl?udd branch nick: 6.3 timestamp: Wed 2010-09-01 11:22:12 +0200 message: ndb - reduce MCP ------------------------------------------------------------ revno: 2585.159.27 committer: Magnus Bl?udd branch nick: 6.3 timestamp: Wed 2010-09-01 11:21:54 +0200 message: ndb - reduce MCP ------------------------------------------------------------ revno: 3787 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-09-01 11:01:54 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.28 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-09-01 10:44:41 +0200 message: ndb - move the 'include_partition_fields_in_used_fields' function into the only file where it's used - ha_ndbcluster.cc - reduce MCP ------------------------------------------------------------ revno: 3362.69.27 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-09-01 10:31:38 +0200 message: ndb - revert unecessary changes in sql_partition.cc to reduce MCP ------------------------------------------------------------ revno: 3786 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Tue 2010-08-31 13:53:37 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.26 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Tue 2010-08-31 13:46:48 +0200 message: Bug#56257 ndbd.exe refuses to start without absolute paths, "spawn_process" error - Always get the full path to the ndbd executable when angel spawns the ndbd. - Try with the given path if 'GetModuleFileName' fails(very unlikely). ------------------------------------------------------------ revno: 3785 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-08-31 12:57:13 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.25 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-08-31 12:55:01 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.26 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Tue 2010-08-31 12:40:36 +0200 message: ndb - bug#54945 - fix 1) incorrect early abort of scan 2) incorrect handling of WAIT_AI_SCAN during node-failure handling ------------------------------------------------------------ revno: 3784 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-08-31 08:41:19 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.24 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-08-31 08:39:44 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.25 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Tue 2010-08-31 08:28:52 +0200 message: ndb - bug#54944 - out of commit ack markers could sometimes lead to node-crash ------------------------------------------------------------ revno: 3783 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Mon 2010-08-30 17:55:52 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.23 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Mon 2010-08-30 16:10:58 +0200 message: ndb - revert hack for plug.in.disabled from CMakeLists.txt ------------------------------------------------------------ revno: 3362.69.22 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Mon 2010-08-30 16:08:49 +0200 message: ndb - fix compiler warning ------------------------------------------------------------ revno: 3782 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Mon 2010-08-30 14:16:01 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.21 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Mon 2010-08-30 14:14:48 +0200 message: ndb - Merge in patch for bug#56117 which removes include of ha_ndbcluster_tables.h from mysqldump.c ------------------------------------------------------------ revno: 3362.69.20 [merge] committer: Magnus Bl?udd branch nick: mysql-5.1-telco-7.0 timestamp: Mon 2010-08-30 13:27:17 +0200 message: Merge ------------------------------------------------------------ revno: 3362.70.1 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Mon 2010-08-30 11:31:26 +0200 message: ndb - merge in support for CI_BITMASK parameters in config.in and my.cnf - change to use same code path(as much as possible) for reading both config.ini and my.cnf so that the same rules are applied to config. ------------------------------------------------------------ revno: 3362.66.19 committer: Magnus Bl?udd branch nick: 7.0-bug56185 timestamp: Fri 2010-08-27 14:12:51 +0200 message: ndb - Unit test for the new CI_BITMASK type for configuration parameters, also add some tests for CI_ENUM - mtr test to check that it's possible to specify CI_BITMASK and CI_ENUM in both my.nf and config.ini - This to make sure that functionality added for bug#56185 works ------------------------------------------------------------ revno: 3362.66.18 committer: Magnus Bl?udd branch nick: 7.0-bug56185 timestamp: Fri 2010-08-27 14:10:11 +0200 message: ndb - trim the hostname read from my.cnf to avoid hostname with leading or ending spaces are used. ------------------------------------------------------------ revno: 3362.66.17 committer: Magnus Bl?udd branch nick: 7.0-bug56185 timestamp: Fri 2010-08-27 14:08:35 +0200 message: ndb - Add a CI_BITMASK type for configuration parameters to make it possible for the ndb_mgmd to validate the bitmask spec. early. - Make LockExecuteThreadToCPU use the new type. Set max to 65535(i.e same as in ndbd). ------------------------------------------------------------ revno: 3362.66.16 committer: Magnus Bl?udd branch nick: 7.0-bug56185 timestamp: Fri 2010-08-27 14:06:11 +0200 message: ndb - Change the code so it uses same path for validating parameters regardless of wheter they are read from config.ini and my.cnf - This fixes a problem where CI_ENUM type was not properly validated when read through my.cnf ------------------------------------------------------------ revno: 3781 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-08-30 12:21:53 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.19 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-08-30 11:51:49 +0200 message: ndb - merge 63 to 64 ------------------------------------------------------------ revno: 2585.159.24 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-08-30 11:07:26 +0200 message: ndb - use configure to check for __is_pod and similar (instead of #defines), fix problems found ------------------------------------------------------------ revno: 3780 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-08-30 10:54:47 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.18 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-08-30 10:53:28 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.23 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-08-30 10:50:10 +0200 message: ndb - bump version to 6.3.38 ------------------------------------------------------------ revno: 3362.69.17 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-08-30 10:50:50 +0200 message: ndb - bump version to 7.0.19 ------------------------------------------------------------ revno: 3779 committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-08-30 10:52:10 +0200 message: ndb - bump version to 7.1.8 ------------------------------------------------------------ revno: 3778 [merge] tags: clone-mysql-5.1.47-ndb-7.1.7-src-build committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-08-30 10:43:39 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.16 [merge] tags: clone-mysql-5.1.47-ndb-7.0.18-src-build committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-08-30 10:40:45 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.22 tags: clone-mysql-5.1.47-ndb-6.3.37-src-build committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-08-30 10:24:36 +0200 message: ndb - Bitmask.hpp - make all template functions inline (all but 3 where) ------------------------------------------------------------ revno: 3777 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Mon 2010-08-30 10:36:43 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.15 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Mon 2010-08-30 10:32:48 +0200 message: ndb - fix compile problem with 'unlikely' being passed a void* when expecting a truth value ------------------------------------------------------------ revno: 3776 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Mon 2010-08-30 10:19:25 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.14 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Mon 2010-08-30 10:18:27 +0200 message: ndb - fix upgrade, ignore old default value(65535) for LockMaintThreadToCPU which is most likely sent by an old(6.3) ndb_mgmd ------------------------------------------------------------ revno: 3775 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-08-30 09:36:53 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.13 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-08-30 09:25:44 +0200 message: ndb - bug#56298 - don't print stop GCP until you've read it from disk ------------------------------------------------------------ revno: 3774 committer: Jonas Oreland branch nick: telco-7.1 timestamp: Sat 2010-08-28 18:35:45 +0200 message: ndb - remove bash-ism from jtie_unit_tests-t ------------------------------------------------------------ revno: 3773 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Sat 2010-08-28 12:49:25 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.12 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Sat 2010-08-28 11:37:09 +0200 message: ndb - Remove Bitmask::parseMask and instead use parse_mask directly in the places where it's needed. ------------------------------------------------------------ revno: 3362.69.11 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Fri 2010-08-27 19:07:19 +0200 message: ndb - fix solaris build issue, change to static inline - move all instantiations of Bitmask templates to Bitmask.cpp ------------------------------------------------------------ revno: 3362.69.10 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Fri 2010-08-27 17:36:53 +0200 message: ndb - list parse_mask.hpp in Makefile.am so it's added to dist ------------------------------------------------------------ revno: 3772 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Fri 2010-08-27 15:01:02 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.9 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Fri 2010-08-27 14:49:35 +0200 message: Merge 7.0-bug56185 to 7.0 ------------------------------------------------------------ revno: 3362.66.15 committer: Magnus Bl?udd branch nick: 7.0-bug56185 timestamp: Fri 2010-08-27 14:04:06 +0200 message: Bug#56185 cannot use cpu id >255 in LockExecuteThreadToCPU - Use SparseBitmask for storing ids of the CPUS to lock to, allowing id 0-65535 to be used. - Move the warning about to few CPUs to lock into the function that assigns the CPUs and knows if it is a problem or not. - Print a message desrcibing the strategy used to assign threads to CPUs - Print warning if ndbd fails to parse the bitmask spec. ------------------------------------------------------------ revno: 3362.66.14 committer: Magnus Bl?udd branch nick: 7.0-bug56185 timestamp: Fri 2010-08-27 13:58:29 +0200 message: ndb - use hardcoded string in unit test if param has no default, fixes crash on platforms that does not allow NULL to be passed to %s in printf. ------------------------------------------------------------ revno: 3362.66.13 committer: Magnus Bl?udd branch nick: 7.0-bug56185 timestamp: Fri 2010-08-27 13:57:16 +0200 message: ndb - Remove confusing define UNDEFINED which is just and alias for 0/NULL ------------------------------------------------------------ revno: 3362.66.12 committer: Magnus Bl?udd branch nick: 7.0-bug56185 timestamp: Fri 2010-08-27 13:55:56 +0200 message: ndb - add checks to make sure that no CI_STRING parameters have min or max values set. - remove the min max from those config params that have it. ------------------------------------------------------------ revno: 3362.66.11 committer: Magnus Bl?udd branch nick: 7.0-bug56185 timestamp: Fri 2010-08-27 13:55:12 +0200 message: ndb - add asserts to check that CI_ENUM has min(which is pointer to typelib) but no max assigned. ------------------------------------------------------------ revno: 3362.66.10 committer: Magnus Bl?udd branch nick: 7.0-bug56185 timestamp: Fri 2010-08-27 13:54:18 +0200 message: ndb - Fix "no format arguments" warnings to snprintf ------------------------------------------------------------ revno: 3362.66.9 committer: Magnus Bl?udd branch nick: 7.0-bug56185 timestamp: Fri 2010-08-27 13:52:54 +0200 message: ndb - Remove duplicate define MAX_LINE_LENGTH(which actually was doubly defined with two different values) - Remove the need for static size stack buffers by using BaseString ------------------------------------------------------------ revno: 3362.66.8 committer: Magnus Bl?udd branch nick: 7.0-bug56185 timestamp: Fri 2010-08-27 13:50:13 +0200 message: ndb - Add SparseBitmask class which has basically the same interface as Bitmask but doesn't have space reserved for each bit. - Make SparseBitmaks share the 'parseMask' functionality with Bitmask - Add unit test ------------------------------------------------------------ revno: 3362.66.7 committer: Magnus Bl?udd branch nick: 7.0-bug56185 timestamp: Fri 2010-08-27 09:42:36 +0200 message: ndb - Add missing newlines in printf ------------------------------------------------------------ revno: 3771 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Thu 2010-08-26 14:43:55 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.8 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Thu 2010-08-26 14:41:30 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.21 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Thu 2010-08-26 14:37:01 +0200 message: ndb - add suppression for more innodb_plugin warnings (win7 64-bit) ------------------------------------------------------------ revno: 2585.159.20 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Thu 2010-08-26 12:07:24 +0200 message: ndb - bug#55641 - fix upgrade...daa ------------------------------------------------------------ revno: 3770 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Thu 2010-08-26 14:41:33 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.69.7 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Thu 2010-08-26 14:33:33 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.19 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Thu 2010-08-26 11:00:51 +0200 message: ndb - bug#55641 - fix suma wrt. graceful shutdown, bug#18538 graceful shutdown can abort transactions ------------------------------------------------------------ revno: 2585.159.18 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Thu 2010-08-26 10:56:12 +0200 message: ndb - fix boring bug in testDict -n Bug36702 ------------------------------------------------------------ revno: 3769 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Thu 2010-08-26 08:48:29 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.6 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-08-26 08:47:22 +0200 message: Null merge changes already in 7.0 ------------------------------------------------------------ revno: 2585.159.17 committer: Magnus Bl?udd branch nick: 6.3 timestamp: Wed 2010-08-25 19:15:00 +0200 message: ndb - ignore warnings from innodb_plugin code ------------------------------------------------------------ revno: 3362.69.5 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-08-26 08:45:37 +0200 message: ndb - revert logic so that 'next_file' returns everything not a directory on Windows. ------------------------------------------------------------ revno: 3768 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-25 13:44:29 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.4 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-25 13:43:19 +0200 message: ndb - ignore warnings from innodb_plugin code ------------------------------------------------------------ revno: 3767 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Tue 2010-08-24 09:07:15 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.69.3 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Tue 2010-08-24 09:06:40 +0200 message: Merge 6.3 -> 7.0 ------------------------------------------------------------ revno: 2585.159.16 [merge] committer: Magnus Bl?udd branch nick: 6.3 timestamp: Tue 2010-08-24 09:06:00 +0200 message: Merge 6.2 -> 6.3 ------------------------------------------------------------ revno: 2572.82.25 committer: Magnus Bl?udd branch nick: 6.2 timestamp: Tue 2010-08-24 09:03:59 +0200 message: ndb - add mtr.pl --extra-suites=Name1[,NameN].. option to mtr.pl which will be appended to the list of suites alrady given or the default list if no suites list given ------------------------------------------------------------ revno: 3362.69.2 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-7.0 timestamp: Mon 2010-08-23 16:38:10 +0200 message: Merge ------------------------------------------------------------ revno: 3766 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-7.1 timestamp: Mon 2010-08-23 16:36:11 +0200 message: Merge ------------------------------------------------------------ revno: 3362.69.1 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-7.0 timestamp: Mon 2010-08-23 16:33:15 +0200 message: Merge ------------------------------------------------------------ revno: 2585.159.15 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-6.3 timestamp: Mon 2010-08-23 16:30:55 +0200 message: Merge ------------------------------------------------------------ revno: 2572.82.24 committer: Martin Skold branch nick: mysql-5.1-telco-6.2 timestamp: Mon 2010-08-23 16:29:24 +0200 message: Adding suite/innodb_plugin to be copied to distributions (probably faulty 5.1 merge) ------------------------------------------------------------ revno: 2585.159.14 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-6.3 timestamp: Fri 2010-08-20 18:29:13 +0200 message: Merge ------------------------------------------------------------ revno: 3765 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Mon 2010-08-23 16:30:41 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.66.6 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Mon 2010-08-23 13:20:11 +0200 message: Merge ------------------------------------------------------------ revno: 3362.68.1 committer: Magnus Bl?udd branch nick: 7.0-NdbDir_next_file timestamp: Mon 2010-08-23 13:19:37 +0200 message: ndb - change 'NdbDir::next_file' so it only returns regular files - change to use 'lstat' instead of stat to avoid following symlinks. ------------------------------------------------------------ revno: 3764 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Mon 2010-08-23 11:35:19 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.66.5 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Mon 2010-08-23 10:46:34 +0200 message: ndb - Extend 'NdbDir::create' with a "mode" argument and a number of functions to create different modes in a portable fashion. - Use 'NdbDir::create' from cpcd, atrt and Ndbfs instead of different port function in each file. - Remove unused defines and include files ------------------------------------------------------------ revno: 3362.66.4 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Mon 2010-08-23 10:42:53 +0200 message: ndb - add dummy function to hide the endless warnings that are printed about unused variables in BlockNumbers.h in case of a compile error. ------------------------------------------------------------ revno: 3362.66.3 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-7.0 timestamp: Fri 2010-08-20 18:26:33 +0200 message: Merge ------------------------------------------------------------ revno: 3362.41.190 [merge] committer: Magnus Bl?udd branch nick: mysql-5.1-telco-7.0 timestamp: Fri 2010-08-20 16:53:43 +0200 message: Merge ------------------------------------------------------------ revno: 3763 [merge] committer: Magnus Bl?udd branch nick: mysql-5.1-telco-7.1 timestamp: Fri 2010-08-20 16:54:24 +0200 message: Merge ------------------------------------------------------------ revno: 3758.1.1 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Fri 2010-08-20 13:35:30 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.67.1 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Fri 2010-08-20 12:59:14 +0200 message: ndb - remove home made portability function 'create_directory' and use portable NdbDir::create ------------------------------------------------------------ revno: 3762 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-7.1 timestamp: Fri 2010-08-20 16:12:05 +0200 message: Merge ------------------------------------------------------------ revno: 3362.66.2 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-7.0 timestamp: Fri 2010-08-20 16:09:19 +0200 message: Merge ------------------------------------------------------------ revno: 2585.159.13 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-6.3 timestamp: Fri 2010-08-20 16:07:55 +0200 message: Merge ------------------------------------------------------------ revno: 2572.82.23 committer: Martin Skold branch nick: mysql-5.1-telco-6.2 timestamp: Fri 2010-08-20 16:06:53 +0200 message: Removed accidental debug printout ------------------------------------------------------------ revno: 3761 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-7.1 timestamp: Fri 2010-08-20 16:00:52 +0200 message: Merge ------------------------------------------------------------ revno: 3362.66.1 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-7.0 timestamp: Fri 2010-08-20 15:23:53 +0200 message: Merge ------------------------------------------------------------ revno: 2585.159.12 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-6.3 timestamp: Fri 2010-08-20 15:04:07 +0200 message: Merge ------------------------------------------------------------ revno: 2572.82.22 committer: Martin Skold branch nick: mysql-5.1-telco-6.2 timestamp: Fri 2010-08-20 14:17:27 +0200 message: WL#3749 MySQL Cluster: On-line DDL, new handler interface: added backward compatibility with old online add/drop index as the default implementation for new methods ------------------------------------------------------------ revno: 3760 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Fri 2010-08-20 13:34:36 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.189 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Fri 2010-08-20 13:33:06 +0200 message: ndb - fix bug in dict master take-over due to incorrect if statement, (found by gcc warning) ------------------------------------------------------------ revno: 3759 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Fri 2010-08-20 13:33:11 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.188 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Fri 2010-08-20 13:26:54 +0200 message: ndb - 70 warnings ------------------------------------------------------------ revno: 3362.41.187 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Fri 2010-08-20 13:10:25 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.160.3 [merge] committer: Jonas Oreland branch nick: telco-6.3 timestamp: Fri 2010-08-20 12:59:22 +0200 message: ndb - merge 63-main ------------------------------------------------------------ revno: 2585.160.2 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Fri 2010-08-20 12:50:43 +0200 message: ndb - fix a few warnings in debug-code ------------------------------------------------------------ revno: 2585.160.1 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Fri 2010-08-20 12:18:47 +0200 message: ndb - more warning fixes (gcc 4.4.3) ------------------------------------------------------------ revno: 3758 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Fri 2010-08-20 10:36:53 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.186 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Fri 2010-08-20 10:35:41 +0200 message: ndb - add include of signal.h to ndb_global.h to get a more consistent environment across platforms. - remove include of signal.h in most other places. ------------------------------------------------------------ revno: 3757 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Fri 2010-08-20 08:00:19 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.185 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Fri 2010-08-20 07:59:01 +0200 message: ndb - add missing include of signal.h - install the signal handler earlier to prevent any chance of race ------------------------------------------------------------ revno: 3362.41.184 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-08-19 17:08:01 +0200 message: ndb - add missing include of signal.h ------------------------------------------------------------ revno: 3756 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Thu 2010-08-19 16:28:29 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.183 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-08-19 16:27:24 +0200 message: ndb - Fix compiler warning about anachroism dut to wrong linkage ------------------------------------------------------------ revno: 3362.41.182 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-08-19 16:23:31 +0200 message: ndb - fix compile error, 'kill' need ------------------------------------------------------------ revno: 3362.41.181 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-08-19 16:16:35 +0200 message: ndb - remove useless global variable and use the NDB_APPLY_TABLE defihne directly ------------------------------------------------------------ revno: 3755 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.1 timestamp: Thu 2010-08-19 14:37:27 +0100 message: Merge 7.0->7.1 ------------------------------------------------------------ revno: 3362.41.180 committer: Frazer Clement branch nick: mysql-5.1-telco-7.0 timestamp: Thu 2010-08-19 14:35:45 +0100 message: Bug#55121 error 839 'Illegal null attribute' from NDB for fields with default value User supplying an (ignored) default on the Blob column causes the NO_DEFAULT_VALUE_FLAG *not* to be set on the column, so we incorrectly assume that it must have a native default and send no data for it. Ndb handler is modified to never assume that a Blob (or Geom etc.) has a native default value. ------------------------------------------------------------ revno: 3754 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Thu 2010-08-19 11:35:10 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.179 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-08-19 11:34:40 +0200 message: Merge 6.3 -> 7.0 ------------------------------------------------------------ revno: 2585.159.11 [merge] committer: Magnus Bl?udd branch nick: 6.3 timestamp: Thu 2010-08-19 11:34:03 +0200 message: Merge 6.2 -> 6.3 ------------------------------------------------------------ revno: 2572.82.21 committer: Magnus Bl?udd branch nick: 6.2 timestamp: Thu 2010-08-19 11:31:56 +0200 message: ndb - remove unmaintained MAINTAINERS file ------------------------------------------------------------ revno: 3753 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Thu 2010-08-19 10:57:55 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.178 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-08-19 10:57:17 +0200 message: ndb - remove define MAX_THREAD_NAME only used since sizeof is preffered ------------------------------------------------------------ revno: 3752 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Thu 2010-08-19 10:52:16 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.177 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-08-19 10:51:12 +0200 message: ndb - add missing includes of signal.h - fix warning about wrong linkage of function being passed to NdbThread_Create ------------------------------------------------------------ revno: 3751 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-18 16:35:26 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.176 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-18 16:34:29 +0200 message: ndb - Remove duplicate include of my_global.h - Remove useless include of my_alarm.h - Remove mystery hacks for includeing sys/stat.h, each file that need to use stat functions includes the header file themself, it does not need to be global - Include sys/stat.h in Restore.cpp ------------------------------------------------------------ revno: 3362.41.175 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-18 16:29:33 +0200 message: ndb - Reduce MCP, 'rint' is already defined in my_global.h and no extra include file is needed(epsecially one that does not define rint, hehe...) ------------------------------------------------------------ revno: 3750 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Wed 2010-08-18 12:25:44 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.174 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Wed 2010-08-18 12:21:21 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.10 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Wed 2010-08-18 11:59:10 +0200 message: ndb - bug#41751 - handle binlog purge during startup by temporarily created THD object (yuck) ------------------------------------------------------------ revno: 3749 committer: Jonas Oreland branch nick: telco-7.1 timestamp: Wed 2010-08-18 12:20:02 +0200 message: ndb - fix ndbinfo.result in 7.1 ------------------------------------------------------------ revno: 3748 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-18 10:05:03 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.173 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-18 10:02:58 +0200 message: ndb - Move the part of the ndbinfo.test that is using mysqldump into it's own test so it can be skipped when running with embedded server - Create .inc file for creating and dropping ndbinfo database ------------------------------------------------------------ revno: 3362.41.172 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-18 09:50:58 +0200 message: ndb - Fix problem with patch for bug#54316, it was not quoting the string correctly. Now uses 'quote_for_like' ------------------------------------------------------------ revno: 3747 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-18 09:26:51 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.171 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-18 09:25:52 +0200 message: ndb - remove remains of ndbnet ------------------------------------------------------------ revno: 3362.41.170 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-18 09:24:00 +0200 message: ndb - Remove empty lib/ ------------------------------------------------------------ revno: 3746 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Tue 2010-08-17 15:53:11 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.169 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Tue 2010-08-17 15:44:26 +0200 message: ndb - remove the pools view also from ndbinfo_sql.cpp - and from mysql_system_tables.sql(in 7.0 for consistency) ------------------------------------------------------------ revno: 3362.41.168 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Tue 2010-08-17 15:37:52 +0200 message: Merge 7.0-bug54316 -> 7.0 ------------------------------------------------------------ revno: 3362.65.1 committer: Magnus Bl?udd branch nick: 7.0-bug54316 timestamp: Fri 2010-08-13 11:22:44 +0200 message: Bug#54316 mysqldump and restore ndbinfo fails - Problem was caused by "blocks" and "config_params" lookup tables being empty after restore of dump with no data. - Don't allow the ndbinfo databse to be dumped(not even if explicitly given on command line). - Use LEFT JOIN in the views so that they would return rows even if the lookup tables are empty(for whatever reason). - Add primary key indexes on the lookup tables for faster lookups. ------------------------------------------------------------ revno: 3745 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Tue 2010-08-17 15:24:04 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.167 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Tue 2010-08-17 15:23:40 +0200 message: Merge 7.0-bug47595 -> 7.0 ------------------------------------------------------------ revno: 3362.64.1 committer: Magnus Bl?udd branch nick: 7.0-bug47595 timestamp: Fri 2010-08-13 13:56:05 +0200 message: Bug#47595 Don't print log lines to STDOUT for ndb_mgmd - Move the printouts for which config files is being used until after the config has been read and thus the cluster logs lotation is known. It's a little chicken and egg problem since the location must be read before it can used. - Move the printout of "MySQL Cluster management server X.X.X started..." a little later so it also end up in cluster log. - Change the option parsing code in main.cpp to use "fprintf(stderr, ..." for error printouts and move it before setup of eventlogger - Print "MySQL Cluster management server X.X.X" to stdout as first thing when program starts up. ------------------------------------------------------------ revno: 3744 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Tue 2010-08-17 15:09:20 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.166 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Tue 2010-08-17 15:08:11 +0200 message: Merge ------------------------------------------------------------ revno: 3362.63.1 committer: Magnus Bl?udd branch nick: 7.0-bug54779 timestamp: Fri 2010-08-13 13:14:26 +0200 message: Bug#54779 ndb_mgmd --nodaemon starts to log to console in 7.0.x - Only log to console in --nodaemon mode if no LogDestination has been set. ------------------------------------------------------------ revno: 3743 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-08-17 13:52:31 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.165 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-08-17 13:51:30 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.9 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Tue 2010-08-17 13:48:42 +0200 message: ndb - fix strict-alias warning that I missed ------------------------------------------------------------ revno: 3362.41.164 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-08-17 13:47:55 +0200 message: ndb - more 7.0 strict alias warnings ------------------------------------------------------------ revno: 3742 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-08-17 12:23:50 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.163 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-08-17 12:21:44 +0200 message: ndb - bug#54342 - only print "lockcpu vs maxexecutionthreads"-warning if running ndbmtd ------------------------------------------------------------ revno: 3741 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-08-17 12:14:58 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.162 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-08-17 12:11:01 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.8 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Tue 2010-08-17 12:07:41 +0200 message: ndb - bug#56044 - fix race condition in COPY_GCI during master failure ------------------------------------------------------------ revno: 3362.41.161 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-08-17 11:54:53 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.7 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Tue 2010-08-17 11:43:19 +0200 message: ndb - fix strict aliasing problems ------------------------------------------------------------ revno: 3740 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.1 timestamp: Mon 2010-08-16 14:34:18 +0100 message: Merge 7.0->7.1 ------------------------------------------------------------ revno: 3362.41.160 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.0 timestamp: Mon 2010-08-16 14:25:31 +0100 message: Merge 6.3->7.0 ------------------------------------------------------------ revno: 2585.159.6 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-6.3 timestamp: Mon 2010-08-16 14:01:30 +0100 message: Merge 6.2->6.3 ------------------------------------------------------------ revno: 2572.82.20 committer: Frazer Clement branch nick: mysql-5.1-telco-6.2 timestamp: Mon 2010-08-16 13:49:26 +0100 message: Bug#54341 Two new settings related to StopOnError=0 Two new datanode settings are created : - MaxStartFailRetries (Default 3) This is the maximum number of consecutive times that an Ndbd Angel process will restart an Ndbd Worker process that failed to startup. The default value is 3, after which the Angel will exit. Setting this to 0 results in infinite retries. - StartFailRetryDelay (Default 0) This is the delay in seconds after the Ndbd Angel process detects that the Ndbd worker has failed during startup, before it attempts to start the Ndbd worker again. These settings only take effect when StopOnError=0. ------------------------------------------------------------ revno: 3739 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Fri 2010-08-13 20:40:25 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.159 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Fri 2010-08-13 20:39:27 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.5 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Fri 2010-08-13 20:36:51 +0200 message: ndb - bump version to 6.3.37 ------------------------------------------------------------ revno: 3362.41.158 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Fri 2010-08-13 20:37:54 +0200 message: ndb - bump version to 7.0.18 ------------------------------------------------------------ revno: 3738 committer: Jonas Oreland branch nick: telco-7.1 timestamp: Fri 2010-08-13 20:38:38 +0200 message: ndb - bump version to 7.1.7 ------------------------------------------------------------ revno: 3737 [merge] tags: clone-mysql-5.1.47-ndb-7.1.6-src-build committer: Jonas Oreland branch nick: telco-7.1 timestamp: Fri 2010-08-13 11:43:03 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.157 tags: clone-mysql-5.1.47-ndb-7.0.17-src-build committer: Jonas Oreland branch nick: telco-6.4 timestamp: Fri 2010-08-13 11:31:43 +0200 message: ndb - bug#55963 - 70 specific trace improvements ------------------------------------------------------------ revno: 3362.41.156 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Fri 2010-08-13 10:35:12 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.4 tags: clone-mysql-5.1.47-ndb-6.3.36-src-build committer: Jonas Oreland branch nick: telco-6.3 timestamp: Fri 2010-08-13 10:24:28 +0200 message: ndb - bug#55963 - post review, use eventlogger to get date-time too ------------------------------------------------------------ revno: 3362.41.155 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Fri 2010-08-13 10:27:36 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.3 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Fri 2010-08-13 08:46:26 +0200 message: ndb - bug#55963 - Add DictTrace config variable ------------------------------------------------------------ revno: 3736 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Thu 2010-08-12 15:23:11 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.154 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Thu 2010-08-12 15:18:40 +0200 message: ndb - remove unneeded variable from mt.cpp ------------------------------------------------------------ revno: 3735 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Wed 2010-08-11 14:33:59 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.153 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Wed 2010-08-11 14:11:47 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.159.2 [merge] committer: Jonas Oreland branch nick: telco-6.3 timestamp: Wed 2010-08-11 14:08:40 +0200 message: ndb - merge 63-main ------------------------------------------------------------ revno: 2585.159.1 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Wed 2010-08-11 11:59:39 +0200 message: ndb - csc#49280 - Add more debug info incase of "infinite" "Failure handling of node...not completed" ------------------------------------------------------------ revno: 3734 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-11 12:28:56 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.152 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-11 12:28:05 +0200 message: Merge 6.3 -> 7.0 ------------------------------------------------------------ revno: 2585.156.16 [merge] committer: Magnus Bl?udd branch nick: 6.3 timestamp: Wed 2010-08-11 12:23:29 +0200 message: Merge ------------------------------------------------------------ revno: 3362.41.151 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-11 12:26:15 +0200 message: Merg ------------------------------------------------------------ revno: 3733 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-11 12:22:45 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.62.1 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-11 12:21:17 +0200 message: Merge 6.3 to 7.0 ------------------------------------------------------------ revno: 2585.158.1 committer: Magnus Bl?udd branch nick: 6.3 timestamp: Wed 2010-08-11 11:58:33 +0200 message: Bug#55906 Read errors in MGMAPI caused by interrupted 'poll' - Make 'ndb_socket_poller::poll' interrupt safe - Add 'ndb_socket_poller::poll_unsafe' for those that handle interrupted wait already - Add signal handler catching SIGUSR1 to two test programs to allow testing the interrupt safety. - Create subfunction in socket_io.cpp to get rid of duplicated time calulation and poll code ------------------------------------------------------------ revno: 3732 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Wed 2010-08-11 11:36:47 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.150 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Wed 2010-08-11 11:35:45 +0200 message: ndb - fix compiler warning ------------------------------------------------------------ revno: 3362.41.149 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Wed 2010-08-11 11:34:30 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.156.15 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Wed 2010-08-11 11:30:36 +0200 message: ndb - bug#55715 - don't crash on timeout in CS_PREPARE_TO_COMMIT, but simply log it once... ------------------------------------------------------------ revno: 2585.156.14 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Wed 2010-08-11 09:16:42 +0200 message: ndb - bug#53987 - "improve" timehandling printouts ------------------------------------------------------------ revno: 3731 committer: Jonas Oreland branch nick: telco-7.1 timestamp: Wed 2010-08-11 11:08:02 +0200 message: ndb - bug#55225 - fix bash-ism ------------------------------------------------------------ revno: 3730 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-11 09:17:21 +0200 message: Merge 7.0-bug55839 -> 7.1 ------------------------------------------------------------ revno: 3362.41.148 committer: Magnus Bl?udd branch nick: 7.0-bug55839 timestamp: Wed 2010-08-11 09:15:28 +0200 message: Bug#55839 ndb_config --configinfo --xml does not expose HostName1/2 for TCP sections - Change HostName1 and HostName2 to CI_USED for TCP, SCI and SHM(although the latter two are still experimental they are changed for consistency) ------------------------------------------------------------ revno: 3729 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-08-09 12:21:26 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.147 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-08-09 12:20:17 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.156.13 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-08-09 12:19:19 +0200 message: ndb - bug#54724 - refix bug, and add testcase ------------------------------------------------------------ revno: 3728 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-08-09 11:08:50 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.146 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-08-09 11:08:03 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.156.12 [merge] committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-08-09 11:07:02 +0200 message: ndb - merge 62 to 63 ------------------------------------------------------------ revno: 2572.82.19 committer: Jonas Oreland branch nick: telco-6.2 timestamp: Mon 2010-08-09 11:01:53 +0200 message: ndb - drop table at end of tests (flexHammer) ------------------------------------------------------------ revno: 2572.82.18 committer: Jonas Oreland branch nick: telco-6.2 timestamp: Mon 2010-08-09 10:57:30 +0200 message: ndb - drop table at end of tests (flexBench) ------------------------------------------------------------ revno: 2572.82.17 committer: Jonas Oreland branch nick: telco-6.2 timestamp: Mon 2010-08-09 10:44:48 +0200 message: ndb - drop table at end of tests (testNdbApi -n NdbRecordCICharPKUpdate) ------------------------------------------------------------ revno: 3727 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-08-09 09:20:13 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.145 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-08-09 09:05:57 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.156.11 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-08-09 09:03:21 +0200 message: ndb - fix compiler warning in atrt ------------------------------------------------------------ revno: 3726 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Fri 2010-08-06 14:20:13 +0200 message: Merge 7.0 to 7.1 ------------------------------------------------------------ revno: 3362.41.144 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Fri 2010-08-06 10:20:51 +0200 message: Merge 7.0-no-bk -> 7.0 ------------------------------------------------------------ revno: 3362.61.1 committer: Magnus Bl?udd branch nick: 7.0-no-bk timestamp: Fri 2010-08-06 10:19:19 +0200 message: ndb - remove the special rule not to fetch files from bk from each Makefile.am - also remove all the dist-hook rules to clean SCCS files from dist except in the top level Makefile.am ------------------------------------------------------------ revno: 3725 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Thu 2010-08-05 10:14:08 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.143 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-08-05 10:12:31 +0200 message: WL#5508 SEAGULL: Move NDB version configuration down into storage/ndb - Improve comments and group defines together ------------------------------------------------------------ revno: 3724 committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-04 16:55:44 +0200 message: ndb - Make the SET_JAVA_NDB_VERSION macro run everytime - Fix cmake syntax error ------------------------------------------------------------ revno: 3723 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-04 16:15:14 +0200 message: Merge 7.0 to 7.1 ------------------------------------------------------------ revno: 3362.41.142 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-04 16:00:24 +0200 message: WL#5508 SEAGULL: Move NDB version configuration down into storage/ndb - Calculate the NDB_MYSQL_VERSION_XX variables from MYSQL_VERSION_ID thus removing the need for our build systems to extract it. - Remove automake and cmake code to extract NDB_MYSQL_VERSION_XX - Add test that NDB_MYSQL_VERSION_XX maps backto MYSQL_VERSION_ID - Remove NDB_MYSQL_VERSION_XX from my_config.h/config.h ------------------------------------------------------------ revno: 3722 committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-04 16:05:37 +0200 message: ndb - Add comment for JAVA_NDB_VERSION - Remove JAVA_NDB_VERSION from my_config.h/config.h ------------------------------------------------------------ revno: 3721 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-04 14:57:44 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.141 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-04 14:55:35 +0200 message: ndb - Fix spelling error ------------------------------------------------------------ revno: 3720 committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-04 14:54:17 +0200 message: ndb - remove duplicate code in CMakeLists.txt(likely merge error) ------------------------------------------------------------ revno: 3719 committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-04 14:51:03 +0200 message: WL#5508 SEAGULL: Move NDB version configuration down into storage/ndb - Add macro to type_JAVA.cmake that (if not already set) builds the version string to use when generating jars etc. directly from the NDB_VERSION_XX variables and save the string in JAVA_NDB_VERSION. - Call the macro from all places that need to variable to be set. - Remove old include file for extracting NDB version for "java" from configure.in ------------------------------------------------------------ revno: 3718 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-04 13:32:08 +0200 message: Merge 7.0 to 7.1# ------------------------------------------------------------ revno: 3362.41.140 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-04 12:30:14 +0200 message: WL#5508 SEAGULL: Move NDB version configuration down into storage/ndb_configure.m4 - Move NDB_VERSION_XXX variables from configure.in to ndb_configure.m4 - Make storage/ndb/include/CmakeLists.txt extract the NDB version from ndb_configure.m4 instead of configure.in ------------------------------------------------------------ revno: 3362.41.139 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-04 12:05:10 +0200 message: ndb - improve the printout to make it clear which numbers generates the printed version string ------------------------------------------------------------ revno: 3717 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-04 11:28:35 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.138 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-04 11:28:09 +0200 message: ndb - use MYSQL_SERVER_VERSION instead of VERSION (in all places) ------------------------------------------------------------ revno: 3716 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-04 11:26:08 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.137 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-04 11:25:09 +0200 message: ndb - properly TAPify ndb_version-t ------------------------------------------------------------ revno: 3715 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Wed 2010-08-04 10:40:26 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.136 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-04 10:39:03 +0200 message: ndb - include mysql_version.h into ndb_version.h to get access to the MySQL server version defines. - Use MYSQL_SERVER_VERSION instead of VERSION since the former is set with all build systems ------------------------------------------------------------ revno: 3362.41.135 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-04 10:17:25 +0200 message: ndb - remove the check that NDB_VERSION_STATUS matches what has been parsed from the version string, it's not significant anyway. ------------------------------------------------------------ revno: 3362.41.134 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Wed 2010-08-04 10:11:35 +0200 message: ndb - add sanity checks for version define, they must be higher than what we currently have ------------------------------------------------------------ revno: 3714 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Tue 2010-08-03 16:14:15 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.133 [merge] committer: Magnus Bl?udd branch nick: mysql-5.1-telco-7.0 timestamp: Tue 2010-08-03 16:13:06 +0200 message: Merge ------------------------------------------------------------ revno: 3713 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Tue 2010-08-03 15:49:05 +0200 message: Merge 7.0 to 7.1 ------------------------------------------------------------ revno: 3362.60.11 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Tue 2010-08-03 15:43:17 +0200 message: ndb - Add unit test to check that version defines and string for NDB is properly set - Test the exported version functions and defines ------------------------------------------------------------ revno: 3362.60.10 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Tue 2010-08-03 15:12:19 +0200 message: ndb - move the define of NDB_BACKUP_VERSION together with the other similar defines in the file ------------------------------------------------------------ revno: 3362.60.9 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Tue 2010-08-03 14:40:36 +0200 message: ndb - rename src/common/util/version.c to version.cpp - mark functions declared as having C linkage in ndb_version.h and version.h to be compiled with c linkage also in the now C++ file. - mark non public functions as static ------------------------------------------------------------ revno: 3362.60.8 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Tue 2010-08-03 14:05:11 +0200 message: ndb - remove unnecessary include of NdbEnv.h from version.c - remove unnecessary include of stdarg.h from basestring_vsnprintf.h since that file is already included by ndb_global.h - remove include of my_global.h from basestring_vsnprintf.c, that file should only be included via ndb_global.h ------------------------------------------------------------ revno: 3362.60.7 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Tue 2010-08-03 13:57:56 +0200 message: ndb - reduce MCP in configure.in - fix merge error causing duplicate comments - add missing newline ------------------------------------------------------------ revno: 3712 [merge] committer: Jorgen Austvik branch nick: 5.1-telco-7.1 timestamp: Tue 2010-08-03 13:05:05 +0200 message: Merge ------------------------------------------------------------ revno: 3707.1.1 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Tue 2010-08-03 10:28:29 +0200 message: Merge 7.0 to 7.1 ------------------------------------------------------------ revno: 3711 [merge] committer: Jorgen Austvik branch nick: 5.1-telco-7.1 timestamp: Tue 2010-08-03 12:58:51 +0200 message: merge ------------------------------------------------------------ revno: 3362.41.132 [merge] committer: Jorgen Austvik branch nick: 5.1-telco-7.0 timestamp: Tue 2010-08-03 12:55:50 +0200 message: merge ------------------------------------------------------------ revno: 3362.60.6 [merge] committer: Magnus Bl?udd branch nick: 7.0 timestamp: Tue 2010-08-03 10:05:34 +0200 message: Merge 6.3 -> 7.0 ------------------------------------------------------------ revno: 3362.60.5 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Tue 2010-08-03 09:25:36 +0200 message: ndb - remove the unused NDB_SET_VERSION hack in order to reduce version code complexity ------------------------------------------------------------ revno: 3362.60.4 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Mon 2010-08-02 16:48:31 +0200 message: ndb - remove unused test code for ndb version ------------------------------------------------------------ revno: 3362.60.3 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Mon 2010-08-02 16:20:57 +0200 message: ndb - remove unused file test-ndbinfo.c ------------------------------------------------------------ revno: 3362.60.2 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Mon 2010-08-02 16:10:09 +0200 message: ndb - remove old unused 'getarg' man source file ------------------------------------------------------------ revno: 3362.60.1 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Mon 2010-08-02 15:46:31 +0200 message: ndb - remove old unused define(which is also commented out) ------------------------------------------------------------ revno: 3710 [merge] committer: Jorgen Austvik branch nick: 5.1-telco-7.1 timestamp: Tue 2010-08-03 12:58:03 +0200 message: Merge ------------------------------------------------------------ revno: 3362.41.131 [merge] committer: Jorgen Austvik branch nick: 5.1-telco-7.0 timestamp: Tue 2010-08-03 11:29:31 +0200 message: Merge ------------------------------------------------------------ revno: 2585.156.10 [merge] committer: Jorgen Austvik branch nick: 5.1-telco-6.3-bigmem timestamp: Tue 2010-08-03 11:28:33 +0200 message: Merge ------------------------------------------------------------ revno: 2585.157.1 [merge] committer: Magnus Bl?udd branch nick: 6.3 timestamp: Tue 2010-08-03 10:04:58 +0200 message: Merge 6.2 -> 6.3 ------------------------------------------------------------ revno: 2572.82.16 committer: Magnus Bl?udd branch nick: 6.2 timestamp: Tue 2010-08-03 10:02:22 +0200 message: Bug#55706 storage/ndb/include rebuilt too late - Move include/ first in list of subdirs to build ------------------------------------------------------------ revno: 3709 [merge] committer: Jorgen Austvik branch nick: 5.1-telco-7.1 timestamp: Tue 2010-08-03 11:30:56 +0200 message: Merge ------------------------------------------------------------ revno: 3362.41.130 [merge] committer: Jorgen Austvik branch nick: 5.1-telco-7.0 timestamp: Tue 2010-08-03 11:17:42 +0200 message: Merge warning fixes from 6.3 ------------------------------------------------------------ revno: 2585.156.9 committer: Jorgen Austvik branch nick: 5.1-telco-6.3-bigmem timestamp: Tue 2010-08-03 11:16:27 +0200 message: Remove warnings ------------------------------------------------------------ revno: 3708 committer: Jorgen Austvik branch nick: 5.1-telco-7.1 timestamp: Tue 2010-08-03 11:20:57 +0200 message: Merge warning fixes from 7.0 ------------------------------------------------------------ revno: 3707 [merge] committer: Jorgen Austvik branch nick: 5.1-telco-7.1 timestamp: Mon 2010-08-02 13:52:42 +0200 message: Merge big memory test from 7.0 ------------------------------------------------------------ revno: 3362.41.129 [merge] committer: Jorgen Austvik branch nick: 5.1-telco-7.0 timestamp: Mon 2010-08-02 13:49:11 +0200 message: Merge big memory test from 6.3 ------------------------------------------------------------ revno: 2585.156.8 committer: Jorgen Austvik branch nick: 5.1-telco-6.3-bigmem timestamp: Mon 2010-08-02 13:36:25 +0200 message: Test for big memory ------------------------------------------------------------ revno: 3706 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Fri 2010-07-30 23:25:22 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.128 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Fri 2010-07-30 23:24:46 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.156.7 [merge] committer: Jonas Oreland branch nick: telco-6.3 timestamp: Fri 2010-07-30 23:23:38 +0200 message: ndb - merge 62 to 63 ------------------------------------------------------------ revno: 2572.82.15 committer: Jonas Oreland branch nick: telco-6.2 timestamp: Fri 2010-07-30 23:22:15 +0200 message: ndb - fix testcase for bug-54986 ------------------------------------------------------------ revno: 3705 [merge] committer: Magnus Bl?udd branch nick: 7.1 timestamp: Fri 2010-07-30 14:01:21 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.127 committer: Magnus Bl?udd branch nick: 7.0 timestamp: Thu 2010-07-29 17:07:55 +0200 message: Bug#55205 Memory leak in ndb_mgmd when --disable-config-cache is used - Unsubscribe from incoming signals before terminating the ConfigManager thread ------------------------------------------------------------ revno: 3704 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.1 timestamp: Mon 2010-07-26 16:05:49 +0100 message: Merge 7.0->7.1 ------------------------------------------------------------ revno: 3362.41.126 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.0 timestamp: Mon 2010-07-26 16:02:12 +0100 message: Merge 6.3->7.0 ------------------------------------------------------------ revno: 2585.156.6 committer: Frazer Clement branch nick: mysql-5.1-telco-6.3 timestamp: Mon 2010-07-26 15:41:18 +0100 message: Fix ndb_database for embedded ------------------------------------------------------------ revno: 3703 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.1 timestamp: Mon 2010-07-26 13:20:55 +0100 message: Merge 7.0->7.1 ------------------------------------------------------------ revno: 3362.41.125 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.0 timestamp: Mon 2010-07-26 13:08:40 +0100 message: Merge 6.3->7.0 ------------------------------------------------------------ revno: 2585.156.5 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-6.3 timestamp: Mon 2010-07-26 12:10:10 +0100 message: Merge 6.2->6.3 ------------------------------------------------------------ revno: 2572.82.14 committer: Frazer Clement branch nick: mysql-5.1-telco-6.2 timestamp: Mon 2010-07-26 11:35:07 +0100 message: Bug#54788 DROP DATABASE can remove hidden blob tables without removing parent tables 1) Drop database code should not attempt to directly drop Blob part tables (NDB$BLOB_T_C) 2) NdbApi should not allow Blob part tables to be dropped by applications This is true for normal NdbApi usage, but not for the 'Global dict cache' mode used by MySQLD. 3) NdbApi should allow a main table with dropped Blob part tables to be 'opened', so that it can be dropped. Otherwise we are left with an indestructable table. A new testcase is added which reproduces the problem fixed by (1 + 2) above. There is no automated testcase for fix 3, but it has been tested manually. ------------------------------------------------------------ revno: 3702 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.1 timestamp: Wed 2010-07-14 13:43:59 +0100 message: Merge 7.0->7.1 (Null) ------------------------------------------------------------ revno: 3362.41.124 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.0 timestamp: Wed 2010-07-14 13:42:12 +0100 message: Merge 6.3->7.0 (Null) ------------------------------------------------------------ revno: 2585.156.4 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-6.3 timestamp: Wed 2010-07-14 13:40:14 +0100 message: Merge 6.2->6.3 (Null) ------------------------------------------------------------ revno: 2572.82.13 committer: Frazer Clement branch nick: mysql-5.1-telco-6.2 timestamp: Wed 2010-07-14 13:38:54 +0100 message: Fix ndb_gis in 6.2 ------------------------------------------------------------ revno: 3701 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.1 timestamp: Wed 2010-07-14 13:13:30 +0100 message: Merge 7.0->7.1 ------------------------------------------------------------ revno: 3362.41.123 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.0 timestamp: Wed 2010-07-14 12:26:51 +0100 message: Merge 6.3->7.0 ------------------------------------------------------------ revno: 2585.156.3 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-6.3 timestamp: Wed 2010-07-14 12:01:54 +0100 message: Merge 6.2->6.3 ------------------------------------------------------------ revno: 2572.82.12 committer: Frazer Clement branch nick: mysql-5.1-telco-6.2 timestamp: Wed 2010-07-14 11:51:55 +0100 message: Bug#35217 Strange ndb_binlog_index error inserting rows in MyISAM table Fix to problem where WRITE_ROW error 121 was seen by MySQLD when Inserting rows into the ndb_binlog_index table. The problem was due to the Ndb storage engine handler calling the wrong overloaded variant of a Server internal Api. This resulted in the 64-bit integer epoch being mapped to a 64-bit double precision floating point number, with a loss of accuracy for numbers greater than 2^53. The loss of accuracy results in duplicate key errors when the number is used as a key. A testcase is added which verifies that large epoch values do not result in duplicates. Other incorrect usage of the Field::store() api is corrected here. ------------------------------------------------------------ revno: 3700 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Sun 2010-07-04 18:33:21 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.122 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Sun 2010-07-04 18:28:36 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.156.2 [merge] committer: Jonas Oreland branch nick: telco-6.3 timestamp: Sun 2010-07-04 18:14:31 +0200 message: ndb - merge 63-main ------------------------------------------------------------ revno: 2585.156.1 [merge] committer: Jonas Oreland branch nick: telco-6.3 timestamp: Sun 2010-07-04 18:13:03 +0200 message: ndb - merge 62 to 63 ------------------------------------------------------------ revno: 2572.82.11 committer: Jonas Oreland branch nick: telco-6.2 timestamp: Sun 2010-07-04 18:11:23 +0200 message: ndb - bug#54986 - only set EMPTY_PAGE first time page is accessed in extent (to not reset LSN) ------------------------------------------------------------ revno: 3699 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.1 timestamp: Fri 2010-07-02 18:12:21 +0100 message: Merge 7.0->7.1 ------------------------------------------------------------ revno: 3362.41.121 committer: Frazer Clement branch nick: mysql-5.1-telco-7.0 timestamp: Fri 2010-07-02 18:10:16 +0100 message: Yet another Windows testcase fix ------------------------------------------------------------ revno: 3698 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.1 timestamp: Fri 2010-07-02 15:49:58 +0100 message: Merge 7.0->7.1 ------------------------------------------------------------ revno: 3362.41.120 committer: Frazer Clement branch nick: mysql-5.1-telco-7.0 timestamp: Fri 2010-07-02 15:48:29 +0100 message: Remove unnecessary quoting, and perhaps pass on Windows ------------------------------------------------------------ revno: 3697 [merge] committer: Frazer Clement branch nick: mysql-5.1-telco-7.1 timestamp: Fri 2010-07-02 12:12:27 +0100 message: Merge 7.0->7.1 ------------------------------------------------------------ revno: 3362.41.119 committer: Frazer Clement branch nick: mysql-5.1-telco-7.0 timestamp: Fri 2010-07-02 12:01:48 +0100 message: Bug#52305 Customizing storage of server id inside the anyValue Test UserData part of AnyValue Add a DBUG-only env variable to trigger MySQLD to set the user portion of AnyValue to all 1s. Modify my.cnf for some AnyValue-sensitive testcases to set a 24-bit user portion which will be set to all 1s. This gives coverage of the case(s) where the User portion is non-zero, checking that the system still functions as expected w.r.t. ServerId, NoLogging etc. The existing repl_ndb_slave_lsu testcase is modified to also use the mysqlbinlog tool to look at the events recorded. A new variant of it called rpl_ndb_slave_lsu_anyval runs with the top 24 bits set to 1 and server-id-bits set to 7. The testcase ensures that : - Server-ids are correctly extracted from the composite serverid - Composite serverids are binlogged - Composite serverids pass through the slave and can be binlogged - mysqlbinlog can be used to see composite server id values. ------------------------------------------------------------ revno: 3362.41.118 committer: Frazer Clement branch nick: mysql-5.1-telco-7.0 timestamp: Fri 2010-07-02 11:52:27 +0100 message: Bug#52305 Customizing storage of server id inside the anyValue Add support for server-id-bits to Ndb handler Ndb handler is modified to support the server-id-bits mechanism as follows : - Where server-id-bits is < 31, only those bits will be set on NdbApi operations created by the handler - When receiving events for committed NdbApi operations, only the server-id-bits lsbs will be consulted to determine the source serverId (if any). - When writing events to the Binlog, the user-data from the received AnyValue (if any) will be written into the Binlog event's ServerId. Only the bottom server-id-bits will be set to the event's ServerId (As received for replicated updates, or the server's own Id for non-replicated updates). This mechanism allows : - NdbApi applications to set the user-data portion of the AnyValue for their operations (bits server-id-bits to 30). - NdbApi applications to listen to events and receive the user-data portion of their AnyValue. - User-data portions of AnyValue to be recorded in the Binlog - User-data portions of AnyValue to be tagged onto replicated updates in the slave - User-data portions of AnyValue to be recorded in the Slave's Binlog.... - Normal 'no-logging', 'log-slave-updates', 'replication-loop-detection' and 'ndb_apply_status' mechanism work as expected. The default value of server-id-bits is 32, which causes no change in the current behaviour of the Ndb handler w.r.t. AnyValue and ServerIds. Note that in future it may be useful to offer a configuration where the userdata portion of the AnyValue is ignored within a Cluster, but userdata is *not* recorded in the ServerId field of Binlogged events. ------------------------------------------------------------ revno: 3362.41.117 committer: Frazer Clement branch nick: mysql-5.1-telco-7.0 timestamp: Fri 2010-07-02 11:42:50 +0100 message: Bug#52305 : Customizing storage of server id inside the anyValue Add server-id-bits option to MySQLD A general server-id-bits option is added to MySQLD initialisation options. This option indicates the number of lsbs within the 32-bit ServerId which actually contain the server-id. Indicating that the actual server-id uses < 32 bits allows some of the remaining bits to be used for other purposes. When extracting the actual server-id for purposes such as replication-loop-detection, the server will ignore the irrelevant bits. If the configured server-id cannot be expressed in server-id-bits then the MySQLD will refuse to start. The server-id bits option is used mask out the irrelevant bits of the serverid in the IO and SQL threads when deciding whether an event should be ignored based on serverid. The event's serverid is used to set the slave thread's thd->server_id in the normal way, and a new thd variable, unmasked_server_id carries the full 32-bits of the received server_id. In cases where server_id_bits is < 32, handlers can look at thd->unmasked_server_id to get the non-server-id data associated with the event. The mysqlbinlog tool gets a new option --server-id-bits which controls how it interprets the server ids in the Binlogs it reads. As with MySQLD this defaults to 32. Where the Binlog was written by a MySQLD with server-id-bits < 32 and some useful info in the msbs, running mysqlbinlog with server-id-bits of 32 allows this data to be seen. ------------------------------------------------------------ revno: 3696 [merge] committer: Martin Sk?ld branch nick: mysql-5.1-telco-7.1 timestamp: Fri 2010-07-02 10:56:23 +0200 message: Merge ------------------------------------------------------------ revno: 3362.41.116 [merge] committer: Martin Sk?ld branch nick: mysql-5.1-telco-7.0 timestamp: Fri 2010-07-02 10:06:01 +0200 message: Merge ------------------------------------------------------------ revno: 2585.155.15 committer: Martin Sk?ld branch nick: mysql-5.1-telco-6.3 timestamp: Fri 2010-07-02 09:55:11 +0200 message: Bug#54724 NdbTransaction::refresh() does not reset TransactionInactiveTimeout timer?: Resetting timers for all scans ------------------------------------------------------------ revno: 3695 [merge] committer: John David Duncan branch nick: mysql-5.1-telco-7.1 timestamp: Thu 2010-07-01 08:23:08 -0700 message: Merge ------------------------------------------------------------ revno: 3693.1.1 committer: John David Duncan branch nick: bug54169 timestamp: Thu 2010-07-01 08:16:58 -0700 message: Fix double-checked locking that was found during a code review for bug#54169. This may not fix the bug (which I have not yet been able to reproduce) but is the right thing to do nonetheless. ------------------------------------------------------------ revno: 3694 committer: John David Duncan branch nick: mysql-5.1-telco-7.1 timestamp: Thu 2010-07-01 08:22:04 -0700 message: fix typo in comment ------------------------------------------------------------ revno: 3693 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Thu 2010-07-01 16:30:37 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.115 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Thu 2010-07-01 16:29:51 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.155.14 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Thu 2010-07-01 16:24:14 +0200 message: commit for tag ------------------------------------------------------------ revno: 3362.41.114 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Thu 2010-07-01 16:25:22 +0200 message: commit for tag ------------------------------------------------------------ revno: 3362.41.113 committer: Bernd Ocklin branch nick: mysql-5.1-telco-7.0 timestamp: Thu 2010-07-01 12:06:51 +0200 message: fix include directory for config/type_util.cmake ------------------------------------------------------------ revno: 3362.41.112 committer: Bernd Ocklin branch nick: mysql-5.1-telco-7.0 timestamp: Thu 2010-07-01 12:05:52 +0200 message: bug#54913 by recognizing plug.in.disabled file for cmake ------------------------------------------------------------ revno: 3692 committer: Jonas Oreland branch nick: telco-7.1 timestamp: Thu 2010-07-01 16:28:06 +0200 message: commit for tag ------------------------------------------------------------ revno: 3691 [merge] committer: Bernd Ocklin branch nick: clone-mysql-5.1.47-ndb-7.1.5-src-build timestamp: Wed 2010-06-30 11:32:19 +0200 message: merge 71 re-tagged 5.1.47-ndb-7.1.5 ------------------------------------------------------------ revno: 3689.1.7 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Wed 2010-06-30 07:04:34 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.111 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Wed 2010-06-30 07:01:47 +0200 message: ndb - wl2342 - Minor refactorings/cleanups - Add senderdata to DictStartReq - remove duplicate updateNodeInfo in US_REMOVE_NODE ------------------------------------------------------------ revno: 3689.1.6 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-06-28 11:24:36 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.110 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-06-28 11:23:46 +0200 message: ndb - fix bug in DihGetTabInfoRef found by windows compiler\! ------------------------------------------------------------ revno: 3689.1.5 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-06-28 11:16:54 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.109 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-06-28 11:15:02 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.155.13 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-06-28 11:13:00 +0200 message: ndb - bug#54859 - use correct state-variable when computing redo intervals ------------------------------------------------------------ revno: 3689.1.4 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-06-28 10:41:28 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.108 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-06-28 10:40:27 +0200 message: ndb - wl2342 - Add new interface to get DIH's table-definition (i.e fragments,replicas,redo-intervals etc) ------------------------------------------------------------ revno: 3689.1.3 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Thu 2010-06-24 23:58:53 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.107 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Thu 2010-06-24 23:42:03 +0200 message: ndb - wl2342 - minor cleanup of dih-sr ------------------------------------------------------------ revno: 3362.41.106 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Thu 2010-06-24 23:28:25 +0200 message: ndb - wl2342 - add syncronization of startphases during sr/is ------------------------------------------------------------ revno: 3689.1.2 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Thu 2010-06-24 22:35:06 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.105 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Thu 2010-06-24 22:34:14 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.155.12 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Thu 2010-06-24 22:32:10 +0200 message: ndb - dump version to 6.3.36 ------------------------------------------------------------ revno: 3362.41.104 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Thu 2010-06-24 22:32:53 +0200 message: ndb - dump version to 7.0.17 ------------------------------------------------------------ revno: 3689.1.1 committer: Jonas Oreland branch nick: telco-7.1 timestamp: Thu 2010-06-24 22:33:20 +0200 message: ndb - dump version to 7.1.6 ------------------------------------------------------------ revno: 3690 tags: clone-mysql-5.1.47-ndb-7.1.5a-src-build, mysql-5.1.47-ndb-7.1.5 committer: Bernd Ocklin branch nick: clone-mysql-5.1.47-ndb-7.1.5-src-build timestamp: Tue 2010-06-29 12:46:18 +0200 message: disable ndbjtie test for none cluster builds