summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
diff options
context:
space:
mode:
authorjani@a193-229-222-105.elisa-laajakaista.fi <>2006-04-30 16:01:34 +0300
committerjani@a193-229-222-105.elisa-laajakaista.fi <>2006-04-30 16:01:34 +0300
commita7a8143941b25efc91875444f24514eb44929059 (patch)
tree8fead7736e62ad427687a914ac719dffb89a7d15 /sql/set_var.cc
parent8f888106bafe7aec9e4e66584d7e34f7906a900d (diff)
downloadmariadb-git-a7a8143941b25efc91875444f24514eb44929059.tar.gz
Fix for Bug#14515.
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r--sql/set_var.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 681c70c4c02..97d4fba208c 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -3207,10 +3207,6 @@ ulong fix_sql_mode(ulong sql_mode)
MODE_IGNORE_SPACE |
MODE_NO_KEY_OPTIONS | MODE_NO_TABLE_OPTIONS |
MODE_NO_FIELD_OPTIONS);
- if (sql_mode & MODE_MYSQL40)
- sql_mode|= MODE_NO_FIELD_OPTIONS;
- if (sql_mode & MODE_MYSQL323)
- sql_mode|= MODE_NO_FIELD_OPTIONS;
return sql_mode;
}