into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ndb_binlog_ddl_multi.test:
Auto merged
sql/rpl_injector.cc:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
sql/ha_ndbcluster_binlog.cc:
manual merge
+ removed extra binlog events generated by drop table schema ops to produce predictable test cases
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
ndb: dict use define for number of pages in table definition
mysql-test/r/binlog_row_drop_tmp_tbl.result:
Updated result file
mysql-test/r/rpl_row_charset.result:
Updated result file
mysql-test/r/rpl_switch_stm_row_mixed.result:
Updated result file
mysql-test/t/disabled.def:
Disabled test case
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats
configure.in:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/rpl_ndb_blob.result:
Merge
mysql-test/t/disabled.def:
Merge
mysql-test/t/rpl_ndb_blob.test:
Merge
Test fixes
mysql-test/r/binlog_stm_ctype_cp932.result:
Fixed result file
mysql-test/r/rpl_switch_stm_row_mixed.result:
Fixed result file
mysql-test/t/disabled.def:
Disabled test case
mysql-test/t/rpl_switch_stm_row_mixed.test:
Fix test
sql/handler.cc:
Fix to not replicate mysql.event table
Post-merge patches.
mysql-test/t/disabled.def:
Disabling test that fails due to no-error patch.
sql/log_event.cc:
Using definite constant instead of machine-dependent constant.
Handling case where null_bytes can be zero.
sql/sql_base.cc:
Using definite constant instead of machine-dependent constant.
sql/sql_class.cc:
Using definite constant instead of machine-dependent constant.
sql/table.cc:
Using definite constant instead of machine-dependent constant.
Print a warning instead of error on failure to open non-existing table.
This is a temporary patch to prevent a bug in NDB from stopping the slave.
mysql-test/r/rpl_ndb_blob.result:
result change
mysql-test/t/disabled.def:
Disabling problematic tests.
mysql-test/t/rpl_ndb_blob.test:
Don't show binlog since it's not deterministic.
sql/log_event.cc:
Print a warning instead of error on failure to open non-existing table.
This is a temporary patch to prevent a bug in NDB from stopping the slave.
Transaction aborted on slave should be retries. The OPTION_BEGIN
bit was cleared prematurely. Removed dependence of code on value
of OPTION_BEGIN bit when executing retries.
mysql-test/r/rpl_ndb_basic.result:
Result change.
mysql-test/t/disabled.def:
Enabling test.
mysql-test/t/rpl_ndb_basic.test:
Changing test to allow checking that slave did not stop.
sql/slave.cc:
Rolling back transaction before retrying it.
Only resetting transaction retries counter on a successful execution
or a non-transitional error.
configure.in:
Auto merged
client/mysqlimport.c:
Auto merged
include/config-win.h:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/field.h:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/t/mysqldump.test:
SCCS merged
- moved initialization of used_partitions
- more tests
+ removed reference to fixed bugs
mysql-test/r/ndb_partition_range.result:
Bug #17499 continued
- more testing
mysql-test/t/disabled.def:
removed reference to fixed bugs
mysql-test/t/ndb_partition_range.test:
Bug #17499 continued
- more testing
sql/ha_ndbcluster.cc:
Bug #17499 continued
- moved initialization of used_partitions
sql/sql_partition.cc:
Bug #17499 continued
- moved initialization of used_partitions
mysql-test/t/rpl_ndb_2innodb.test:
New rpl ndb test case for replicating to other storage engines
mysql-test/t/rpl_ndb_2myisam.test:
New rpl ndb test case for replicating to other storage engines
mysql-test/t/rpl_ndb_2innodb-slave.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_2innodb-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_2myisam-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_2myisam-slave.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_innodb2ndb.test:
New rpl ndb test case for replicating from other storage engines to ndb
mysql-test/t/rpl_ndb_myisam2ndb.test:
New rpl ndb test case for replicating from other storage engines to ndb
mysql-test/t/rpl_ndb_innodb2ndb-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_innodb2ndb-slave.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_myisam2ndb-master.opt:
New rpl ndb test supporting option files
mysql-test/t/rpl_ndb_myisam2ndb-slave.opt:
New rpl ndb test supporting option files
mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test:
New test code that drives the rpl of ndb -> innodb/myisam or innodb/myisam -> ndb
mysql-test/include/rpl_multi_engine3.inc:
New include that cover repeating code of the rpl of ndb -> innodb/myisam or innodb/myisam -> ndb
mysql-test/t/disabled.def:
Updated to include new test cases that have outstanding bug reports.
client/mysqlimport.c:
Remove disabled --use-threads option
mysql-test/r/mysqldump.result:
Update result
mysql-test/t/disabled.def:
Remove disable of mysqldump
mysql-test/t/mysqldump.test:
Remove the disable_parsing on tests for --use-threads to mysqlimport
mysql-test/r/rpl_bit_npk.result:
Updated results
mysql-test/t/disabled.def:
rpl_bit_npk now works
sql/field.h:
Field_bit::cmp_binary_offset wrongly used base class method that does not work for Field_bit
This was discussed with Monty and should be pushed into 5.0 too
sql/log_event.cc:
Added checks for null bits
Swapped use of m_after_image (was m_search_record) and table->record[1] to use record[i]
in the same way as other MySQL code (i.e. use record[1] for scan data).
Removed use of cmp_binary in record_compare (it is currently wrong to use that
without copying the null bits to the compare data record)
sql/log_event.h:
Name change to indicate new semantics
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
mysql-test/r/sp.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/mysql-test-run.pl:
Merge locationwhere to search for client bins
client/Makefile.am:
Use LDADD_R as common variable for programs to be linked with thread safe library.
client/mysqlimport.c:
Enable "--use-threads"
Formatting
mysql-test/r/mysqldump.result:
Update test result
mysql-test/t/disabled.def:
Enable mysqldump
mysql-test/t/mysqldump.test:
Enable test for mysqlimport with threads
Add test for failed mysqlimport
Set the ndbcluster slave port (bug#16780)
disabled.def:
Disabled 'mysqldump' until bug 17443 is closed
mysql-test/t/disabled.def:
Disabled 'mysqldump' until bug 17443 is closed
mysql-test/mysql-test-run.sh:
Set the ndbcluster slave port (bug#16780)
into mysql.com:/home/jimw/my/mysql-5.1-clean
BitKeeper/etc/ignore:
auto-union
mysql-test/r/func_str.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
mysql-test/t/disabled.def:
Resolve conflict
mysql-test/t/disabled.def:
Updated
mysql-test/extra/rpl_tests/rpl_log.test:
Updated and moved drop of tables to end of test to help bin log be more deterministic
mysql-test/r/rpl_row_log.result:
Updated results
mysql-test/r/rpl_row_log_innodb.result:
Updated results
mysql-test/r/rpl_ndb_log.result:
Updated results
BitKeeper/deleted/.del-rpl_row_multi_update3.test~fcf9a2234bd0f1b:
Delete: mysql-test/t/rpl_row_multi_update3.test
BitKeeper/deleted/.del-rpl_row_multi_update3.test~b366698f8379f38f:
Delete: mysql-test/extra/rpl_tests/rpl_row_multi_update3.test
BitKeeper/deleted/.del-rpl_row_multi_update3.result~1a3a8438eaaf11f2:
Delete: mysql-test/r/rpl_row_multi_update3.result
mysql-test/t/rpl_ndb_commit_afterflush.test:
added comments
mysql-test/r/rpl_ndb_commit_afterflush.result:
New results file
mysql-test/t/rpl_ddl.test:
Added to skip default ndb engine
mysql-test/t/rpl_ndb_ddl.test:
new wrapper for ndb
mysql-test/r/rpl_ndb_ddl.result:
new wrapper for ndb
mysql-test/t/rpl_insert_ignore.test:
Added to skip ndb if default engine
mysql-test/t/rpl_ndb_insert_ignore.test:
New wrapper for ndb
mysql-test/r/rpl_ndb_insert_ignore.result:
New Results file
mysql-test/t/rpl_multi_update2.test:
Updated to skip ndb default engine + added comments
mysql-test/t/rpl_ndb_multi_update2.test:
New ndb wrapper for test case
mysql-test/t/rpl_ndb_multi_update2-slave.opt:
New slave option file to go with new NDB test wrapper
mysql-test/r/rpl_ndb_multi_update2.result:
New results file
mysql-test/t/rpl_multi_update3.test:
Updated to skip ndb default engine + added comments
mysql-test/t/rpl_ndb_multi_update3.test:
New ndb wrapper for test case
mysql-test/r/rpl_ndb_multi_update3.result:
New results file
mysql-test/t/rpl_relayrotate.test:
added comments and ability to sjip when ndb is default engine
mysql-test/t/rpl_ndb_relayrotate.test:
New wrapper for ndb
mysql-test/t/rpl_ndb_relayrotate-slave.opt:
New option file for ndb slave
mysql-test/r/rpl_ndb_relayrotate.result:
New results file
mysql-test/t/rpl_loaddata.test:
Updated
mysql-test/t/rpl_multi_update.test:
Updated
mysql-test/t/rpl_relay_space_myisam.test:
Updated
mysql-test/t/rpl_row_001.test:
Updated
mysql-test/t/rpl_row_blob_myisam.test:
Updated
mysql-test/t/rpl_row_charset.test:
Updated
mysql-test/t/rpl_row_delayed_ins.test:
Updated
mysql-test/t/rpl_row_log.test:
Updated
mysql-test/t/rpl_row_UUID.test:
Updated
mysql-test/t/rpl_auto_increment.test:
Updated
mysql-test/t/rpl_commit_after_flush.test:
Updated
mysql-test/t/rpl_deadlock_innodb.test:
Updated
mysql-test/t/rpl_failed_optimize.test:
Updated
mysql-test/t/rpl_foreign_key_innodb.test:
Updated
mysql-test/t/rpl_insert_id_pk.test:
Updated
mysql-test/t/rpl_insert_id.test:
Updated
mysql-test/t/rpl_relay_space_innodb.test:
Updated
mysql-test/t/rpl_row_blob_innodb.test:
Updated
mysql-test/t/rpl_row_func003.test:
Updated
mysql-test/t/rpl_row_log_innodb.test:
Updated
mysql-test/t/rpl_row_sp002_innodb.test:
Updated
mysql-test/t/rpl_row_sp003.test:
Updated
mysql-test/t/rpl_row_sp006_InnoDB.test:
Updated
mysql-test/t/rpl_row_sp007_innodb.test:
Updated
mysql-test/t/rpl_ndb_row_001.test:
New wrapper for ndb
mysql-test/r/rpl_ndb_row_001.result:
New results file
mysql-test/t/rpl_ndb_UUID.test:
New wrapper for ndb
mysql-test/r/rpl_ndb_UUID.result:
New results file
mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
Updated with order by
mysql-test/r/rpl_row_delayed_ins.result:
Updated results file
mysql-test/t/rpl_ndb_charset.test:
New wrapper for ndb
mysql-test/r/rpl_ndb_charset.result:
New results file
mysql-test/t/rpl_row_until.test:
Updated to skip when ndb is default. ndb bin logs are different size, so test would need to be rewitten for ndb
mysql-test/t/rpl_row_max_relay_size.test:
Updated
mysql-test/t/rpl_row_sp008.test:
Removed show binlog as it is not needed for test
mysql-test/r/rpl_row_sp008.result:
Updated results
mysql-test/t/rpl_row_basic_11bugs.test:
Removed show binlog as it is not needed for test
mysql-test/r/rpl_row_basic_11bugs.result:
Updated results
BitKeeper/deleted/.del-rpl_ndb_max_relay_size.test~afa6834a51627676:
Delete: mysql-test/t/rpl_ndb_max_relay_size.test
BitKeeper/deleted/.del-rpl_ndb_max_relay_size.result~1e944e2782e270d8:
Delete: mysql-test/r/rpl_ndb_max_relay_size.result
mysql-test/t/disabled.def:
Updated
into mysql.com:/home/jimw/my/mysql-5.1-clean
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
tests/mysql_client_test.c:
Auto merged
BitKeeper/deleted/.del-ndb_load.result:
Auto merged
BitKeeper/deleted/.del-ndb_load.test:
Auto merged
mysql-test/t/disabled.def:
Resolve conflict
