mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysql-test/suite
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
..
binlog Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 2007-07-04 22:38:53 +02:00
funcs_1 WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
funcs_2 WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
jp Many files: 2005-01-07 14:32:05 +02:00
large_tests Bug#27029 alter table ... enable keys crashes mysqld on large table 2007-06-21 12:45:56 -04:00
ndb Merge sita.local:/Users/tsmith/m/bk/51 2007-07-09 03:27:03 -06:00
parts Many tests have been moved to suite/*. Some tests have been removed. 2007-07-04 23:41:15 +02:00
row_lock test of row locking. 2007-04-05 16:04:31 +02:00
rpl Merge sita.local:/Users/tsmith/m/bk/51 2007-07-09 03:27:03 -06:00
rpl_ndb Merge sita.local:/Users/tsmith/m/bk/51 2007-07-09 03:27:03 -06:00