diff options
| author | unknown <monty@mishka.local> | 2005-07-18 19:03:01 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-07-18 19:03:01 +0300 |
| commit | 2a860c064d8c6a098c4c8d6238830cfe39585cdd (patch) | |
| tree | 2a23167b636e05bfda983614bbee36653c7c2c12 /sql/sql_show.cc | |
| parent | 4bf28e8c1f9fa61a398a05666226e7b3c6675750 (diff) | |
| parent | 2e9d6d7e906f800cc2a357ab4a26302eb05df7b2 (diff) | |
| download | mariadb-git-2a860c064d8c6a098c4c8d6238830cfe39585cdd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
client/mysqldump.c:
Auto merged
include/my_sys.h:
Auto merged
mysys/Makefile.am:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/mysql_client_test.c:
Auto merged
sql/sql_select.cc:
Auto merged
mysys/default.c:
SCCS merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 8343f9ec582..1608999eaef 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1718,7 +1718,7 @@ int make_table_list(THD *thd, SELECT_LEX *sel, ident_table.length= strlen(table); table_ident= new Table_ident(thd, ident_db, ident_table, 1); sel->init_query(); - if(!sel->add_table_to_list(thd, table_ident, 0, 0, TL_READ, + if (!sel->add_table_to_list(thd, table_ident, 0, 0, TL_READ, (List<String> *) 0, (List<String> *) 0)) return 1; return 0; |