database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge with mysql-maria tree

Browse Source 
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
parent 8526274c21 6a1bc662d6
commit 945fa0d913
342 changed files with 4300 additions and 1944 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_show.cc
View File

@@ -1003,6 +1003,7 @@ static bool get_field_default_value(THD *thd, TABLE *table,
*/
has_now_default= table->timestamp_field == field &&
field->unireg_check != Field::TIMESTAMP_UN_FIELD;
has_default= (field_type != FIELD_TYPE_BLOB &&
!(field->flags & NO_DEFAULT_VALUE_FLAG) &&
field->unireg_check != Field::NEXT_NUMBER &&