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

4
sql/handler.cc
View File

@@ -2658,8 +2658,12 @@ void handler::print_error(int error, myf errflag)
break;
case HA_ERR_RECORD_FILE_FULL:
case HA_ERR_INDEX_FILE_FULL:
{
textno=ER_RECORD_FILE_FULL;
/* Write the error message to error log */
errflag|= ME_NOREFRESH;
break;
}
case HA_ERR_LOCK_WAIT_TIMEOUT:
textno=ER_LOCK_WAIT_TIMEOUT;
break;