diff options
| author | unknown <monty@mysql.com> | 2005-04-27 17:19:32 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-04-27 17:19:32 +0300 |
| commit | 8b5b3652eca26b08a95548582d79952c4f8d59b1 (patch) | |
| tree | 8b5b6052b349685e2dd8951ccd1435fe9c547d5e /sql/handler.cc | |
| parent | a082303fe147a4d456e845d1c7f901f15cefabc8 (diff) | |
| parent | 0e1e0ddf23a9aa89ee89022bd018f3eb47e84d86 (diff) | |
| download | mariadb-git-8b5b3652eca26b08a95548582d79952c4f8d59b1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
myisam/mi_key.c:
Auto merged
sql/handler.cc:
Auto merged
tests/mysql_client_test.c:
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 3095aeb9476..939aee4fc6e 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 */ |