diff options
| author | unknown <serg@sergbook.mysql.com> | 2005-01-03 15:35:58 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2005-01-03 15:35:58 +0200 |
| commit | d0a3752bacf93adaf356b2613576cd8e74021d55 (patch) | |
| tree | 30e4509c0f8685b1b5e501d3a165db1915598080 /sql | |
| parent | cdc425d5a28939c49ccd5fe4beb924a74f9e927f (diff) | |
| parent | 942ae30f8f89c4ef7ec698578791adb1378c903b (diff) | |
| download | mariadb-git-d0a3752bacf93adaf356b2613576cd8e74021d55.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index e39d9934278..082c55db188 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2948,7 +2948,7 @@ 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())) || + (ulong) (db_type= ha_resolve_by_name(res->ptr(), res->length()))) || ha_checktype(db_type) != db_type) { value= res ? res->c_ptr() : "NULL"; |