At http://bazaar.launchpad.net/~maria-captains/maria/5.2/ ------------------------------------------------------------ revno: 2790 revision-id: sergii@pisem.net-20100511144923-qmeh03thhyo03k7i parent: sergii@pisem.net-20100430200927-y72tocoufz3am4k6 committer: Sergei Golubchik <sergii@pisem.net> branch nick: 5.2 timestamp: Tue 2010-05-11 16:49:23 +0200 message: A temporary solution to make CREATE TABLE attributes to work when a table is partitioned === added file 'mysql-test/r/partition_example.result' --- a/mysql-test/r/partition_example.result 1970-01-01 00:00:00 +0000 +++ b/mysql-test/r/partition_example.result 2010-05-11 14:49:23 +0000 @@ -0,0 +1,31 @@ +install plugin example soname 'ha_example.so'; +create table t1 (a int not null) +engine=example +partition by list (a) +(partition p0 values in (1), partition p1 values in (2)); +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) NOT NULL +) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 +/*!50100 PARTITION BY LIST (a) +(PARTITION p0 VALUES IN (1) ENGINE = EXAMPLE, + PARTITION p1 VALUES IN (2) ENGINE = EXAMPLE) */ +drop table t1; +create table t1 (a int not null) +engine=example ull=12340 +partition by list (a) +(partition p0 values in (1), partition p1 values in (2)); +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) NOT NULL +) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `ull`=12340 +/*!50100 PARTITION BY LIST (a) +(PARTITION p0 VALUES IN (1) ENGINE = EXAMPLE, + PARTITION p1 VALUES IN (2) ENGINE = EXAMPLE) */ +drop table t1; +select 1; +1 +1 +uninstall plugin example; === added file 'mysql-test/t/partition_example-master.opt' --- a/mysql-test/t/partition_example-master.opt 1970-01-01 00:00:00 +0000 +++ b/mysql-test/t/partition_example-master.opt 2010-05-11 14:49:23 +0000 @@ -0,0 +1 @@ +$EXAMPLE_PLUGIN_OPT === added file 'mysql-test/t/partition_example.test' --- a/mysql-test/t/partition_example.test 1970-01-01 00:00:00 +0000 +++ b/mysql-test/t/partition_example.test 2010-05-11 14:49:23 +0000 @@ -0,0 +1,23 @@ +--source include/not_windows_embedded.inc +--source include/have_example_plugin.inc +--source include/have_partition.inc + +--replace_regex /\.dll/.so/ +eval install plugin example soname $HA_EXAMPLE_SO; + +create table t1 (a int not null) +engine=example +partition by list (a) +(partition p0 values in (1), partition p1 values in (2)); +show create table t1; +drop table t1; + +create table t1 (a int not null) +engine=example ull=12340 +partition by list (a) +(partition p0 values in (1), partition p1 values in (2)); +show create table t1; +drop table t1; + +select 1; +uninstall plugin example; === modified file 'mysql-test/t/plugin.test' --- a/mysql-test/t/plugin.test 2010-04-30 20:04:35 +0000 +++ b/mysql-test/t/plugin.test 2010-05-11 14:49:23 +0000 @@ -131,7 +131,7 @@ SET @@SQL_MODE=@OLD_SQL_MODE; # The only preparable statement above was CREATE TABLE. # We need to prepare another statement here to force the # previous one to be deallocated (mysqltest reuses the same handle) -# and to unlock all thread-local plugin locks. Otherwise it won't +# and to unlock all thread-local plugin locks. Otherwise the plugin won't # uninstall. # select 1; === modified file 'sql/ha_partition.cc' --- a/sql/ha_partition.cc 2010-04-08 12:10:05 +0000 +++ b/sql/ha_partition.cc 2010-05-11 14:49:23 +0000 @@ -1219,9 +1219,7 @@ int ha_partition::prepare_new_partition( DBUG_ENTER("prepare_new_partition"); if ((error= set_up_table_before_create(tbl, part_name, create_info, - 0, p_elem)) || - parse_engine_table_options(ha_thd(), file->ht, - file->table_share)) + 0, p_elem))) goto error_create; if ((error= file->ha_create(part_name, tbl, create_info))) { === modified file 'sql/ha_partition.h' --- a/sql/ha_partition.h 2010-03-15 11:51:23 +0000 +++ b/sql/ha_partition.h 2010-05-11 14:49:23 +0000 @@ -1113,4 +1113,27 @@ public: ------------------------------------------------------------------------- virtual void append_create_info(String *packet) */ + + /* + the following heavily relies on the fact that all partitions + are in the same storage engine. + + When this limitation is lifted, the following hack should go away, + and a proper interface for engines needs to be introduced: + + an PARTITION_SHARE structure that has a pointer to the TABLE_SHARE. + is given to engines everywhere where TABLE_SHARE is used now + has members like option_struct, ha_data + perhaps TABLE needs to be split the same way too... + + this can also be done before partition will support a mix of engines, + but preferably together with other incompatible API changes. + */ + virtual handlerton *partition_ht() const + { + handlerton *h= m_file[0]->ht; + for (int i=1; i < m_tot_parts; i++) + DBUG_ASSERT(h == m_file[i]->ht); + return h; + } }; === modified file 'sql/handler.cc' --- a/sql/handler.cc 2010-04-09 09:26:17 +0000 +++ b/sql/handler.cc 2010-05-11 14:49:23 +0000 @@ -3720,9 +3720,6 @@ int ha_create_table(THD *thd, const char name= get_canonical_filename(table.file, share.path.str, name_buff); - if (parse_engine_table_options(thd, table.file->ht, &share)) - goto err; - error= table.file->ha_create(name, &table, create_info); VOID(closefrm(&table, 0)); === modified file 'sql/handler.h' --- a/sql/handler.h 2010-04-30 10:12:25 +0000 +++ b/sql/handler.h 2010-05-11 14:49:23 +0000 @@ -2230,6 +2230,10 @@ private: virtual int rename_partitions(const char *path) { return HA_ERR_WRONG_COMMAND; } friend class ha_partition; +public: + /* XXX to be removed, see ha_partition::partition_ht() */ + virtual handlerton *partition_ht() const + { return ht; } }; === modified file 'sql/sql_table.cc' --- a/sql/sql_table.cc 2010-04-30 10:12:25 +0000 +++ b/sql/sql_table.cc 2010-05-11 14:49:23 +0000 @@ -3445,7 +3445,7 @@ mysql_prepare_create_table(THD *thd, HA_ if (parse_option_list(thd, &create_info->option_struct, create_info->option_list, - create_info->db_type->table_options, FALSE, + file->partition_ht()->table_options, FALSE, thd->mem_root)) DBUG_RETURN(TRUE); === modified file 'sql/table.cc' --- a/sql/table.cc 2010-04-30 20:09:27 +0000 +++ b/sql/table.cc 2010-05-11 14:49:23 +0000 @@ -1636,7 +1636,7 @@ static int open_binary_frm(THD *thd, TAB if (engine_table_options_frm_read(options, options_len, share)) goto free_and_err; } - if (parse_engine_table_options(thd, handler_file->ht, share)) + if (parse_engine_table_options(thd, handler_file->partition_ht(), share)) goto free_and_err; my_free(buff, MYF(MY_ALLOW_ZERO_PTR));