1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00

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
This commit is contained in:
Michael Widenius
2009-02-19 11:01:25 +02:00
342 changed files with 4300 additions and 1944 deletions

View File

@@ -637,8 +637,7 @@ drop table t1;
--echo ** connection default
connection default;
drop table t1;
DROP user mysqltest@localhost;
drop user mysqltest@localhost;
disconnect thread1;
disconnect thread2;