- 16 Jun, 2006 3 commits
- 15 Jun, 2006 13 commits
-
-
unknown authored
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge mysql-test/r/binlog_row_mix_innodb_myisam.result: Auto merged mysql-test/r/federated.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/extra/rpl_tests/rpl_ddl.test: Auto merged mysql-test/r/rpl_ddl.result: Auto merged mysql-test/r/sp-error.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/rpl_ndb_charset.result: Auto merged mysql-test/r/type_ranges.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/r/trigger-grant.result: Auto merged mysql-test/t/archive.test: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/federated.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/innodb_mysql.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/trigger-grant.test: Auto merged mysql-test/t/view.test: Auto merged sql/ha_innodb.cc: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_parse.cc: Auto merged mysql-test/r/create.result: Manual merge mysql-test/r/innodb_mysql.result: Manual merge sql/handler.cc: Manual merge sql/share/errmsg.txt: Manual merge sql/sql_class.h: Manual merge sql/sql_delete.cc: Manual merge sql/sql_insert.cc: Manual merge sql/sql_table.cc: Manual merge
-
unknown authored
mysql-test/r/rpl_row_basic_11bugs.result: Result change mysql-test/t/disabled.def: Disabling test due to already reported bug. mysql-test/t/rpl_row_basic_11bugs.test: Adding code to replace server version mysql-test/t/rpl_truncate_7ndb.test: Adding sleep to allow NDB to write events to the binary log.
-
unknown authored
-
unknown authored
-
unknown authored
into mysql.com:/home/bk/b19066-mysql-5.1-new
-
unknown authored
sql/handler.cc: Moving write_locked_table_maps() and binlog_log_row() into an anonymous namespace.
-
unknown authored
Avoiding compilation error ("void * - unknown size").
-
unknown authored
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0 client/mysqldump.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_parse.cc: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp: Auto merged tests/mysql_client_test.c: Auto merged configure.in: Manual merge mysql-test/r/func_time.result: Manual merge mysql-test/t/func_time.test: Manual merge
-
unknown authored
into xiphis.org:/home/antony/work2/p2-bug20168.4
-
unknown authored
-
unknown authored
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002 sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
into mysql.com:/home/alexi/innodb/mysql-5.1-ss594
-
unknown authored
Avoiding build error caused by adding new files. storage/innobase/Makefile.am: Post innodb-5.1-ss594 modifications. Including newly added functions to EXTA_DIST.
-
- 14 Jun, 2006 24 commits
-
-
unknown authored
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002 sql/ha_ndbcluster.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged
-
unknown authored
mysql-test/t/partition.test: merge error
-
unknown authored
into xiphis.org:/home/antony/work2/p2-bug20168.4 mysql-test/r/lock_multi.result: Auto merged sql/handler.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_db.cc: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/myisamdef.h: Auto merged mysql-test/t/lock_multi.test: SCCS merged
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1 sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb sql/ha_ndbcluster.cc: manual merge
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 sql/ha_ndbcluster.cc: manual merge
-
unknown authored
- correction of backport error
-
unknown authored
- make sure to disable bulk insert when check for duplicate key is needed mysql-test/r/ndb_loaddatalocal.result: New BitKeeper file ``mysql-test/r/ndb_loaddatalocal.result'' mysql-test/t/ndb_loaddatalocal.test: New BitKeeper file ``mysql-test/t/ndb_loaddatalocal.test''
-
unknown authored
into mysql.com:/M51/bug18810-5.1
-
unknown authored
support-files/mysql.server.sh: Auto merged
-
unknown authored
support-files/mysql.server.sh: Auto merged
-
unknown authored
support-files/mysql.server.sh: Ensure that some necessary / useful system services have been started already, when the MySQL server is started. This fixes bug#18810 and bug#20118
-
unknown authored
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002 mysql-test/r/partition.result: Auto merged mysql-test/t/partition.test: Auto merged sql/partition_info.cc: manual merge sql/sql_partition.cc: manual merge
-
unknown authored
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002 sql/ha_ndbcluster.cc: Auto merged sql/sql_partition.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/partition.result: manual merge mysql-test/r/partition_error.result: manual merge mysql-test/r/partition_range.result: manual merge mysql-test/t/partition.test: manual merge mysql-test/t/partition_error.test: manual merge mysql-test/t/partition_range.test: manual merge sql/ha_partition.cc: manual merge sql/partition_element.h: manual merge sql/partition_info.cc: manual merge sql/partition_info.h: manual merge sql/share/errmsg.txt: manual merge sql/sql_partition.cc: manual merge sql/sql_table.cc: manual merge sql/table.cc: manual merge
-
unknown authored
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19801 mysql-test/r/partition.result: Auto merged mysql-test/t/partition.test: Auto merged sql/sql_partition.cc: Auto merged sql/partition_info.cc: manual merge
-
unknown authored
After review fix sql/partition_info.cc: After review fix
-
unknown authored
After review fix sql/sql_partition.cc: After review fix
-
unknown authored
-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1 sql/sql_table.cc: Auto merged
-
unknown authored
-
unknown authored
into may.pils.ru:/home/svoj/devel/mysql/merge/mysql-5.1 sql/sql_table.cc: Manual merge - use local.
-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1 sql/mysqld.cc: Auto merged sql/sql_table.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
-