database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Change default for innodb_strict_mode to FALSE.

Browse Source 
Note that this was originally pushed by Calvin but the was later
reverted by mistake.

bug#54702
This commit is contained in:
Inaam Rana
2010-08-13 15:07:22 -04:00
parent 0daa01fed0
commit 231a97fde0
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/suite/sys_vars/r/innodb_strict_mode_basic.result
View File

@ -1,32 +1,32 @@
SET @start_global_value = @@global.innodb_strict_mode; SET @start_global_value = @@global.innodb_strict_mode;
SELECT @start_global_value; SELECT @start_global_value;
@start_global_value @start_global_value
1 0
Valid values are 'ON' and 'OFF' Valid values are 'ON' and 'OFF'
select @@global.innodb_strict_mode in (0, 1); select @@global.innodb_strict_mode in (0, 1);
@@global.innodb_strict_mode in (0, 1) @@global.innodb_strict_mode in (0, 1)
1 1
select @@global.innodb_strict_mode; select @@global.innodb_strict_mode;
@@global.innodb_strict_mode @@global.innodb_strict_mode
1 0
select @@session.innodb_strict_mode in (0, 1); select @@session.innodb_strict_mode in (0, 1);
@@session.innodb_strict_mode in (0, 1) @@session.innodb_strict_mode in (0, 1)
1 1
select @@session.innodb_strict_mode; select @@session.innodb_strict_mode;
@@session.innodb_strict_mode @@session.innodb_strict_mode
1 0
show global variables like 'innodb_strict_mode'; show global variables like 'innodb_strict_mode';
Variable_name Value Variable_name Value
innodb_strict_mode ON innodb_strict_mode OFF
show session variables like 'innodb_strict_mode'; show session variables like 'innodb_strict_mode';
Variable_name Value Variable_name Value
innodb_strict_mode ON innodb_strict_mode OFF
select * from information_schema.global_variables where variable_name='innodb_strict_mode'; select * from information_schema.global_variables where variable_name='innodb_strict_mode';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
INNODB_STRICT_MODE ON INNODB_STRICT_MODE OFF
select * from information_schema.session_variables where variable_name='innodb_strict_mode'; select * from information_schema.session_variables where variable_name='innodb_strict_mode';
VARIABLE_NAME VARIABLE_VALUE VARIABLE_NAME VARIABLE_VALUE
INNODB_STRICT_MODE ON INNODB_STRICT_MODE OFF
set global innodb_strict_mode='OFF'; set global innodb_strict_mode='OFF';
set session innodb_strict_mode='OFF'; set session innodb_strict_mode='OFF';
select @@global.innodb_strict_mode; select @@global.innodb_strict_mode;
@ -117,4 +117,4 @@ INNODB_STRICT_MODE ON
SET @@global.innodb_strict_mode = @start_global_value; SET @@global.innodb_strict_mode = @start_global_value;
SELECT @@global.innodb_strict_mode; SELECT @@global.innodb_strict_mode;
@@global.innodb_strict_mode @@global.innodb_strict_mode
1 0

2
storage/innobase/handler/ha_innodb.cc
View File

@ -425,7 +425,7 @@ static MYSQL_THDVAR_BOOL(table_locks, PLUGIN_VAR_OPCMDARG,
static MYSQL_THDVAR_BOOL(strict_mode, PLUGIN_VAR_OPCMDARG, static MYSQL_THDVAR_BOOL(strict_mode, PLUGIN_VAR_OPCMDARG,
"Use strict mode when evaluating create options.", "Use strict mode when evaluating create options.",
NULL, NULL, TRUE); NULL, NULL, FALSE);
static MYSQL_THDVAR_ULONG(lock_wait_timeout, PLUGIN_VAR_RQCMDARG, static MYSQL_THDVAR_ULONG(lock_wait_timeout, PLUGIN_VAR_RQCMDARG,
"Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.", "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.",