diff options
| author | jani@ua141d10.elisa.omakaista.fi <> | 2006-05-04 18:35:58 +0300 |
|---|---|---|
| committer | jani@ua141d10.elisa.omakaista.fi <> | 2006-05-04 18:35:58 +0300 |
| commit | 0410832526aba279628211e51b234e2809126d2f (patch) | |
| tree | d884911cd233444e15219563b5ace4430095caf9 /sql/set_var.cc | |
| parent | 634afcc9f8893b43eaccd385433be4dac1a56764 (diff) | |
| parent | d3467c0b4c0e6ea4a7d7f996174bc85c832af911 (diff) | |
| download | mariadb-git-0410832526aba279628211e51b234e2809126d2f.tar.gz | |
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 8c12c125173..215d3cfc879 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -3430,9 +3430,9 @@ ulong fix_sql_mode(ulong sql_mode) MODE_NO_KEY_OPTIONS | MODE_NO_TABLE_OPTIONS | MODE_NO_FIELD_OPTIONS | MODE_NO_AUTO_CREATE_USER); if (sql_mode & MODE_MYSQL40) - sql_mode|= MODE_NO_FIELD_OPTIONS | MODE_HIGH_NOT_PRECEDENCE; + sql_mode|= MODE_HIGH_NOT_PRECEDENCE; if (sql_mode & MODE_MYSQL323) - sql_mode|= MODE_NO_FIELD_OPTIONS | MODE_HIGH_NOT_PRECEDENCE; + sql_mode|= MODE_HIGH_NOT_PRECEDENCE; if (sql_mode & MODE_TRADITIONAL) sql_mode|= (MODE_STRICT_TRANS_TABLES | MODE_STRICT_ALL_TABLES | MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE | |