diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
| commit | b4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch) | |
| tree | 18a0c25fdc9ac0076da19247666414a46434b85e /storage/pbxt | |
| parent | 9809f05199aeb0b67991fac41bd86f38730768dc (diff) | |
| download | mariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz | |
post-merge fixes.
most tests pass.
5.3 merge is next
Diffstat (limited to 'storage/pbxt')
| -rw-r--r-- | storage/pbxt/src/discover_xt.cc | 3 | ||||
| -rw-r--r-- | storage/pbxt/src/ha_pbxt.cc | 2 | ||||
| -rw-r--r-- | storage/pbxt/src/myxt_xt.cc | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/storage/pbxt/src/discover_xt.cc b/storage/pbxt/src/discover_xt.cc index ee52c182a73..05891bdf19d 100644 --- a/storage/pbxt/src/discover_xt.cc +++ b/storage/pbxt/src/discover_xt.cc @@ -1493,7 +1493,8 @@ static bool mysql_create_table_no_lock(THD *thd, if (create_info->options & HA_LEX_CREATE_TMP_TABLE) { /* Open table and put in temporary table list */ - if (!(open_temporary_table(thd, path, db, table_name, 1))) + TABLE *table= open_table_uncached(thd, path, db, table_name, TRUE); + if (!table) { (void) rm_temporary_table(create_info->db_type, path); goto unlock_and_end; diff --git a/storage/pbxt/src/ha_pbxt.cc b/storage/pbxt/src/ha_pbxt.cc index 0746958bf4c..5b9e30a9213 100644 --- a/storage/pbxt/src/ha_pbxt.cc +++ b/storage/pbxt/src/ha_pbxt.cc @@ -5819,7 +5819,7 @@ int ha_pbxt::get_foreign_key_list(THD *thd, List<FOREIGN_KEY_INFO> *f_key_list) ref_tbl_name++; ref_db_name++; - fk_info->forein_id = thd_make_lex_string(thd, 0, + fk_info->foreign_id = thd_make_lex_string(thd, 0, fk->co_name, (uint) strlen(fk->co_name), 1); fk_info->referenced_db = thd_make_lex_string(thd, 0, diff --git a/storage/pbxt/src/myxt_xt.cc b/storage/pbxt/src/myxt_xt.cc index d36f7334cfd..7fd94aeaef7 100644 --- a/storage/pbxt/src/myxt_xt.cc +++ b/storage/pbxt/src/myxt_xt.cc @@ -2062,11 +2062,7 @@ static TABLE *my_open_table(XTThreadPtr self, XTDatabaseHPtr XT_UNUSED(db), XTPa return NULL; } -#if MYSQL_VERSION_ID >= 50404 - if ((error = open_table_from_share(thd, share, "", 0, (uint) READ_ALL, 0, table, OTM_OPEN))) -#else if ((error = open_table_from_share(thd, share, "", 0, (uint) READ_ALL, 0, table, FALSE))) -#endif { xt_free(self, table); lex_end(&new_lex); |