diff options
author | unknown <monty@mysql.com> | 2004-01-19 23:51:17 +0100 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-01-19 23:51:17 +0100 |
commit | 43abc597b8854c44465a8a936febe780f223628c (patch) | |
tree | 98d19ab1ee2226dc59533f6531cb9b465784e3b3 /sql/set_var.cc | |
parent | 21bef0ed8c4fdaea9c9a4beed18749933b339879 (diff) | |
download | mariadb-git-43abc597b8854c44465a8a936febe780f223628c.tar.gz |
Code cleanup
Fixed bug in optimizer where it didn't choose right table order in some cases
myisam/mi_delete.c:
Remove not needed include errno.h
myisam/mi_delete_table.c:
Remove not needed include errno.h
myisam/mi_extra.c:
Remove not needed include errno.h
myisam/mi_locking.c:
Remove not needed include errno.h
myisam/mi_log.c:
Remove not needed include errno.h
myisam/mi_page.c:
Remove not needed include errno.h
myisam/mi_rename.c:
Remove not needed include errno.h
myisam/mi_update.c:
Remove not needed include errno.h
myisam/mi_write.c:
Remove not needed include errno.h
mysql-test/r/subselect.result:
Update of test after optimzier fix
mysys/charset.c:
Code cleanup
sql/item_cmpfunc.cc:
Removed not needed comment
Indentation cleanup
sql/item_cmpfunc.h:
Indentation cleanup
sql/mysqld.cc:
Updated comment for expire_logs_days
sql/set_var.cc:
Remved duplicate code
sql/sql_select.cc:
Fixed bug in optimizer where it didn't choose right table order in some cases (Bug found and fixed by Igor)
Diffstat (limited to 'sql/set_var.cc')
-rw-r--r-- | sql/set_var.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index c8b11eb0f58..ecb85440068 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2629,11 +2629,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_MSSQL) - sql_mode|= (MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES | - MODE_IGNORE_SPACE | - MODE_NO_KEY_OPTIONS | MODE_NO_TABLE_OPTIONS | - MODE_NO_FIELD_OPTIONS); if (sql_mode & MODE_POSTGRESQL) sql_mode|= (MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES | MODE_IGNORE_SPACE | @@ -2644,11 +2639,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_DB2) - sql_mode|= (MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES | - MODE_IGNORE_SPACE | - MODE_NO_KEY_OPTIONS | MODE_NO_TABLE_OPTIONS | - MODE_NO_FIELD_OPTIONS); if (sql_mode & MODE_MAXDB) sql_mode|= (MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES | MODE_IGNORE_SPACE | |