mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage
History
unknown a69a96e26a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51


client/mysqltest.c:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_wincond.c:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
client/mysql_upgrade.c:
  Manual merge; I chose to keep Magnus' changes because they make the code
  more simple; always use *only* the option file created by mysql_upgrade.
mysql-test/extra/binlog_tests/ctype_cp932.test:
  Manual merge
mysql-test/r/binlog_row_ctype_cp932.result:
  Manual merge
mysql-test/r/binlog_stm_ctype_cp932.result:
  Manual merge
mysql-test/r/mysqlbinlog.result:
  Manual merge
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Manual merge
mysql-test/t/mysqlbinlog.test:
  Manual merge
mysql-test/t/rpl_switch_stm_row_mixed.test:
  Manual merge
2007-03-07 07:21:24 +01:00
..
archive Fixed compiler warnings 2007-02-23 13:13:55 +02:00
blackhole Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-02-26 15:54:43 +04:00
csv Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-01-11 22:15:20 +03:00
example After merge fixes 2007-01-29 01:47:35 +02:00
federated After merge fixes 2007-01-29 01:47:35 +02:00
heap Merge mysql.com:/home/my/mysql-5.0 2007-01-27 03:46:45 +02:00
innobase Bug #26598: Create variable to allow turning off of statistic gathering on metadata commands 2007-03-06 10:36:15 -07:00
myisam Fixed compiler warnings 2007-02-23 13:13:55 +02:00
myisammrg Remove compiler warnings 2007-02-27 19:31:49 +02:00
ndb Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-02-28 22:32:44 +01:00
Makefile.am Many files: 2006-12-31 02:29:11 +01:00