diff options
| author | unknown <monty@mishka.local> | 2005-04-16 04:35:54 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-04-16 04:35:54 +0300 |
| commit | 2be63528bc0f7d524df4660cea4fcc002604c42e (patch) | |
| tree | 4432c91a9b8ee8482b369f2a066a5e9a9d87b399 /sql/set_var.cc | |
| parent | 88538066ba1cbf80da5f88b0d4188f8b875127c9 (diff) | |
| parent | 9b224e9180d26aa5b7e087537255c60c5c061ad3 (diff) | |
| download | mariadb-git-2be63528bc0f7d524df4660cea4fcc002604c42e.tar.gz | |
Merge with 4.1
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/set_var.cc:
Auto merged
support-files/mysql.server.sh:
Auto merged
sql/ha_ndbcluster.cc:
Merge
sql/handler.cc:
Merge
sql/handler.h:
Merge
sql/mysqld.cc:
Merge
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index fa8eddf7218..70d64b5dac6 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -3125,8 +3125,8 @@ bool sys_var_thd_storage_engine::check(THD *thd, set_var *var) enum db_type db_type; if (!(res=var->value->val_str(&str)) || !(var->save_result.ulong_value= - (ulong) (db_type= ha_resolve_by_name(res->ptr(), res->length()))) || - ha_checktype(db_type) != db_type) + (ulong) (db_type= ha_resolve_by_name(res->ptr(), res->length()))) || + ha_checktype(db_type) != db_type) { value= res ? res->c_ptr() : "NULL"; goto err; |