diff options
| author | unknown <monty@mysql.com> | 2005-04-27 17:16:08 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-04-27 17:16:08 +0300 |
| commit | 0e1e0ddf23a9aa89ee89022bd018f3eb47e84d86 (patch) | |
| tree | 1659e377a1ee83ee3fe2a8d2ccbd1ec06f8643ee /sql | |
| parent | 81e8630e2fb55dbd4da7cf4e4c20b44223d80857 (diff) | |
| download | mariadb-git-0e1e0ddf23a9aa89ee89022bd018f3eb47e84d86.tar.gz | |
mysqladmin extended-status now displays global status
Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part
client/mysqladmin.cc:
Show GLOBAL status
myisam/mi_key.c:
Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part
(Ramil will soon push test cases)
sql/handler.cc:
Indentation fix
tests/mysql_client_test.c:
Portability fixes
Diffstat (limited to 'sql')
| -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 dc63b4b038f..50f82eb5753 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -175,9 +175,10 @@ enum db_type ha_checktype(enum db_type database_type) 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 */ |