summaryrefslogtreecommitdiff
path: root/sql/sql_error.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-10-26 19:30:01 +0300
committermonty@mysql.com <>2004-10-26 19:30:01 +0300
commit6fbc869d183b777576670f37edaa293f16c1fa68 (patch)
tree355a805ce6da2de5e852c4f9b8372d612070cd6d /sql/sql_error.cc
parent8b6839e6446fde2931583d4d8b74bb531add5062 (diff)
downloadmariadb-git-6fbc869d183b777576670f37edaa293f16c1fa68.tar.gz
A lot of fixes for prepared statements (PS):
New mysqltest that can run mysqltest with PS Added support for ZEROFILL in PS Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result() Updated test cases to support --ps-protocol (Some tests are still run using old protocol) Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2... Fixed crash in PS when using sub queries Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever" Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries) Fix for PS and SELECT ... PROCEDURE Reset all warnings when executing a new PS query group_concat(...ORDER BY) didn't work with PS Fixed problem with test suite when not using innodb
Diffstat (limited to 'sql/sql_error.cc')
-rw-r--r--sql/sql_error.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc
index c94d5e52bcf..87644300535 100644
--- a/sql/sql_error.cc
+++ b/sql/sql_error.cc
@@ -102,12 +102,11 @@ void mysql_reset_errors(THD *thd)
MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level,
uint code, const char *msg)
{
+ MYSQL_ERROR *err= 0;
DBUG_ENTER("push_warning");
if (thd->query_id != thd->warn_id)
mysql_reset_errors(thd);
- MYSQL_ERROR *err= NULL;
-
if (thd->warn_list.elements < thd->variables.max_error_count)
{
/*