summaryrefslogtreecommitdiff
path: root/sql/item_create.cc
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@magare.gmz>2007-08-29 16:32:26 +0300
committerunknown <gkodinov/kgeorge@magare.gmz>2007-08-29 16:32:26 +0300
commit40aaeeea521493996abdf4a064f4f28cb2e37688 (patch)
tree1976ac155ef9d7b90535559e57d6015ea6e673be /sql/item_create.cc
parentd2bd51c55f76e3f0fc6ad13f1dce091019eb7555 (diff)
parent385ef618e8a7e45b6087eadd30426d60b529e354 (diff)
downloadmariadb-git-40aaeeea521493996abdf4a064f4f28cb2e37688.tar.gz
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B30244-5.1-opt sql/item_create.cc: Auto merged
Diffstat (limited to 'sql/item_create.cc')
-rw-r--r--sql/item_create.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc
index 03424da80a8..12b795e79a1 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -3339,6 +3339,7 @@ Create_func_found_rows Create_func_found_rows::s_singleton;
Item*
Create_func_found_rows::create(THD *thd)
{
+ thd->lex->set_stmt_unsafe();
thd->lex->safe_to_cache_query= 0;
return new (thd->mem_root) Item_func_found_rows();
}
@@ -4234,6 +4235,7 @@ Create_func_row_count Create_func_row_count::s_singleton;
Item*
Create_func_row_count::create(THD *thd)
{
+ thd->lex->set_stmt_unsafe();
thd->lex->safe_to_cache_query= 0;
return new (thd->mem_root) Item_func_row_count();
}