Michael Widenius 945fa0d913 Merge with mysql-maria tree ... mysql-test/t/variables.test: Reset delay_key_write, otherwise maria.maria test may fail sql/set_var.cc: Reset ha_open_options if one resets the delay_key_write variable. Before there was no way to reset it without restarting mysqld, which caused some tests to fail		2009-02-19 11:01:25 +02:00
..
archive	Merge with base MySQL 5.1	2009-02-15 12:58:34 +02:00
blackhole	Added "Sun Microsystems, Inc." to copyright headers on files modified	2008-11-10 21:21:49 +01:00
csv	Merge with base MySQL 5.1	2009-02-15 12:58:34 +02:00
example	Merge trift2.:/MySQL/M51/mysql-5.1	2008-03-14 14:41:08 +01:00
federated	merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.	2009-02-12 15:08:56 +01:00
heap	merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.	2009-02-12 15:08:56 +01:00
innobase	Merge with base MySQL 5.1	2009-02-15 12:58:34 +02:00
maria	Merge with mysql-maria tree	2009-02-19 11:01:25 +02:00
myisam	Merge with base MySQL 5.1	2009-02-15 12:58:34 +02:00
myisammrg	Fixed warnings and errors discovered by pushbuild2	2008-12-04 02:36:55 +02:00
ndb	Merge with base MySQL 5.1	2009-02-15 12:58:34 +02:00
Makefile.am	fixes for make distclean, solaris, macosx, windows	2007-12-13 13:28:35 +01:00