mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysql-test/lib
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
..
mtr_cases.pl Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 2007-07-04 22:38:53 +02:00
mtr_diff.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mtr_gcov.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mtr_gprof.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mtr_im.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mtr_io.pl BUG#25659 - memory leak via "plugins" test 2007-05-21 17:48:29 +05:00
mtr_match.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mtr_misc.pl Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 2007-03-01 19:10:07 +01:00
mtr_process.pl Reduce time for mysqladmin to try to shutdown servers from 70 to 20 seconds 2007-06-29 14:18:20 +02:00
mtr_report.pl Merge sita.local:/Users/tsmith/m/bk/51 2007-07-09 03:27:03 -06:00
mtr_stress.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mtr_timer.pl Bug#25657 mysql-test-run.pl kill itself under ActiveState perl 2007-06-26 12:26:21 +02:00
mtr_unique.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00