summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2001-01-22 05:32:58 +0200
committerunknown <monty@donna.mysql.com>2001-01-22 05:32:58 +0200
commit6632102983d7f413d77f3f735ec8b22f5ffdcdaf (patch)
tree7ea59a76db7492274cdab226f410f2e27493faa1 /sql/sql_parse.cc
parente99292d4690304e6e04f70904a91331642cdbe44 (diff)
downloadmariadb-git-6632102983d7f413d77f3f735ec8b22f5ffdcdaf.tar.gz
SHOW [FULL] COLUMNS
Added timeouts to replication tests to handle concurrent inserts Docs/manual.texi: Changelog client/mysqlshow.c: Fix for new SHOW FULL COLUMNS syntax mysql-test/r/show_check.result: Fix for SHOW FULL COLUMNS mysql-test/t/alter_table.test: Fix for SHOW FULL COLUMNS mysql-test/t/rpl000001.test: Added timeout to handle concurrent inserts. mysql-test/t/rpl000002.test: Added timeout to handle concurrent inserts. mysql-test/t/rpl000003.test: Added timeout to handle concurrent inserts. mysql-test/t/rpl000007.test: Added timeout to handle concurrent inserts. mysql-test/t/rpl000008.test: Added timeout to handle concurrent inserts. mysql-test/t/rpl000009.test: Added timeout to handle concurrent inserts. mysql-test/t/rpl000010.test: Added timeout to handle concurrent inserts. mysql-test/t/rpl000011.test: Added timeout to handle concurrent inserts. mysql-test/t/rpl000012.test: Added timeout to handle concurrent inserts. mysql-test/t/rpl000013.test: Added timeout to handle concurrent inserts. mysql-test/t/rpl000014.test: Added timeout to handle concurrent inserts. mysql-test/t/rpl000015.test: Added timeout to handle concurrent inserts. mysql-test/t/rpl000016.test: Added timeout to handle concurrent inserts. mysql-test/t/select.test: Fix for SHOW FULL COLUMNS mysql-test/t/show_check.test: Fix for SHOW FULL COLUMNS mysql-test/t/type_blob.test: Fix for SHOW FULL COLUMNS mysql-test/t/type_float.test: Fix for SHOW FULL COLUMNS mysql-test/t/type_ranges.test: Fix for SHOW FULL COLUMNS sql/mysql_priv.h: Fix for SHOW FULL COLUMNS sql/sql_parse.cc: Fix for SHOW FULL COLUMNS sql/sql_show.cc: Fix for SHOW FULL COLUMNS sql/sql_yacc.yy: Fix for SHOW FULL COLUMNS
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 1b46cc51bfc..a43b10e9ad0 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1545,7 +1545,8 @@ mysql_execute_command(void)
if (grant_option && check_grant(thd,SELECT_ACL,tables,2))
goto error;
res= mysqld_show_fields(thd,tables,
- (lex->wild ? lex->wild->ptr() : NullS));
+ (lex->wild ? lex->wild->ptr() : NullS),
+ lex->verbose);
break;
}
#endif