mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysql-test/suite/rpl_ndb/r
History
unknown df0d80a31b Merge sita.local:/Users/tsmith/m/bk/51 
into  sita.local:/Users/tsmith/m/bk/maint/51

This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_dd_basic.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_dd_ddl.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_gis.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_row_format.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_single_user.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_single_user.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_incident.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
mysql-test/r/csv.result:
  Manual merge
mysql-test/t/csv.test:
  Manual merge
mysql-test/t/disabled.def:
  Manual merge
2007-07-09 03:27:03 -06:00
..
rpl_ndb_2innodb.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_2myisam.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_auto_inc.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_bank.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_basic.result Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 2007-06-27 14:29:10 +02:00
rpl_ndb_blob.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_blob2.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_charset.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_circular.result Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 2007-06-27 14:29:10 +02:00
rpl_ndb_circular_simplex.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_commit_afterflush.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_ctype_ucs2_def.result Many tests have been moved to suite/*. Some tests have been removed. 2007-07-04 23:41:15 +02:00
rpl_ndb_dd_advance.result Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 2007-07-04 22:38:53 +02:00
rpl_ndb_dd_basic.result Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 2007-06-27 14:29:10 +02:00
rpl_ndb_dd_partitions.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_ddl.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_delete_nowhere.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_do_db.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_do_table.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_extraCol.result Merge sita.local:/Users/tsmith/m/bk/51 2007-07-09 03:27:03 -06:00
rpl_ndb_func003.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_idempotent.result Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 2007-06-27 14:29:10 +02:00
rpl_ndb_innodb_trans.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_insert_ignore.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_load.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_log.result Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 2007-06-27 14:29:10 +02:00
rpl_ndb_mix_innodb.result Many tests have been moved to suite/*. Some tests have been removed. 2007-07-04 23:41:15 +02:00
rpl_ndb_multi.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_multi_update2.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_multi_update3.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_relayrotate.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_rep_ignore.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_row_001.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_sp003.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_sp006.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_stm_innodb.result Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 2007-07-04 22:38:53 +02:00
rpl_ndb_sync.result Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 2007-06-27 14:29:10 +02:00
rpl_ndb_trig004.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_ndb_UUID.result Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 2007-07-04 22:38:53 +02:00
rpl_ndbapi_multi.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_row_basic_7ndb.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
rpl_truncate_7ndb.result Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 2007-06-27 14:29:10 +02:00