diff options
| author | unknown <monty@mishka.local> | 2004-10-05 01:05:15 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-10-05 01:05:15 +0300 |
| commit | c7cf529f32b64447b389131eb61a6f8879eb4d82 (patch) | |
| tree | e1d9e264eefcfdcc716c358b1b4bb46e5cc53af4 /sql/set_var.cc | |
| parent | 6966e86951166168c72c5ecf2a6a908becfe3a21 (diff) | |
| download | mariadb-git-c7cf529f32b64447b389131eb61a6f8879eb4d82.tar.gz | |
Fixed bug in strict mode (A state was not properly cleared on successful insert/update's)
mysql-test/mysql-test-run.sh:
Print less text on failure
mysql-test/r/strict.result:
More tests for strict mode
mysql-test/t/strict.test:
More tests for strict mode
sql/set_var.cc:
Don't clear any flags in traditional mode
sql/sql_insert.cc:
Fixed bug in strict mode
sql/sql_update.cc:
Fixed bug in strict mode
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 6c83ba9470f..1d0ddd431c4 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -3102,12 +3102,9 @@ ulong fix_sql_mode(ulong sql_mode) if (sql_mode & MODE_MYSQL323) sql_mode|= MODE_NO_FIELD_OPTIONS; if (sql_mode & MODE_TRADITIONAL) - { sql_mode|= (MODE_STRICT_TRANS_TABLES | MODE_STRICT_ALL_TABLES | MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE | MODE_ERROR_FOR_DIVISION_BY_ZERO); - sql_mode&= ~MODE_INVALID_DATES; - } return sql_mode; } |