summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authoristruewing@stella.local <>2007-11-10 11:58:41 +0100
committeristruewing@stella.local <>2007-11-10 11:58:41 +0100
commitd7ce48a9bba9f7394ecdc60b9e5e77e542a08f97 (patch)
tree7f2bedb38da74996d31783831b1b37adb8a50f36 /sql/table.cc
parentceb444fa09d00d23d4a099e9c606a5532087d421 (diff)
parent3eaf82a17504158aa29b1f39360f365428943de4 (diff)
downloadmariadb-git-d7ce48a9bba9f7394ecdc60b9e5e77e542a08f97.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into stella.local:/home2/mydev/mysql-5.1-bug31210
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc
index d8e6a034081..c3ddb809b9e 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1610,6 +1610,9 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias,
DBUG_PRINT("enter",("name: '%s.%s' form: 0x%lx", share->db.str,
share->table_name.str, (long) outparam));
+ /* Parsing of partitioning information from .frm needs thd->lex set up. */
+ DBUG_ASSERT(thd->lex->is_lex_started);
+
error= 1;
bzero((char*) outparam, sizeof(*outparam));
outparam->in_use= thd;