- developers - lists.mariadb.org

[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2851: Change commit mails to go to commits@mariadb.org
by noreply＠launchpad.net 05 May '10

05 May '10

------------------------------------------------------------ revno: 2851 committer: knielsen(a)knielsen-hq.org branch nick: mariadb-5.1 timestamp: Wed 2010-05-05 14:58:26 +0200 message: Change commit mails to go to commits(a)mariadb.org modified: .bzr-mysql/default.conf -- lp:maria https://code.launchpad.net/~maria-captains/maria/5.1 Your team Maria developers is subscribed to branch lp:maria. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription

1 0

[Maria-developers] New Maria Docs list
by Daniel Bartholomew 05 May '10

05 May '10

All, I've created a new "Maria Docs" Launchpad team and mailing list for documentation-related discussions (including things like documentation for current and upcoming releases of MariaDB, planning and discussion of the askmonty.org knowledgebase, and so on). The group is open to everyone. https://launchpad.net/~maria-docs Thanks! -- Daniel Bartholomew Monty Program - http://askmonty.org

1 0

Re: [Maria-developers] Route commit messages to separate list
by Daniel Bartholomew 03 May '10

03 May '10

On Mon, 3 May 2010 13:12:46 +0300 Henrik Ingo <hingo(a)askmonty.org> wrote: Henrik> Hi Colin Henrik> Henrik> You're working on moving commit messages to a separate list Henrik> from maria- developers. Henrik> Henrik> Since you're traveling, do you want to toss the ball to Daniel Henrik> to do that? You have the info on how to do it though. I've actually been working on this with Sergei. Colin, if you have any feedback, let me know! Thanks. -- Daniel Bartholomew Monty Program - http://askmonty.org

1 0

[Maria-developers] Please check optimiser regression in MySQL 5.1.46
by Kristian Nielsen 03 May '10

03 May '10

Hi Igor, Timour, Sergey, Can one of you please check this patch from MySQL 5.1.46? It is a commit to fix http://bugs.mysql.com/bug.php?id=51494 This patch introduces a regression: http://bugs.mysql.com/bug.php?id=53334 If I revert the patch, the regression disappears. And interestingly, the included test case does not fail even when the fix is reverted (go figure...) So it would be good if one of you could check the patch and check what is wrong with it, and if a different fix for Bug#51494 is needed. (needed to complete merge of MySQL 5.1.46). Thanks, - Kristian. ------------------------------------------------------------ revno: 3407.1.1 revision-id: sergey.glukhov(a)sun.com-20100319060102-57ykzjf4pc93avy1 parent: omer(a)mysql.com-20100318064207-l3ap0mpxt510b4n3 committer: Sergey Glukhov <Sergey.Glukhov(a)sun.com> branch nick: mysql-5.1-bugteam timestamp: Fri 2010-03-19 10:01:02 +0400 message: Bug#51494 crash with join, explain and 'sounds like' operator The crash happens because of discrepancy between values of conts_tables and join->const_table_map(make_join_statisctics). Calculation of conts_tables used condition with HA_STATS_RECORDS_IS_EXACT flag check. Calculation of join->const_table_map does not use this flag check. In case of MERGE table without union with index the table does not become const table and thus join_read_const_table() is not called for the table. join->const_table_map supposes this table is const and later in make_join_select this table is used for making&calculation const condition. As table record buffer is not populated it leads to crash. The fix is adding a check if an engine supports HA_STATS_RECORDS_IS_EXACT flag before updating join->const_table_map. diff: === modified file 'sql/sql_select.cc' --- sql/sql_select.cc 2010-03-14 16:01:45 +0000 +++ sql/sql_select.cc 2010-03-19 06:01:02 +0000 @@ -2943,7 +2943,8 @@ s->quick=select->quick; s->needed_reg=select->needed_reg; select->quick=0; - if (records == 0 && s->table->reginfo.impossible_range) + if (records == 0 && s->table->reginfo.impossible_range && + (s->table->file->ha_table_flags() & HA_STATS_RECORDS_IS_EXACT)) { /* Impossible WHERE or ON expression === modified file 'mysql-test/r/merge.result' --- mysql-test/r/merge.result 2010-03-03 10:49:03 +0000 +++ mysql-test/r/merge.result 2010-03-19 06:01:02 +0000 @@ -2286,4 +2286,16 @@ DROP TABLE m1; DROP TABLE `test@1`.`t@1`; DROP DATABASE `test@1`; +# +# Bug#51494c rash with join, explain and 'sounds like' operator +# +CREATE TABLE t1 (a INT) ENGINE=MYISAM; +INSERT INTO t1 VALUES(1); +CREATE TABLE t2 (b INT NOT NULL,c INT,d INT,e BLOB NOT NULL, +KEY idx0 (d, c)) ENGINE=MERGE; +EXPLAIN SELECT * FROM t1 NATURAL RIGHT JOIN +t2 WHERE b SOUNDS LIKE e AND d = 1; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables +DROP TABLE t2, t1; End of 5.1 tests === modified file 'mysql-test/t/merge.test' --- mysql-test/t/merge.test 2010-03-03 10:49:03 +0000 +++ mysql-test/t/merge.test 2010-03-19 06:01:02 +0000 @@ -1690,4 +1690,19 @@ DROP TABLE `test@1`.`t@1`; DROP DATABASE `test@1`; +--echo # +--echo # Bug#51494c rash with join, explain and 'sounds like' operator +--echo # + +CREATE TABLE t1 (a INT) ENGINE=MYISAM; +INSERT INTO t1 VALUES(1); + +CREATE TABLE t2 (b INT NOT NULL,c INT,d INT,e BLOB NOT NULL, +KEY idx0 (d, c)) ENGINE=MERGE; + +EXPLAIN SELECT * FROM t1 NATURAL RIGHT JOIN +t2 WHERE b SOUNDS LIKE e AND d = 1; + +DROP TABLE t2, t1; + --echo End of 5.1 tests

2 3

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2858) Bug#53334
by knielsen＠knielsen-hq.org 03 May '10

03 May '10

#At lp:maria 2858 knielsen(a)knielsen-hq.org 2010-05-03 Fixed bug #53334. The fix actually reverts the change introduced by the patch for bug 51494 The fact is that the patch for bug 52177 fixes bug 51194 as well. modified: mysql-test/r/innodb_mysql.result mysql-test/t/innodb_mysql.test sql/sql_select.cc === modified file 'mysql-test/r/innodb_mysql.result' --- a/mysql-test/r/innodb_mysql.result 2010-04-28 12:52:24 +0000 +++ b/mysql-test/r/innodb_mysql.result 2010-05-03 08:44:39 +0000 @@ -2350,4 +2350,34 @@ Null Index_type BTREE Comment DROP TABLE t1; +# +# Bug #53334: wrong result for outer join with impossible ON condition +# (see the same test case for MyISAM in join.test) +# +create table t1 (id int primary key); +create table t2 (id int); +insert into t1 values (75); +insert into t1 values (79); +insert into t1 values (78); +insert into t1 values (77); +replace into t1 values (76); +replace into t1 values (76); +insert into t1 values (104); +insert into t1 values (103); +insert into t1 values (102); +insert into t1 values (101); +insert into t1 values (105); +insert into t1 values (106); +insert into t1 values (107); +insert into t2 values (107),(75),(1000); +select t1.id,t2.id from t2 left join t1 on t1.id>=74 and t1.id<=0 +where t2.id=75 and t1.id is null; +id id +NULL 75 +explain select t1.id,t2.id from t2 left join t1 on t1.id>=74 and t1.id<=0 +where t2.id=75 and t1.id is null; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 const PRIMARY NULL NULL NULL 1 Impossible ON condition +1 SIMPLE t2 ALL NULL NULL NULL NULL 3 Using where +drop table t1,t2; End of 5.1 tests === modified file 'mysql-test/t/innodb_mysql.test' --- a/mysql-test/t/innodb_mysql.test 2010-04-28 12:52:24 +0000 +++ b/mysql-test/t/innodb_mysql.test 2010-05-03 08:44:39 +0000 @@ -591,4 +591,35 @@ ALTER TABLE t1 DROP INDEX k, ADD UNIQUE DROP TABLE t1; +--echo # +--echo # Bug #53334: wrong result for outer join with impossible ON condition +--echo # (see the same test case for MyISAM in join.test) +--echo # + +create table t1 (id int primary key); +create table t2 (id int); + +insert into t1 values (75); +insert into t1 values (79); +insert into t1 values (78); +insert into t1 values (77); +replace into t1 values (76); +replace into t1 values (76); +insert into t1 values (104); +insert into t1 values (103); +insert into t1 values (102); +insert into t1 values (101); +insert into t1 values (105); +insert into t1 values (106); +insert into t1 values (107); + +insert into t2 values (107),(75),(1000); + +select t1.id,t2.id from t2 left join t1 on t1.id>=74 and t1.id<=0 + where t2.id=75 and t1.id is null; +explain select t1.id,t2.id from t2 left join t1 on t1.id>=74 and t1.id<=0 + where t2.id=75 and t1.id is null; + +drop table t1,t2; + --echo End of 5.1 tests === modified file 'sql/sql_select.cc' --- a/sql/sql_select.cc 2010-04-28 12:52:24 +0000 +++ b/sql/sql_select.cc 2010-05-03 08:44:39 +0000 @@ -3008,8 +3008,7 @@ make_join_statistics(JOIN *join, TABLE_L s->quick=select->quick; s->needed_reg=select->needed_reg; select->quick=0; - if (records == 0 && s->table->reginfo.impossible_range && - (s->table->file->ha_table_flags() & HA_STATS_RECORDS_IS_EXACT)) + if (records == 0 && s->table->reginfo.impossible_range) { /* Impossible WHERE or ON expression

1 0

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2857)
by knielsen＠knielsen-hq.org 02 May '10

02 May '10

#At lp:maria 2857 knielsen(a)knielsen-hq.org 2010-05-02 5.1.46 after-merge fixes: must FLUSH TABLES before copying .frm. modified: mysql-test/r/myisam.result mysql-test/t/myisam.test === modified file 'mysql-test/r/myisam.result' --- a/mysql-test/r/myisam.result 2010-04-28 12:52:24 +0000 +++ b/mysql-test/r/myisam.result 2010-05-02 06:47:28 +0000 @@ -2379,6 +2379,7 @@ DROP TABLE t1; CREATE TABLE t1(a INT, b BIT(1)); INSERT INTO t1 VALUES(1, 0), (2, 1); CREATE TABLE t2 SELECT * FROM t1; +FLUSH TABLES; CHECKSUM TABLE t1 EXTENDED; Table Checksum test.t1 3775188275 === modified file 'mysql-test/t/myisam.test' --- a/mysql-test/t/myisam.test 2010-04-28 12:52:24 +0000 +++ b/mysql-test/t/myisam.test 2010-05-02 06:47:28 +0000 @@ -1641,6 +1641,7 @@ DROP TABLE t1; CREATE TABLE t1(a INT, b BIT(1)); INSERT INTO t1 VALUES(1, 0), (2, 1); CREATE TABLE t2 SELECT * FROM t1; +FLUSH TABLES; --copy_file $MYSQLD_DATADIR/test/t1.frm $MYSQLD_DATADIR/test/t3.frm --copy_file $MYSQLD_DATADIR/test/t1.MYD $MYSQLD_DATADIR/test/t3.MYD --copy_file $MYSQLD_DATADIR/test/t1.MYI $MYSQLD_DATADIR/test/t3.MYI

1 0

[Maria-developers] PBXT test failure in MySQL 5.1.46 merge
by Kristian Nielsen 01 May '10

01 May '10

Hi Paul, I'm merging MySQL 5.1.46 into MariaDB. But I hit a test failure in PBXT, see below. It is wrong result from a SELECT. Interestingly, the same SELECT in the main test suite seems to work correctly. The code is in lp:~maria-captains/maria/5.1-release Can you maybe take a look, in case it is a PBXT issue? Probably also one of our optimiser people should take a look to see if it is a server problem. It's a bit strange that it seems to be pbxt specific, I'm wondering if there was a subtle change of the storage engine API introduced or something? Test failure link and output below. - Kristian. http://buildbot.askmonty.org/buildbot/reports/cross_reference#branch=5.1-re… Test case pbxt.join pbxt.join w4 [ fail ] Test ended at 2010-04-28 22:47:39 CURRENT_TEST: pbxt.join --- /space3/buildbot/makedist/build/install/mysql-test/suite/pbxt/r/join.result 2010-04-28 22:12:50.000000000 +0200 +++ /space3/buildbot/makedist/build/install/mysql-test/suite/pbxt/r/join.reject 2010-04-28 22:47:39.000000000 +0200 @@ -59,14 +59,13 @@ 107 1 select t1.id,t2.id from t2 left join t1 on t1.id>=74 and t1.id<=0 where t2.id=75 and t1.id is null; id id -NULL 75 explain select t1.id,t2.id from t2 left join t1 on t1.id>=74 and t1.id<=0 where t2.id=75 and t1.id is null; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 const PRIMARY NULL NULL NULL 1 Impossible ON condition -1 SIMPLE t2 ALL NULL NULL NULL NULL 3 Using where +1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables explain select t1.id, t2.id from t1, t2 where t2.id = t1.id and t1.id <0 and t1.id > 0; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables +1 SIMPLE t2 ALL NULL NULL NULL NULL 3 Using where +1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t2.id 1 Using index drop table t1,t2; CREATE TABLE t1 ( id int(11) NOT NULL auto_increment, mysqltest: Result length mismatch

2 5

[Maria-developers] Rev 2786: create table options bug: in http://bazaar.launchpad.net/~maria-captains/maria/5.2/
by serg＠askmonty.org 30 Apr '10

30 Apr '10

At http://bazaar.launchpad.net/~maria-captains/maria/5.2/ ------------------------------------------------------------ revno: 2786 revision-id: sergii(a)pisem.net-20100430200927-ns4ykuzr2l760bdc parent: sergii(a)pisem.net-20100430200435-1wr1ghgs9ahga0wg committer: Sergei Golubchik <sergii(a)pisem.net> branch nick: 5.2 timestamp: Fri 2010-04-30 22:09:27 +0200 message: create table options bug: parse_engine_table_options() was only called when there was at least option with a non-default value. otherwise it was not called and option structure was not allocated at all. NULL pointer dereference in ::open(). === modified file 'sql/table.cc' --- a/sql/table.cc 2010-04-08 12:10:05 +0000 +++ b/sql/table.cc 2010-04-30 20:09:27 +0000 @@ -1633,10 +1633,11 @@ static int open_binary_frm(THD *thd, TAB if (share->db_create_options & HA_OPTION_TEXT_CREATE_OPTIONS) { DBUG_ASSERT(options_len); - if (engine_table_options_frm_read(options, options_len, share) || - parse_engine_table_options(thd, handler_file->ht, share)) + if (engine_table_options_frm_read(options, options_len, share)) goto free_and_err; } + if (parse_engine_table_options(thd, handler_file->ht, share)) + goto free_and_err; my_free(buff, MYF(MY_ALLOW_ZERO_PTR)); if (share->found_next_number_field) === modified file 'storage/example/ha_example.cc' --- a/storage/example/ha_example.cc 2010-04-30 10:12:25 +0000 +++ b/storage/example/ha_example.cc 2010-04-30 20:09:27 +0000 @@ -367,6 +367,15 @@ int ha_example::open(const char *name, i DBUG_RETURN(1); thr_lock_data_init(&share->lock,&lock,NULL); + example_table_options_struct *options= + (example_table_options_struct *)table->s->option_struct; + + DBUG_ASSERT(options); + DBUG_PRINT("info", ("strparam: '%-.64s' ullparam: %llu enumparam: %u "\ + "boolparam: %u", + (options->strparam ? options->strparam : "<NULL>"), + options->ullparam, options->enumparam, options->boolparam)); + DBUG_RETURN(0); }

1 0

[Maria-developers] Rev 2785: create table options bug: in http://bazaar.launchpad.net/~maria-captains/maria/5.2/
by serg＠askmonty.org 30 Apr '10

30 Apr '10

At http://bazaar.launchpad.net/~maria-captains/maria/5.2/ ------------------------------------------------------------ revno: 2785 revision-id: sergii(a)pisem.net-20100430200435-1wr1ghgs9ahga0wg parent: sergii(a)pisem.net-20100430101225-dhby6azvhpef1vme committer: Sergei Golubchik <sergii(a)pisem.net> branch nick: 5.2 timestamp: Fri 2010-04-30 22:04:35 +0200 message: create table options bug: alter table does not reset HA_OPTION_TEXT_CREATE_OPTIONS when the last option value is removed === modified file 'mysql-test/r/plugin.result' --- a/mysql-test/r/plugin.result 2010-04-30 10:12:25 +0000 +++ b/mysql-test/r/plugin.result 2010-04-30 20:04:35 +0000 @@ -111,6 +111,12 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `ULL`=4660 +ALTER TABLE t1 ULL=DEFAULT; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 DROP TABLE t1; SET @@SQL_MODE=@OLD_SQL_MODE; select 1; === modified file 'mysql-test/t/plugin.test' --- a/mysql-test/t/plugin.test 2010-04-30 10:12:25 +0000 +++ b/mysql-test/t/plugin.test 2010-04-30 20:04:35 +0000 @@ -119,6 +119,10 @@ CREATE TABLE t1 (a int) ENGINE=example U CREATE TABLE t1 (a int) ENGINE=example ULL=0x1234; SHOW CREATE TABLE t1; + +ALTER TABLE t1 ULL=DEFAULT; +SHOW CREATE TABLE t1; + DROP TABLE t1; SET @@SQL_MODE=@OLD_SQL_MODE; === modified file 'sql/unireg.cc' --- a/sql/unireg.cc 2010-04-08 12:10:05 +0000 +++ b/sql/unireg.cc 2010-04-30 20:04:35 +0000 @@ -197,6 +197,8 @@ bool mysql_create_frm(THD *thd, const ch create_info->table_options|= HA_OPTION_TEXT_CREATE_OPTIONS; create_info->extra_size+= (options_len + 4); } + else + create_info->table_options&= ~HA_OPTION_TEXT_CREATE_OPTIONS; if ((file=create_frm(thd, file_name, db, table, reclength, fileinfo, create_info, keys)) < 0)

1 0

[Maria-developers] Rev 2784: small changes to WL#43: in http://bazaar.launchpad.net/~maria-captains/maria/5.2/
by serg＠askmonty.org 30 Apr '10

30 Apr '10

At http://bazaar.launchpad.net/~maria-captains/maria/5.2/ ------------------------------------------------------------ revno: 2784 revision-id: sergii(a)pisem.net-20100430101225-dhby6azvhpef1vme parent: sergii(a)pisem.net-20100408210307-j82aap23b14h7j3t committer: Sergei Golubchik <sergii(a)pisem.net> branch nick: 5.2 timestamp: Fri 2010-04-30 12:12:25 +0200 message: small changes to WL#43: consistency: don't use "index" and "key" interchangeably => rename "key" to "index" consistency: all option types are logical, besides ULL => rename ULL to NUMBER don't accept floats where integers are expected accept hexadecimal where integers are expected === modified file 'mysql-test/r/plugin.result' --- a/mysql-test/r/plugin.result 2010-04-08 17:19:01 +0000 +++ b/mysql-test/r/plugin.result 2010-04-30 10:12:25 +0000 @@ -101,6 +101,17 @@ drop table t1; SET SQL_MODE=''; CREATE TABLE t1 (a int) ENGINE=example ULL=10000000000000000000 one_or_two='ttt' YESNO=SSS; ERROR HY000: Incorrect value '10000000000000000000' for option 'ULL' +CREATE TABLE t1 (a int) ENGINE=example ULL=10.00; +ERROR 42000: Only integers allowed as number here near '10.00' at line 1 +CREATE TABLE t1 (a int) ENGINE=example ULL=1e2; +ERROR 42000: Only integers allowed as number here near '1e2' at line 1 +CREATE TABLE t1 (a int) ENGINE=example ULL=0x1234; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `ULL`=4660 +DROP TABLE t1; SET @@SQL_MODE=@OLD_SQL_MODE; select 1; 1 === modified file 'mysql-test/t/plugin.test' --- a/mysql-test/t/plugin.test 2010-04-08 17:19:01 +0000 +++ b/mysql-test/t/plugin.test 2010-04-30 10:12:25 +0000 @@ -110,6 +110,17 @@ drop table t1; SET SQL_MODE=''; --error ER_BAD_OPTION_VALUE CREATE TABLE t1 (a int) ENGINE=example ULL=10000000000000000000 one_or_two='ttt' YESNO=SSS; + +--error ER_PARSE_ERROR +CREATE TABLE t1 (a int) ENGINE=example ULL=10.00; + +--error ER_PARSE_ERROR +CREATE TABLE t1 (a int) ENGINE=example ULL=1e2; + +CREATE TABLE t1 (a int) ENGINE=example ULL=0x1234; +SHOW CREATE TABLE t1; +DROP TABLE t1; + SET @@SQL_MODE=@OLD_SQL_MODE; # === modified file 'sql/handler.h' --- a/sql/handler.h 2010-04-08 12:10:05 +0000 +++ b/sql/handler.h 2010-04-30 10:12:25 +0000 @@ -555,19 +555,19 @@ struct handler_log_file_data { /* Definitions for engine-specific table/field/index options in the CREATE TABLE. - Options are declared with HA_*OPTION_* macros (HA_TOPTION_ULL, HA_FOPTION_ENUM, - HA_KOPTION_STRING, etc). + Options are declared with HA_*OPTION_* macros (HA_TOPTION_NUMBER, + HA_FOPTION_ENUM, HA_IOPTION_STRING, etc). Every macros takes the option name, and the name of the underlying field of the appropriate C structure. The "appropriate C structure" is ha_table_option_struct for table level options, ha_field_option_struct for field level options, - ha_key_option_struct for key level options. The engine either + ha_index_option_struct for key level options. The engine either defines a structure of this name, or uses #define's to map these "appropriate" names to the actual structure type name. ULL options use a ulonglong as the backing store. - HA_*OPTION_ULL() takes the option name, the structure field name, + HA_*OPTION_NUMBER() takes the option name, the structure field name, the default value for the option, min, max, and blk_siz values. STRING options use a char* as a backing store. @@ -595,7 +595,7 @@ enum ha_option_type { HA_OPTION_TYPE_ULL HA_OPTION_TYPE_ENUM, /* uint */ HA_OPTION_TYPE_BOOL}; /* bool */ -#define HA_xOPTION_ULL(name, struc, field, def, min, max, blk_siz) \ +#define HA_xOPTION_NUMBER(name, struc, field, def, min, max, blk_siz) \ { HA_OPTION_TYPE_ULL, name, sizeof(name)-1, \ offsetof(struc, field), def, min, max, blk_siz, 0 } #define HA_xOPTION_STRING(name, struc, field) \ @@ -610,8 +610,8 @@ enum ha_option_type { HA_OPTION_TYPE_ULL offsetof(struc, field), def, 0, 1, 0, 0 } #define HA_xOPTION_END { HA_OPTION_TYPE_ULL, 0, 0, 0, 0, 0, 0, 0, 0 } -#define HA_TOPTION_ULL(name, field, def, min, max, blk_siz) \ - HA_xOPTION_ULL(name, ha_table_option_struct, field, def, min, max, blk_siz) +#define HA_TOPTION_NUMBER(name, field, def, min, max, blk_siz) \ + HA_xOPTION_NUMBER(name, ha_table_option_struct, field, def, min, max, blk_siz) #define HA_TOPTION_STRING(name, field) \ HA_xOPTION_STRING(name, ha_table_option_struct, field) #define HA_TOPTION_ENUM(name, field, values, def) \ @@ -620,8 +620,8 @@ enum ha_option_type { HA_OPTION_TYPE_ULL HA_xOPTION_BOOL(name, ha_table_option_struct, field, def) #define HA_TOPTION_END HA_xOPTION_END -#define HA_FOPTION_ULL(name, field, def, min, max, blk_siz) \ - HA_xOPTION_ULL(name, ha_field_option_struct, field, def, min, max, blk_siz) +#define HA_FOPTION_NUMBER(name, field, def, min, max, blk_siz) \ + HA_xOPTION_NUMBER(name, ha_field_option_struct, field, def, min, max, blk_siz) #define HA_FOPTION_STRING(name, field) \ HA_xOPTION_STRING(name, ha_field_option_struct, field) #define HA_FOPTION_ENUM(name, field, values, def) \ @@ -630,15 +630,15 @@ enum ha_option_type { HA_OPTION_TYPE_ULL HA_xOPTION_BOOL(name, ha_field_option_struct, field, def) #define HA_FOPTION_END HA_xOPTION_END -#define HA_KOPTION_ULL(name, field, def, min, max, blk_siz) \ - HA_xOPTION_ULL(name, ha_key_option_struct, field, def, min, max, blk_siz) -#define HA_KOPTION_STRING(name, field) \ - HA_xOPTION_STRING(name, ha_key_option_struct, field) -#define HA_KOPTION_ENUM(name, field, values, def) \ - HA_xOPTION_ENUM(name, ha_key_option_struct, field, values, def) -#define HA_KOPTION_BOOL(name, field, values, def) \ - HA_xOPTION_BOOL(name, ha_key_option_struct, field, values, def) -#define HA_KOPTION_END HA_xOPTION_END +#define HA_IOPTION_NUMBER(name, field, def, min, max, blk_siz) \ + HA_xOPTION_NUMBER(name, ha_index_option_struct, field, def, min, max, blk_siz) +#define HA_IOPTION_STRING(name, field) \ + HA_xOPTION_STRING(name, ha_index_option_struct, field) +#define HA_IOPTION_ENUM(name, field, values, def) \ + HA_xOPTION_ENUM(name, ha_index_option_struct, field, values, def) +#define HA_IOPTION_BOOL(name, field, values, def) \ + HA_xOPTION_BOOL(name, ha_index_option_struct, field, values, def) +#define HA_IOPTION_END HA_xOPTION_END typedef struct st_ha_create_table_option { enum ha_option_type type; @@ -1060,7 +1060,7 @@ typedef struct st_ha_create_information /* the following three are only for ALTER TABLE, check_if_incompatible_data() */ void *option_struct; ///< structure with parsed table options void **fileds_option_struct; ///< array of field option structures - void **keys_option_struct; ///< array of key option structures + void **indexes_option_struct; ///< array of index option structures } HA_CREATE_INFO; === modified file 'sql/sql_table.cc' --- a/sql/sql_table.cc 2010-04-08 12:10:05 +0000 +++ b/sql/sql_table.cc 2010-04-30 10:12:25 +0000 @@ -5783,7 +5783,7 @@ compare_tables(TABLE *table, if ((create_info->fileds_option_struct= (void**)thd->calloc(sizeof(void*) * table->s->fields)) == NULL || - (create_info->keys_option_struct= + (create_info->indexes_option_struct= (void**)thd->calloc(sizeof(void*) * table->s->keys)) == NULL) DBUG_RETURN(1); @@ -5984,7 +5984,7 @@ compare_tables(TABLE *table, else { DBUG_ASSERT(i < table->s->keys); - create_info->keys_option_struct[i]= new_key->option_struct; + create_info->indexes_option_struct[i]= new_key->option_struct; } } === modified file 'sql/sql_yacc.yy' --- a/sql/sql_yacc.yy 2010-04-08 12:10:05 +0000 +++ b/sql/sql_yacc.yy 2010-04-30 10:12:25 +0000 @@ -4769,7 +4769,7 @@ create_table_option: engine_option_value($1, $3, false, &Lex->create_info.option_list, &Lex->option_list_last); } - | IDENT_sys equal ulonglong_num + | IDENT_sys equal real_ulonglong_num { new (YYTHD->mem_root) engine_option_value($1, $3, &Lex->create_info.option_list, @@ -5434,7 +5434,7 @@ attribute: engine_option_value($1, $3, false, &Lex->option_list, &Lex->option_list_last); } - | IDENT_sys equal ulonglong_num + | IDENT_sys equal real_ulonglong_num { new (YYTHD->mem_root) engine_option_value($1, $3, &Lex->option_list, @@ -5746,7 +5746,7 @@ all_key_opt: engine_option_value($1, $3, false, &Lex->option_list, &Lex->option_list_last); } - | IDENT_sys equal ulonglong_num + | IDENT_sys equal real_ulonglong_num { new (YYTHD->mem_root) engine_option_value($1, $3, &Lex->option_list, @@ -9472,6 +9472,7 @@ ulonglong_num: real_ulonglong_num: NUM { int error; $$= (ulonglong) my_strtoll10($1.str, (char**) 0, &error); } | ULONGLONG_NUM { int error; $$= (ulonglong) my_strtoll10($1.str, (char**) 0, &error); } + | HEX_NUM { $$= strtoull($1.str, (char**) 0, 16); } | LONG_NUM { int error; $$= (ulonglong) my_strtoll10($1.str, (char**) 0, &error); } | dec_num_error { MYSQL_YYABORT; } ; === modified file 'storage/example/ha_example.cc' --- a/storage/example/ha_example.cc 2010-04-08 12:10:05 +0000 +++ b/storage/example/ha_example.cc 2010-04-30 10:12:25 +0000 @@ -151,7 +151,7 @@ ha_create_table_option example_table_opt range of values 0..UINT_MAX32, and a "block size" of 10 (any value must be divisible by 10). */ - HA_TOPTION_ULL("ULL", ullparam, UINT_MAX32, 0, UINT_MAX32, 10), + HA_TOPTION_NUMBER("ULL", ullparam, UINT_MAX32, 0, UINT_MAX32, 10), /* one option that takes an arbitrary string */

1 0