mirror of
https://github.com/MariaDB/server.git
synced 2025-10-19 21:09:40 +03:00
b6143a9c45da59a184d10b51a68ed83f9e4fd938
7 Commits
Author | SHA1 | Message | Date | |
---|---|---|---|---|
|
511ef0cc29 |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl mysql-test/extra/rpl_tests/rpl_log.test: Auto merged mysql-test/extra/rpl_tests/rpl_row_basic.test: Auto merged mysql-test/t/rpl_ndb_bank.test: Auto merged mysql-test/t/rpl_ndb_basic.test: Auto merged mysql-test/t/rpl_ndb_do_table.test: Auto merged mysql-test/t/rpl_ndb_idempotent.test: Auto merged mysql-test/t/rpl_ndb_stm_innodb.test: Auto merged mysql-test/t/rpl_ndb_sync.test: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged mysql-test/include/have_multi_ndb.inc: manual merge mysql-test/include/have_ndb.inc: manual merge mysql-test/t/rpl_ndb_commit_afterflush.test: manual merge mysql-test/t/rpl_ndb_ddl.test: manual merge mysql-test/t/rpl_ndb_innodb_trans.test: manual merge |
||
|
2c631fe880 |
fixes Bug #25305 (and several other similar test tailures with the same symptom)
- make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_commit_after_flush.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_delete_no_where.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_insert_ignore.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_log.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_multi_update2.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_multi_update3.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_relayrotate.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_001.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_UUID.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_basic.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_blob.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_charset.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_func003.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_sp003.test: make tests wait until ndb connects properly mysql-test/extra/rpl_tests/rpl_row_sp006.test: make tests wait until ndb connects properly mysql-test/include/have_multi_ndb.inc: make tests wait until ndb connects properly mysql-test/include/have_ndb.inc: make tests wait until ndb connects properly mysql-test/include/ndb_not_readonly.inc: make tests wait until ndb connects properly mysql-test/t/rpl_commit_after_flush.test: make tests wait until ndb connects properly mysql-test/t/rpl_delete_no_where.test: make tests wait until ndb connects properly mysql-test/t/rpl_insert_ignore.test: make tests wait until ndb connects properly mysql-test/t/rpl_multi_update2.test: make tests wait until ndb connects properly mysql-test/t/rpl_multi_update3.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_2innodb.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_2myisam.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_UUID.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_auto_inc.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_bank.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_basic.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_blob.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_blob2.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_charset.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_circular.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_circular_simplex.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_commit_afterflush.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_dd_advance.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_dd_basic.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_dd_partitions.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_ddl.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_delete_nowhere.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_do_db.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_do_table.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_extraCol.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_func003.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_idempotent.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_innodb2ndb.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_innodb_trans.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_insert_ignore.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_load.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_log.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_multi.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_multi_update2.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_multi_update3.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_myisam2ndb.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_relayrotate.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_rep_ignore.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_row_001.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_sp003.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_sp006.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_stm_innodb.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_sync.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndb_trig004.test: make tests wait until ndb connects properly mysql-test/t/rpl_ndbapi_multi.test: make tests wait until ndb connects properly mysql-test/t/rpl_relayrotate.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_001.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_UUID.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_basic_2myisam.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_basic_3innodb.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_basic_7ndb.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_blob_innodb.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_blob_myisam.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_charset.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_func003.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_log.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_log_innodb.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_sp003.test: make tests wait until ndb connects properly mysql-test/t/rpl_row_sp006_InnoDB.test: make tests wait until ndb connects properly mysql-test/t/rpl_stm_log.test: make tests wait until ndb connects properly mysql-test/t/rpl_truncate_7ndb.test: make tests wait until ndb connects properly mysql-test/include/ndb_master-slave.inc: New BitKeeper file ``mysql-test/include/ndb_master-slave.inc'' |
||
|
df22909536 |
Minor improvement to save some testing runtime (~ 2 minutes).
Reason: This test executes DML statements on a NDB table to detect if some SQL statements of special interest commits the ongoing transaction. When running in MIXED mode, automatic switching from statement-based to row-based replication takes place when a DML statement updates an NDB table. That means running this test on NDB with binlog-format=mixed and binlog-format=row mostly checks the same routines twice. Therefore we skip the variant with binlog-format=mixed. mysql-test/t/rpl_ndb_ddl.test: Prevent the execution of this test if replication format is statement or mixed. |
||
|
779d13a0cd |
The combination NDB and statement based replication is extreme slow and this fails usually because of testing timeout.
mysql-test/t/rpl_ndb_ddl.test: Avoid execution of this test with statement based replication because it is far way too slow. |
||
|
d3f71886aa |
Bug#18946 Test case rpl_ndb_ddl disabled
1. Fixes within the testscripts (affects rpl_ddl.test and rpl_ndb_ddl.test) - slave connection is only an observer (-> AUTOCOMMIT = 0) This removes the problem with the hanging test around DROP DATABASE (NDB). The hanging test around DROP DATABASE is a difference to InnoDB/MyISAm behaviour but fare away of a clear bug. IMHO this behaviour does not violate the SQL standard and should be therefore simply accepted. - removal of wrong comments - CREATE/DROP TEMPORARY TABLE must not cause implicit commit of the current transaction. NDB behaves here correct and InnoDB/Falcon wrong. - Add a missing connection slave - Reenable the test rpl_ndb_ddl. 2. Disable rpl_ddl.test because of Bug#26418. 3. Reenable rpl_ndb_ddl.test 4. Improvements (affect rpl_ddl.test and rpl_ndb_ddl.test) - Better + extended comments which should prevent that somebody accidently destroys the logics of the test - Replace SELECT's printing comments by "--echo" (decreases the number of auxiliary SQL commands) - Remove the need for include/rpl_stmt_seq2.inc (was mostly redundant to rpl_stmt_seq.inc) - Remove extra/rpl_tests/rpl_ndb_ddl.test (corrected extra/rpl_tests/rpl_ddl.test is sufficient) - Shift assignment of values to $show_binlog, $manipulate (variables useful for debugging) into the toplevel scripts - The temporary tables get now their storage engine from the variable $temp_engine_type. (more deterministic testing conditions) - Add additional protocol line if the connection is switched (was partially missing) - Add two DML commands for comparison purposes BitKeeper/deleted/.del-rpl_ndb_ddl.test: Delete: mysql-test/extra/rpl_tests/rpl_ndb_ddl.test BitKeeper/deleted/.del-rpl_stmt_seq2.inc: Delete: mysql-test/include/rpl_stmt_seq2.inc mysql-test/extra/rpl_tests/rpl_ddl.test: Improvements + Fixes mysql-test/include/rpl_stmt_seq.inc: Improvements mysql-test/r/rpl_ddl.result: Updated expected results mysql-test/r/rpl_ndb_ddl.result: Updated expected results mysql-test/t/disabled.def: Reenable rpl_ndb_ddl because of bug fix. Disable rpl_ddl because of Bug#26418. mysql-test/t/rpl_ddl.test: Improvements mysql-test/t/rpl_ndb_ddl.test: Improvements |
||
|
77b1bb8477 |
Has issues with original tree, so had to pull new tree and copy test over. Running last test now and will push after
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test: BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test mysql-test/t/rpl_extraCol_innodb-master.opt: BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/t/rpl_extraCol_innodb-master.opt mysql-test/t/rpl_extraCol_innodb-slave.opt: BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/t/rpl_extraCol_innodb-slave.opt mysql-test/t/rpl_extraCol_innodb.test: BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/t/rpl_extraCol_innodb.test mysql-test/t/rpl_extraCol_myisam.test: BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/t/rpl_extraCol_myisam.test mysql-test/r/rpl_extraCol_innodb.result: BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/r/rpl_extraCol_innodb.result mysql-test/r/rpl_extraCol_myisam.result: BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/r/rpl_extraCol_myisam.result mysql-test/r/rpl_ndb_extraCol.result: BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/r/rpl_ndb_extraCol.result mysql-test/t/rpl_ndb_extraCol.test: BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/t/rpl_ndb_extraCol.test mysql-test/extra/rpl_tests/rpl_ndb_ddl.test: BitKeeper file /data0/mysql-5.1-new-rpl/mysql-test/extra/rpl_tests/rpl_ndb_ddl.test |
||
|
be4a1c2e94 |
Test case updates and new test cases added to CRBR
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 |