mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysql-test/lib
History
unknown 01a979e8b2 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
include/config-win.h:
  Manual merge between main 5.1 and 5.1 marvel.
mysql-test/r/change_user.result:
  Manual merge between main 5.1 and 5.1 marvel.
mysql-test/t/change_user.test:
  Manual merge between main 5.1 and 5.1 marvel.
sql/sql_plugin.cc:
  Manual merge between main 5.1 and 5.1 marvel.
2008-03-28 12:14:27 +02:00
..
My WL#3949 Test should set binlog format dnamically 2007-11-23 13:29:31 +01:00
mtr_cases.pl Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 2008-02-06 16:16:49 +01: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 WL#3949, second part. Added soft switching of the binlog format (w/o restart a server) 2007-11-20 19:55:51 +03:00
mtr_process.pl Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 2007-08-03 12:52:31 +02:00
mtr_report.pl Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main 2008-03-28 12:14:27 +02:00
mtr_stress.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mtr_timer.pl Remove unecessary use of "Socket" 2007-08-24 13:10:34 +02:00
mtr_unique.pl my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00