diff options
| author | Inaam Rana <inaam.rana@oracle.com> | 2010-08-05 11:42:11 -0400 |
|---|---|---|
| committer | Inaam Rana <inaam.rana@oracle.com> | 2010-08-05 11:42:11 -0400 |
| commit | 9943e3f472fd873aa253bc339bd4c018cb91daa5 (patch) | |
| tree | bb860277c0f677a3ebe871fc4d91201c64937714 /storage | |
| parent | b4a25f462ebd91612d7faeaf0df82ed34d862f38 (diff) | |
| parent | b003544f6511d32320d6240de87823b719ab0a02 (diff) | |
| download | mariadb-git-9943e3f472fd873aa253bc339bd4c018cb91daa5.tar.gz | |
merge
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index ab9df9a0272..e78f167beb6 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -425,7 +425,7 @@ static MYSQL_THDVAR_BOOL(table_locks, PLUGIN_VAR_OPCMDARG, static MYSQL_THDVAR_BOOL(strict_mode, PLUGIN_VAR_OPCMDARG, "Use strict mode when evaluating create options.", - NULL, NULL, TRUE); + NULL, NULL, FALSE); 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.", |