summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorMartin Hansson <martin.hansson@sun.com>2010-01-12 15:16:26 +0100
committerMartin Hansson <martin.hansson@sun.com>2010-01-12 15:16:26 +0100
commitc8b5804f295ea109f56f29de8c350133f9070a6a (patch)
treed747918bfcaba3b8bcd77aab0438cb1ba26c6a42 /sql/sql_parse.cc
parent3c9322e73f5b994b7ec13ed73e99ce4bc94694b8 (diff)
downloadmariadb-git-c8b5804f295ea109f56f29de8c350133f9070a6a.tar.gz
Bug#48157: crash in Item_field::used_tables
MySQL handles the join syntax "JOIN ... USING( field1, ... )" and natural joins by building the same parse tree as a corresponding join with an "ON t1.field1 = t2.field1 ..." expression would produce. This parse tree was not cleaned up properly in the following scenario. If a thread tries to lock some tables and finds that the tables were dropped and re-created while waiting for the lock, it cleans up column references in the statement by means a per-statement free list. But if the statement was part of a stored procedure, column references on the stored procedure's free list weren't cleaned up and thus contained pointers to freed objects. Fixed by adding a call to clean up the current prepared statement's free list. mysql-test/r/sp_sync.result: Bug#48157: Test case mysql-test/t/sp_sync.test: Bug#48157: Test result sql/item.h: Bug#48157: Commented field. sql/sql_parse.cc: Bug#48157: Commented function. sql/sql_update.cc: Bug#48157: fix
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 69c9ddc7806..48743a2d48f 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -615,8 +615,10 @@ void free_items(Item *item)
DBUG_VOID_RETURN;
}
-/* This works because items are allocated with sql_alloc() */
-
+/**
+ This works because items are allocated with sql_alloc().
+ @note The function also handles null pointers (empty list).
+*/
void cleanup_items(Item *item)
{
DBUG_ENTER("cleanup_items");