This removes a warning about missing DBUG_ENTER while running tests
mysql-test/t/disabled.def:
Disable test rpl_ndb_multi_update3 that randomly fails on Intel64
into zim.(none):/home/ian/workspace/mysql-5.1-new
Updated bug message in disabled file -Brian
BitKeeper/etc/ignore:
auto-union
include/mysql.h:
Auto merged
mysql-test/lib/mtr_timer.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql-common/client.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/parse_file.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
mysql-test/t/disabled.def:
Changing message to add in bug numnber
BitKeeper/etc/ignore:
Added mysql-test/r/udf.log to the ignore list
mysql-test/t/disabled.def:
Disable the udf test, per bug #18564. Permission by Brian
compile error fixes
BitKeeper/deleted/.del-rpl_ndb_sp007.test~72c66392eed0d74:
Delete: mysql-test/t/rpl_ndb_sp007.test
BitKeeper/deleted/.del-rpl_ndb_sp007.result~b1b713abfd655893:
Delete: mysql-test/r/rpl_ndb_sp007.result
mysql-test/t/disabled.def:
removed rpl_ndb_sp007 test as it uses savepoints which is only supported by innodb
sql/ha_ndbcluster.cc:
compile error fixes
Unable to reproduce failure: some of the 17400 tests pass, other have other failures.
The test in the bug report passes.
Enabling some tests that pass, rebranding others.
mysql-test/t/disabled.def:
Enabling tests that pass
Rebranding disabled tests
(nothing to document, this bug was not released).
mysql-test/t/disabled.def:
bug is fixed, enabling test case
mysql-test/t/rpl_rbr_to_sbr.test:
making test portable
mysql-test/r/rpl_rbr_to_sbr.result:
result update
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
