Hi!
"knielsen" == knielsen <knielsen@knielsen-hq.org> writes:
knielsen> #At lp:maria knielsen> 2714 knielsen@knielsen-hq.org 2009-06-18 knielsen> Fix test cases after merge of XtraDB into MariaDB. knielsen> Manually merge some InnoDB changes into XtraDB. knielsen> Fix ALTER TABLE bug in XtraDB with wrong comparison of row type. knielsen> modified: knielsen> mysql-test/include/varchar.inc knielsen> mysql-test/mysql-test-run.pl knielsen> mysql-test/r/innodb.result knielsen> mysql-test/t/innodb-use-sys-malloc.test knielsen> sql/sql_table.cc knielsen> storage/xtradb/handler/ha_innodb.cc knielsen> storage/xtradb/include/pars0pars.h knielsen> storage/xtradb/include/univ.i knielsen> per-file messages: knielsen> mysql-test/include/varchar.inc knielsen> Fix in test case that which of several duplicate keys triggers an error is not knielsen> deterministic. knielsen> mysql-test/mysql-test-run.pl knielsen> InnoDB does not bother to free resources individually during shutdown, but due to using knielsen> its own memory tracking it nevertheless can free everything at exit. But XtraDB adds an knielsen> option, on by default, to skip this extra tracking. This causes lots of Valgrind knielsen> warnings, so needs to be disabled for Valgrind testing. knielsen> mysql-test/r/innodb.result knielsen> Fix in test case that which of several duplicate keys triggers an error is not knielsen> deterministic. knielsen> mysql-test/t/innodb-use-sys-malloc.test knielsen> InnoDB does not bother to free resources individually during shutdown, but due to using knielsen> its own memory tracking it nevertheless can free everything at exit. But XtraDB adds an knielsen> option, on by default, to skip this extra tracking. This causes lots of Valgrind knielsen> warnings, so needs to be disabled for Valgrind testing. knielsen> sql/sql_table.cc knielsen> Add some useful DBUG while debugging alter table. knielsen> storage/xtradb/handler/ha_innodb.cc knielsen> Fix that check_if_incompatible_data did not realise that ROW_TYPE_DEFAULT is identical knielsen> to the default row format ROW_TYPE_COMPACT, causing excessive table copying in knielsen> ALTER TABLE knielsen> Add some useful DBUG while debugging alter table. knielsen> Manually merge into XtraDB a few small changes for InnoDB from upstream MySQL. knielsen> storage/xtradb/include/pars0pars.h knielsen> Manually merge into XtraDB a few small changes for InnoDB from upstream MySQL. knielsen> storage/xtradb/include/univ.i knielsen> Manually merge a MariaDB fix in InnoDB into XtraDB. <cut> knielsen> === modified file 'mysql-test/r/innodb.result' knielsen> --- a/mysql-test/r/innodb.result 2009-06-09 15:08:46 +0000 knielsen> +++ b/mysql-test/r/innodb.result 2009-06-18 12:39:21 +0000 knielsen> @@ -1970,7 +1970,7 @@ explain select count(*) from t1 where v knielsen> id select_type table type possible_keys key key_len ref rows Extra knielsen> 1 SIMPLE t1 ref v v 13 const # Using where; Using index knielsen> alter table t1 add unique(v); knielsen> -ERROR 23000: Duplicate entry 'v' for key 'v_2' knielsen> +ERROR 23000: Duplicate entry '{ ' for key 'v_2' knielsen> alter table t1 add key(v); knielsen> select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a'; knielsen> qq Strange change in test result, but can't comment on it as I don't know the test. <cut> knielsen> === modified file 'storage/xtradb/handler/ha_innodb.cc' <cut> knielsen> @@ -6900,7 +6901,7 @@ ha_innobase::records_in_range( knielsen> mode2); knielsen> } else { knielsen> - n_rows = 0; knielsen> + n_rows = HA_POS_ERROR; knielsen> } Looks correct. Wonder from where the n_rows= 0 came from... <cut> Ok to push, but please check that the duplicate key error is correct (ie, there is two keys with the content '{ ') Regards, Monty