database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-03 20:43:11 +03:00
Code Activity
47,972 Commits 3,154 Branches 363 Tags
285acf57ea2f08cdec214c4530e51394e8fe6b34
Commit Graph

4 Commits

Author SHA1 Message Date
unknown
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
 2007-06-18 23:55:48 +02:00
unknown
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''
 2007-06-18 15:36:10 +02:00
unknown
f3dc047890 WL#3303 (RBR: Engine-controlled logging format): 
Test case fixes.


mysql-test/r/binlog_multi_engine.result:
  Result change.
mysql-test/r/rpl_ndb_stm_innodb.result:
  Result change.
mysql-test/t/binlog_multi_engine.test:
  NDB tests only work in MIXED or ROW mode. Adding some cleanup actions.
mysql-test/t/loaddata_autocom_ndb.test:
  NDB requires MIXED or ROW mode.
mysql-test/t/ndb_alter_table.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_alter_table2.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_alter_table3.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_autodiscover.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_autodiscover2.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_autodiscover3.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_basic.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_binlog_log_bin.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_binlog_multi.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_bitfield.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_blob.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_blob_partition.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_cache.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_cache2.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_cache_multi.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_cache_multi2.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_charset.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_condition_pushdown.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_config.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_config2.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_cursor.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_database.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_dd_alter.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_dd_backuprestore.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_dd_basic.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_dd_ddl.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_dd_disk2memory.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_dd_dump.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_dd_sql_features.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_gis.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_index.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_index_ordered.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_index_unique.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_insert.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_limit.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_loaddatalocal.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_lock.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_minmax.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_multi.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_partition_error.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_partition_key.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_partition_list.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_partition_range.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_read_multi_range.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_rename.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_replace.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_restore.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_restore_partition.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_restore_print.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_row_format.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_single_user.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_sp.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_subquery.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_temporary.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_transaction.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_trigger.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_truncate.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_types.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_update.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_view.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndbapi.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ps_7ndb.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/rpl_ndb_commit_afterflush.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/rpl_ndb_innodb_trans.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/rpl_ndb_stm_innodb.test:
  We need MIXED mode on slave since it is necessary to let the slave
  switch to row format when executing replicated statements.
mysql-test/t/strict_autoinc_5ndb.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
 2007-06-14 11:05:48 +02:00
unknown
a0b7b2426f Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0". 
In 5.0 we made LOAD DATA INFILE autocommit in all engines, while
only NDB wanted that. Users and trainers complained that it affected
InnoDB and was a change compared to 4.1 where only NDB autocommitted.
To revert to the behaviour of 4.1, we move the autocommit logic out of mysql_load() into
ha_ndbcluster::external_lock().
The result is that LOAD DATA INFILE commits all uncommitted changes
of NDB if this is an NDB table, its own changes if this is an NDB
table, but does not affect other engines.
Note: even though there is no "commit the full transaction at end"
anymore, LOAD DATA INFILE stays disabled in routines (re-entrency
problems per a comment of Pem).
Note: ha_ndbcluster::has_transactions() does not give reliable results
because it says "yes" even if transactions are disabled in this engine...


sql/ha_ndbcluster.cc:
  NDB wants to do autocommit if this is LOAD DATA INFILE.
  For this to not affect all other engines, we move the logic
  inside ha_ndbcluster.
sql/sql_load.cc:
  This ha_enable_transaction() in mysql_load() forced an autocommit
  in all engines, while only NDB wants to do that.
  So we move the logic inside ha_ndbcluster.cc.
mysql-test/include/loaddata_autocom.inc:
  test for engines to see if they autocommit or not in LOAD DATA INFILE
mysql-test/r/loaddata_autocom_innodb.result:
  result for InnoDB (no autocommit)
mysql-test/r/loaddata_autocom_ndb.result:
  result for NDB (autocommit)
mysql-test/r/rpl_ndb_innodb_trans.result:
  result for InnoDB+NDB transactions. Observe that when ROLLBACK
  cannot rollback the LOAD DATA INFILE in NDB it issues warning 1196
  as appropriate.
mysql-test/t/loaddata_autocom_innodb.test:
  test that InnoDB does not autocommit in LOAD DATA INFILE.
mysql-test/t/loaddata_autocom_ndb.test:
  test that NDB does autocommit in LOAD DATA INFIL
mysql-test/t/rpl_ndb_innodb_trans-slave.opt:
  need to tell the slave to use innodb
mysql-test/t/rpl_ndb_innodb_trans.test:
  test of transactions mixing NDB and InnoDB. To see if ROLLBACK
  rolls back in both engines, with the exception of LOAD DATA INFILE
  which does not roll back NDB: we see that a LOAD DATA INFILE in NDB
  commits all what has been done in NDB so far, commits its changes,
  but does not commit in other engines.
 2006-09-05 16:52:05 +02:00