#At lp:maria based on revid:igor@askmonty.org-20090919212129-p3ydr02t0es1py7y 2752 Igor Babaev 2009-09-19 [merge] Merge modified: mysql-test/mysql-test-run.pl mysql-test/r/myisam.result mysql-test/suite/maria/r/maria3.result mysql-test/t/myisam.test sql/sql_table.cc === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-09-17 00:13:50 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-09-18 00:55:27 +0000 @@ -4433,7 +4433,7 @@ sub mysqld_start ($$) { if (IS_WINDOWS) { # Trick the server to send output to stderr, with --console - if (!(join(' ', @$args) =~ /--log-error/)) { + if (!(grep(/^--log-error/, @$args))) { mtr_add_arg($args, "--console"); } } @@ -5058,7 +5058,7 @@ sub start_mysqltest ($) { if (IS_WINDOWS) { # Trick the server to send output to stderr, with --console - if (!(join(' ', @$args) =~ /--log-error/)) { + if (!(grep(/^--server-arg=--log-error/, @$args))) { mtr_add_arg($args, "--server-arg=--console"); } } === modified file 'mysql-test/r/myisam.result' --- a/mysql-test/r/myisam.result 2009-09-07 20:50:10 +0000 +++ b/mysql-test/r/myisam.result 2009-09-18 01:04:43 +0000 @@ -2234,7 +2234,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `n` int(11) NOT NULL, `c` char(1) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 TRANSACTIONAL=1 drop table t1; CREATE TABLE t1 (line LINESTRING NOT NULL) engine=myisam; INSERT INTO t1 VALUES (GeomFromText("POINT(0 0)")); === modified file 'mysql-test/suite/maria/r/maria3.result' --- a/mysql-test/suite/maria/r/maria3.result 2009-09-16 18:25:18 +0000 +++ b/mysql-test/suite/maria/r/maria3.result 2009-09-18 01:04:43 +0000 @@ -518,7 +518,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `n` int(11) NOT NULL, `c` char(1) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 +) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 drop table t1; create table t1 (n int not null, c char(1)) engine=myisam transactional=1; Warnings: @@ -529,7 +529,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `n` int(11) NOT NULL, `c` char(1) DEFAULT NULL -) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 +) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 TRANSACTIONAL=1 drop table t1; create table t1 (a int, key(a)) transactional=0; insert into t1 values (0),(1),(2),(3),(4); === modified file 'mysql-test/t/myisam.test' --- a/mysql-test/t/myisam.test 2009-09-07 20:50:10 +0000 +++ b/mysql-test/t/myisam.test 2009-09-18 01:04:43 +0000 @@ -1478,7 +1478,10 @@ let $MYSQLD_DATADIR= `select @@datadir`; --exec $MYISAMCHK -d $MYSQLD_DATADIR/test/t1 DROP TABLE t1; +# # Test warnings with transactional=1 with MyISAM +# MariaDB: Note that the table will still have 'TRANSACTIONAL=1' attribute. +# That's the intended behavior atm. # create table t1 (n int not null, c char(1)) transactional=1; show create table t1; === modified file 'sql/sql_table.cc' --- a/sql/sql_table.cc 2009-09-16 11:31:20 +0000 +++ b/sql/sql_table.cc 2009-09-18 01:04:43 +0000 @@ -3747,19 +3747,11 @@ bool mysql_create_table_no_lock(THD *thd /* Give warnings for not supported table options */ if (create_info->transactional && !file->ht->commit) - { push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, ER_ILLEGAL_HA_CREATE_OPTION, ER(ER_ILLEGAL_HA_CREATE_OPTION), file->engine_name()->str, "TRANSACTIONAL=1"); - /* - MariaDB: need to do the same for row_format and page_checksum - options. See MBUG#425916 - */ - create_info->transactional= HA_CHOICE_UNDEF; - create_info->used_fields &= ~HA_CREATE_USED_TRANSACTIONAL; - } VOID(pthread_mutex_lock(&LOCK_open)); if (!internal_tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE))