diff options
| author | unknown <istruewing@stella.local> | 2007-11-10 11:58:41 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2007-11-10 11:58:41 +0100 |
| commit | 4b1e7b75b137ce2a56eaf4a071bd16ecfb6f89a2 (patch) | |
| tree | 7f2bedb38da74996d31783831b1b37adb8a50f36 /sql/table.cc | |
| parent | 6cc90dbb2231865839a5d00090e5f89c889e14a2 (diff) | |
| parent | e5b2745efc9451081c56b7a6b2f4cdfcc6dfb280 (diff) | |
| download | mariadb-git-4b1e7b75b137ce2a56eaf4a071bd16ecfb6f89a2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into stella.local:/home2/mydev/mysql-5.1-bug31210
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_connect.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_servers.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 3 |
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; |