diff options
| author | unknown <jbruehe/mysqldev@mysql.com/production.mysql.com> | 2007-08-16 18:21:47 +0200 |
|---|---|---|
| committer | unknown <jbruehe/mysqldev@mysql.com/production.mysql.com> | 2007-08-16 18:21:47 +0200 |
| commit | 6b10f518b9eb2ca8dd5c0f2ec0c67a6fde730729 (patch) | |
| tree | 9a62f903d57f431cf953e28060ff94f1b7cfc663 /sql/table.cc | |
| parent | c492a2392e283b6448cac2b3813b5a8b3906df93 (diff) | |
| parent | 1c47af79da738cbba009d2801da0cfb8ee45a3da (diff) | |
| download | mariadb-git-6b10f518b9eb2ca8dd5c0f2ec0c67a6fde730729.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/data0/mysqldev/my/mysql-5.1-30367
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
sql/log_event.cc:
Manual merge, later version of the fix takes precedence.
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 9c00f53aadb..c1d8e3abe94 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1753,7 +1753,7 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias, } #ifdef WITH_PARTITION_STORAGE_ENGINE - if (share->partition_info_len) + if (share->partition_info_len && outparam->file) { /* In this execution we must avoid calling thd->change_item_tree since |