summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2005-03-23 08:36:48 +0200
committerbell@sanja.is.com.ua <>2005-03-23 08:36:48 +0200
commit4554b1f2632aa8b05edda4bdd56f9007b9c80448 (patch)
tree1a44d0ad7fd7c6b39daf960d107346319e9f5e74 /sql/sql_prepare.cc
parent80d9cafa8fc3cae6b27928d376bcbb01212ce48b (diff)
downloadmariadb-git-4554b1f2632aa8b05edda4bdd56f9007b9c80448.tar.gz
fixed union types merging and table related metadata (BUG#8824)
Diffstat (limited to 'sql/sql_prepare.cc')
-rw-r--r--sql/sql_prepare.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 1dc46aef4da..b57f88ac172 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -1079,7 +1079,7 @@ static int mysql_test_select(Prepared_statement *stmt,
thd->used_tables= 0; // Updated by setup_fields
// JOIN::prepare calls
- if (unit->prepare(thd, 0, 0))
+ if (unit->prepare(thd, 0, 0, ""))
{
send_error(thd);
goto err_prep;
@@ -1228,7 +1228,7 @@ static int select_like_statement_test(Prepared_statement *stmt,
thd->used_tables= 0; // Updated by setup_fields
// JOIN::prepare calls
- if (lex->unit.prepare(thd, 0, 0))
+ if (lex->unit.prepare(thd, 0, 0, ""))
{
res= thd->net.report_error ? -1 : 1;
}