diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-09 12:04:55 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-09 12:04:55 +0300 |
| commit | 351b912e8549037e5c5006d184b5092707ae7c5a (patch) | |
| tree | ab383df31e6af9c12b49b742a2078505a98fcf9e /sql/sql_handler.cc | |
| parent | 546e16ebd8685f490d90e376df6116175b62fcba (diff) | |
| download | mariadb-git-351b912e8549037e5c5006d184b5092707ae7c5a.tar.gz | |
Backport of:
----------------------------------------------------------
revno: 2617.69.25
committer: Konstantin Osipov <kostja@sun.com>
branch nick: 5.4-42546
timestamp: Fri 2009-08-14 23:52:00 +0400
message:
A cleanup in open_tables() and lock_tables():
change return type of these functions to bool from int,
to follow convention in the rest of the code.
(Part of WL#4284 review fixes).
sql/mysql_priv.h:
Change return type of open_talbes() and lock_tables() from
int to bool.
sql/sql_base.cc:
Change return type of open_tables() and lock_tables() from int to bool.
sql/sql_handler.cc:
Use bool now that open_tables() returns bool.
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 0bc9623c31c..94f6b248e45 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -193,7 +193,7 @@ bool mysql_ha_open(THD *thd, TABLE_LIST *tables, bool reopen) TABLE_LIST *hash_tables = NULL; char *db, *name, *alias; uint dblen, namelen, aliaslen, counter; - int error; + bool error; TABLE *backup_open_tables; MDL_context backup_mdl_context; DBUG_ENTER("mysql_ha_open"); @@ -321,8 +321,8 @@ bool mysql_ha_open(THD *thd, TABLE_LIST *tables, bool reopen) can close a single table only. */ close_thread_tables(thd); - my_error(ER_ILLEGAL_HA, MYF(0), tables->alias); - error= 1; + my_error(ER_ILLEGAL_HA, MYF(0), hash_tables->alias); + error= TRUE; } else { |