#At lp:maria 2727 knielsen@knielsen-hq.org 2009-09-11 After-merge fixes for merge of MySQL-5.1.38. modified: mysql-test/r/innodb.result mysql-test/t/bug46080-master.opt mysql-test/t/innodb.test sql/sql_select.cc support-files/build-tags per-file messages: mysql-test/r/innodb.result Fix wrong merge of result file conflicts. mysql-test/t/bug46080-master.opt Fix memory limit to take into account extra storage engines in MariaDB. mysql-test/t/innodb.test Add comment clarifying tricky --replace_result. sql/sql_select.cc Restore fix of Bug#34374, accudentally lost during MySQL 5.1.38 merge. support-files/build-tags Fix missing -R option for bzr, accidentally lost in MySQL-5.1.38 merge. === modified file 'mysql-test/r/innodb.result' --- a/mysql-test/r/innodb.result 2009-09-07 20:50:10 +0000 +++ b/mysql-test/r/innodb.result 2009-09-11 11:00:53 +0000 @@ -1738,7 +1738,7 @@ count(*) drop table t1; SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total'; variable_value -512 +511 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; variable_value 16384 @@ -1784,7 +1784,7 @@ innodb_sync_spin_loops 20 SET @old_innodb_thread_concurrency= @@global.innodb_thread_concurrency; show variables like "innodb_thread_concurrency"; Variable_name Value -innodb_thread_concurrency 8 +innodb_thread_concurrency 0 set global innodb_thread_concurrency=1001; Warnings: Warning 1292 Truncated incorrect thread_concurrency value: '1001' === modified file 'mysql-test/t/bug46080-master.opt' --- a/mysql-test/t/bug46080-master.opt 2009-07-10 12:00:34 +0000 +++ b/mysql-test/t/bug46080-master.opt 2009-09-11 11:00:53 +0000 @@ -1 +1 @@ ---skip-grant-tables --skip-name-resolve --safemalloc-mem-limit=4000000 +--skip-grant-tables --skip-name-resolve --safemalloc-mem-limit=20000000 === modified file 'mysql-test/t/innodb.test' --- a/mysql-test/t/innodb.test 2009-09-07 20:50:10 +0000 +++ b/mysql-test/t/innodb.test 2009-09-11 11:00:53 +0000 @@ -1317,6 +1317,10 @@ drop table t1; # Test for testable InnoDB status variables. This test # uses previous ones(pages_created, rows_deleted, ...). + +# InnoDB aligns the memory for the buffer pool to a page boundary. This may +# cause actual pool size to be one less than requested depending on exact +# alignment of obtained memory. --replace_result 512 511 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total'; SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; === modified file 'sql/sql_select.cc' --- a/sql/sql_select.cc 2009-09-07 20:50:10 +0000 +++ b/sql/sql_select.cc 2009-09-11 11:00:53 +0000 @@ -3614,16 +3614,16 @@ add_ft_keys(DYNAMIC_ARRAY *keyuse_array, Item_func *arg0=(Item_func *)(func->arguments()[0]), *arg1=(Item_func *)(func->arguments()[1]); if (arg1->const_item() && - ((functype == Item_func::GE_FUNC && arg1->val_real() > 0) || - (functype == Item_func::GT_FUNC && arg1->val_real() >=0)) && arg0->type() == Item::FUNC_ITEM && - arg0->functype() == Item_func::FT_FUNC) + arg0->functype() == Item_func::FT_FUNC && + ((functype == Item_func::GE_FUNC && arg1->val_real() > 0) || + (functype == Item_func::GT_FUNC && arg1->val_real() >=0))) cond_func=(Item_func_match *) arg0; else if (arg0->const_item() && - ((functype == Item_func::LE_FUNC && arg0->val_real() > 0) || - (functype == Item_func::LT_FUNC && arg0->val_real() >=0)) && arg1->type() == Item::FUNC_ITEM && - arg1->functype() == Item_func::FT_FUNC) + arg1->functype() == Item_func::FT_FUNC && + ((functype == Item_func::LE_FUNC && arg0->val_real() > 0) || + (functype == Item_func::LT_FUNC && arg0->val_real() >=0))) cond_func=(Item_func_match *) arg1; } } === modified file 'support-files/build-tags' --- a/support-files/build-tags 2009-09-07 20:50:10 +0000 +++ b/support-files/build-tags 2009-09-11 11:00:53 +0000 @@ -4,7 +4,7 @@ rm -f TAGS filter='\.cc$\|\.c$\|\.h$\|\.yy$' list="find . -type f" -bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root --kind=file --versioned" +bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root -R --kind=file --versioned" $list |grep $filter |while read f; do