diff options
| author | unknown <monty@mysql.com> | 2005-04-30 03:46:38 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-04-30 03:46:38 +0300 |
| commit | 66bea0de157e07df6e1a3408d1d3c6f0c3177c7e (patch) | |
| tree | 8c0876b4d6e65974ff6a2ce510b69333467dc8e0 /sql/handler.cc | |
| parent | e9cc39c43f5e6bb38f11e0a50fb7f55acb85cc6b (diff) | |
| parent | ac82a2d5eb0f183b27ddc3417b3b33899ef17bf5 (diff) | |
| download | mariadb-git-66bea0de157e07df6e1a3408d1d3c6f0c3177c7e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index d2501afe97a..7318de1c503 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -185,9 +185,10 @@ enum db_type ha_checktype(enum db_type database_type) thd= current_thd; return ((enum db_type) thd->variables.table_type != DB_TYPE_UNKNOWN ? (enum db_type) thd->variables.table_type : - (enum db_type) global_system_variables.table_type != - DB_TYPE_UNKNOWN ? - (enum db_type) global_system_variables.table_type : DB_TYPE_MYISAM); + ((enum db_type) global_system_variables.table_type != + DB_TYPE_UNKNOWN ? + (enum db_type) global_system_variables.table_type : DB_TYPE_MYISAM) + ); } /* ha_checktype */ |