- 22 Jun, 2006 5 commits
-
-
unknown authored
into clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18781 storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged
-
unknown authored
have to push this to be able to push 5.0 storage/ndb/include/kernel/signaldata/DictLock.hpp: Rename: ndb/include/kernel/signaldata/DictLock.hpp -> storage/ndb/include/kernel/signaldata/DictLock.hpp storage/ndb/src/kernel/blocks/dbdict/DictLock.txt: Rename: ndb/src/kernel/blocks/dbdict/DictLock.txt -> storage/ndb/src/kernel/blocks/dbdict/DictLock.txt storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: debug storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: bug#18781 post-merge 5.0->5.1 fixes (one more to come) storage/ndb/src/ndbapi/ndberror.c: bug#18781 post-merge 5.0->5.1 fixes (one more to come) storage/ndb/test/ndbapi/testDict.cpp: bug#18781 post-merge 5.0->5.1 fixes (one more to come) storage/ndb/test/src/NdbRestarter.cpp: bug#18781 post-merge 5.0->5.1 fixes (one more to come)
-
unknown authored
into mysql.com:/home/bk/fix-mysql-5.1 sql/sql_insert.cc: Auto merged
-
unknown authored
sql/handler.cc: Generating table maps from all locks that can be available: THD::extra_lock, THD::lock, and THD::locked_tables. sql/sql_class.h: Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create. Removing select_insert::lock. sql/sql_insert.cc: Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create. Removing select_insert::lock.
-
unknown authored
storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged support-files/mysql.server.sh: Auto merged support-files/mysql.spec.sh: Auto merged
-
- 21 Jun, 2006 25 commits
-
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt mysql-test/r/partition_error.result: Auto merged sql/mysql_priv.h: Auto merged mysql-test/r/partition.result: Auto merged
-
unknown authored
into dator5.(none):/home/pappa/bug19281 sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged
-
unknown authored
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt mysql-test/r/show_check.result: Auto merged sql/log.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_delete.cc: Auto merged
-
unknown authored
into dator5.(none):/home/pappa/bug19281 sql/sql_insert.cc: Auto merged
-
unknown authored
into clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18102
-
unknown authored
storage/ndb/test/run-test/daily-devel-tests.txt: test_event_merge
-
unknown authored
Need to flag when a copy is needed to not overwrite a create_info object connected to the lex structure sql/mysql_priv.h: Need to flag when a copy is needed to not overwrite a create_info object connected to the lex structure sql/sql_insert.cc: Need to flag when a copy is needed to not overwrite a create_info object connected to the lex structure sql/sql_parse.cc: Need to flag when a copy is needed to not overwrite a create_info object connected to the lex structure sql/sql_table.cc: Need to flag when a copy is needed to not overwrite a create_info object connected to the lex structure
-
unknown authored
storage/ndb/test/ndbapi/test_event_merge.cpp: test multiple tables and getGCIEventOperations storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: fix getGCIEventOperations when merge events is on storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp: fix getGCIEventOperations when merge events is on
-
unknown authored
into mysql.com:/usr/home/ram/work/mysql-5.1
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
-
unknown authored
-
unknown authored
mysql-test/extra/rpl_tests/rpl_log.test: Fix for bug #20601: rpl_ndb_log.test failure - replace insignificant columns to make tests repeatable mysql-test/r/rpl_ndb_log.result: Fix for bug #20601: rpl_ndb_log.test failure - result adjusted mysql-test/r/rpl_row_log.result: Fix for bug #20601: rpl_ndb_log.test failure - result adjusted mysql-test/r/rpl_row_log_innodb.result: Fix for bug #20601: rpl_ndb_log.test failure - result adjusted
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge mysql-test/r/sql_mode.result: Auto merged mysql-test/t/sql_mode.test: Auto merged sql/ha_ndbcluster.cc: Auto merged client/mysqldump.c: Manual merge mysql-test/r/mysqldump.result: Manual merge mysql-test/t/mysqldump.test: Manual merge
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge mysql-test/t/disabled.def: Auto merged sql/sql_insert.cc: Auto merged
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
-
unknown authored
mysql-test/r/partition_error.result: result fix sql/log.cc: use open_slow_log() instead of open_query_log() for slow query log sql/log.h: after merge fix sql/set_var.cc: after merge fix use open_slow_log() instead of open_query_log() for slow query log
-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1
-
unknown authored
-
unknown authored
-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1 sql/ha_ndbcluster.h: Auto merged mysql-test/r/ndb_replace.result: Merge sql/ha_ndbcluster.cc: Merge
-
unknown authored
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/src/ndbapi/ndberror.c: Auto merged
-
- 20 Jun, 2006 10 commits
-
-
unknown authored
-
unknown authored
mysql-test/r/im_life_cycle.result: Fix manual merge.
-
unknown authored
into mysql.com:/home/alik/MySQL/devel/5.1-merged
-
unknown authored
Corrected test case result mysql-test/r/rpl_ndb_log.result: Corrected test case result
-
unknown authored
into dator5.(none):/home/pappa/bug19281 mysql-test/t/partition_mgm.test: Auto merged
-
unknown authored
In addition to include "mysql_upgrade" in a RPM, it should also be called when the RPM is upgraded. support-files/mysql.server.sh: Support getting additional arguments, which need to be passed on to the server. This works only if the server is started through "mysqld_safe", as the IM will not pass such arguments. So if the IM would be used, additional arguments cause the start to fail (voluntarily). This feature is needed so that tools like RPM can start the server in an "isolated" way, see the patch to the RPM spec file (also in this changeset) to call "mysql_upgrade". support-files/mysql.spec.sh: Call "mysql_upgrade" during an RPM upgrade. "mysql_upgrade" needs a server to run, as it issues SQL commands. (This had been neglected previously.) It also needs to connect as "root", but in an RPM upgrade the password is unknown. To allow this, the server is started "--skip-grant-tables". Normally, this would open big security holes, so it is also started "--skip-networking", and access to the socket is limited to "mysql" + "root" by temporarily setting mode 700.
-
unknown authored
New test cases mysql-test/r/partition_error.result: New test cases mysql-test/r/partition_mgm.result: New test cases mysql-test/t/partition_error.test: New test cases mysql-test/t/partition_mgm.test: New test cases
-
unknown authored
into dator5.(none):/home/pappa/bug16000
-
unknown authored
into dator5.(none):/home/pappa/bug19281
-
unknown authored
into dator5.(none):/home/pappa/bug19309 sql/sql_table.cc: Auto merged mysql-test/r/partition.result: manual merge mysql-test/t/partition.test: manual merge
-