diff options
| author | unknown <paul@snake-hub.snake.net> | 2005-01-02 15:10:08 -0600 |
|---|---|---|
| committer | unknown <paul@snake-hub.snake.net> | 2005-01-02 15:10:08 -0600 |
| commit | f92ec090436310c745af95a846beeffe1f8dee9c (patch) | |
| tree | 287b92e268ace1634c7a60fb593b449eb449208e | |
| parent | 7a18eb7a6bee68767b0b2d59722d0bdfe551f7ce (diff) | |
| download | mariadb-git-f92ec090436310c745af95a846beeffe1f8dee9c.tar.gz | |
set_var.cc:
Silence compiler warning.
sql/set_var.cc:
Silence compiler warning.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/set_var.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index f8dd043ff10..d6ab5ae3180 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -164,6 +164,7 @@ paul@frost.snake.net paul@ice.local paul@ice.snake.net paul@kite-hub.kitebird.com +paul@snake-hub.snake.net paul@teton.kitebird.com pekka@mysql.com pem@mysql.com 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"; |