[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2757)
#At lp:maria 2757 knielsen@knielsen-hq.org 2009-10-06 [merge] Merge fixes for --big tests and compiler warnings. modified: mysql-test/include/mtr_check.sql mysql-test/r/merge-big.result mysql-test/r/mysqlbinlog_row_big.result mysql-test/r/variables-big.result mysql-test/t/merge-big.test mysql-test/t/mysqlbinlog_row_big.test mysql-test/t/variables-big.test storage/maria/ma_blockrec.c support-files/compiler_warnings.supp === modified file 'mysql-test/include/mtr_check.sql' --- a/mysql-test/include/mtr_check.sql 2009-09-07 20:50:10 +0000 +++ b/mysql-test/include/mtr_check.sql 2009-10-03 23:20:51 +0000 @@ -12,7 +12,7 @@ BEGIN -- Dump all global variables except those -- that are supposed to change SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES - WHERE variable_name != 'timestamp' AND variable_name != "debug" + WHERE variable_name != 'timestamp' AND variable_name != 'INNODB_IBUF_MAX_SIZE' ORDER BY variable_name; === modified file 'mysql-test/r/merge-big.result' --- a/mysql-test/r/merge-big.result 2009-03-12 22:29:39 +0000 +++ b/mysql-test/r/merge-big.result 2009-10-03 19:12:24 +0000 @@ -7,6 +7,7 @@ drop table if exists t1,t2,t3,t4,t5,t6; CREATE TABLE t1 (c1 INT) ENGINE= MyISAM; LOCK TABLE t1 WRITE; # connection con1 +SET @orig_debug=@@debug; SET GLOBAL debug="+d,sleep_open_and_lock_after_open"; INSERT INTO t1 VALUES (1); # connection default @@ -21,6 +22,6 @@ SELECT * FROM t1; c1 UNLOCK TABLES; # connection con1 -SET GLOBAL debug="-d,sleep_open_and_lock_after_open"; +SET GLOBAL debug=@orig_debug; # connection default DROP TABLE t1; === modified file 'mysql-test/r/mysqlbinlog_row_big.result' --- a/mysql-test/r/mysqlbinlog_row_big.result 2009-09-07 20:50:10 +0000 +++ b/mysql-test/r/mysqlbinlog_row_big.result 2009-10-03 23:20:51 +0000 @@ -1,9 +1,4 @@ # -# We need big packets. -# -SET @old_global_max_allowed_packet=@@global.max_allowed_packet; -SET @@global.max_allowed_packet= 1024*1024*1024; -# # Preparatory cleanup. # DROP TABLE IF EXISTS t1; @@ -104,5 +99,4 @@ FLUSH LOGS; # reset variable value to pass testcase checks SET @@global.max_allowed_packet = 1048576; DROP TABLE t1; -SET @@global.max_allowed_packet=@old_global_max_allowed_packet; remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_big_1.out === modified file 'mysql-test/r/variables-big.result' --- a/mysql-test/r/variables-big.result 2009-09-07 20:50:10 +0000 +++ b/mysql-test/r/variables-big.result 2009-10-03 23:20:51 +0000 @@ -1,20 +1,20 @@ -set session transaction_prealloc_size=1024*1024*1024*1; -select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; -TRUE -1 -set session transaction_prealloc_size=1024*1024*1024*2; -select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; -TRUE -1 -set session transaction_prealloc_size=1024*1024*1024*3; -select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; -TRUE -1 -set session transaction_prealloc_size=1024*1024*1024*4; -select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; -TRUE -1 -set session transaction_prealloc_size=1024*1024*1024*5; -select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; -TRUE -1 +SET SESSION transaction_prealloc_size=1024*1024*1024*1; +SHOW PROCESSLIST; +Id User Host db Command Time State Info +<Id> root localhost test Query <Time> NULL SHOW PROCESSLIST +SET SESSION transaction_prealloc_size=1024*1024*1024*2; +SHOW PROCESSLIST; +Id User Host db Command Time State Info +<Id> root localhost test Query <Time> NULL SHOW PROCESSLIST +SET SESSION transaction_prealloc_size=1024*1024*1024*3; +SHOW PROCESSLIST; +Id User Host db Command Time State Info +<Id> root localhost test Query <Time> NULL SHOW PROCESSLIST +SET SESSION transaction_prealloc_size=1024*1024*1024*4; +SHOW PROCESSLIST; +Id User Host db Command Time State Info +<Id> root localhost test Query <Time> NULL SHOW PROCESSLIST +SET SESSION transaction_prealloc_size=1024*1024*1024*5; +SHOW PROCESSLIST; +Id User Host db Command Time State Info +<Id> root localhost test Query <Time> NULL SHOW PROCESSLIST === modified file 'mysql-test/t/merge-big.test' --- a/mysql-test/t/merge-big.test 2009-03-12 22:27:35 +0000 +++ b/mysql-test/t/merge-big.test 2009-10-03 19:12:24 +0000 @@ -43,6 +43,7 @@ LOCK TABLE t1 WRITE; --echo # connection con1 connect (con1,localhost,root,,); let $con1_id= `SELECT CONNECTION_ID()`; + SET @orig_debug=@@debug; SET GLOBAL debug="+d,sleep_open_and_lock_after_open"; send INSERT INTO t1 VALUES (1); --echo # connection default @@ -74,7 +75,7 @@ UNLOCK TABLES; --echo # connection con1 connection con1; reap; - SET GLOBAL debug="-d,sleep_open_and_lock_after_open"; + SET GLOBAL debug=@orig_debug; disconnect con1; --echo # connection default connection default; === modified file 'mysql-test/t/mysqlbinlog_row_big.test' --- a/mysql-test/t/mysqlbinlog_row_big.test 2009-09-07 20:50:10 +0000 +++ b/mysql-test/t/mysqlbinlog_row_big.test 2009-10-03 23:20:51 +0000 @@ -24,16 +24,6 @@ --source include/big_test.inc --echo # ---echo # We need big packets. ---echo # -connect (con1, localhost, root,,); -connection con1; -SET @old_global_max_allowed_packet=@@global.max_allowed_packet; -SET @@global.max_allowed_packet= 1024*1024*1024; -connect (con2, localhost, root,,); -connection con2; - ---echo # --echo # Preparatory cleanup. --echo # --disable_warnings @@ -154,14 +144,9 @@ let $MYSQLD_DATADIR= `select @@datadir`; eval SET @@global.max_allowed_packet = $orig_max_allowed_packet; DROP TABLE t1; -connection con1; -SET @@global.max_allowed_packet=@old_global_max_allowed_packet; - --echo remove_file \$MYSQLTEST_VARDIR/$mysqlbinlog_output # # NOTE: If you want to see the *huge* mysqlbinlog output, disable next line: # --remove_file $MYSQLTEST_VARDIR/$mysqlbinlog_output -disconnect con1 -disconnect con2 === modified file 'mysql-test/t/variables-big.test' --- a/mysql-test/t/variables-big.test 2009-09-07 20:50:10 +0000 +++ b/mysql-test/t/variables-big.test 2009-10-03 23:20:51 +0000 @@ -5,7 +5,7 @@ --source include/big_test.inc # -# Bug #27322 failure to allocate transaction_prealloc_size causes crash +# Bug#27322 failure to allocate transaction_prealloc_size causes crash # # # Manual (6.0): @@ -35,20 +35,21 @@ # timeout if the testing box is not powerful enough. # -set @pid_temp = (select ID from information_schema.processlist); -set session transaction_prealloc_size=1024*1024*1024*1; ---replace_column 1 # -select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; -set session transaction_prealloc_size=1024*1024*1024*2; ---replace_column 1 # -select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; ---replace_column 1 # -set session transaction_prealloc_size=1024*1024*1024*3; ---replace_column 1 # -select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; -set session transaction_prealloc_size=1024*1024*1024*4; ---replace_column 1 # -select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; -set session transaction_prealloc_size=1024*1024*1024*5; ---replace_column 1 # -select @pid_temp = (select ID from information_schema.processlist) as 'TRUE'; +--disable_warnings +SET SESSION transaction_prealloc_size=1024*1024*1024*1; +--replace_column 1 <Id> 6 <Time> +SHOW PROCESSLIST; +SET SESSION transaction_prealloc_size=1024*1024*1024*2; +--replace_column 1 <Id> 6 <Time> +SHOW PROCESSLIST; +SET SESSION transaction_prealloc_size=1024*1024*1024*3; +--replace_column 1 <Id> 6 <Time> +SHOW PROCESSLIST; +SET SESSION transaction_prealloc_size=1024*1024*1024*4; +--replace_column 1 <Id> 6 <Time> +SHOW PROCESSLIST; +SET SESSION transaction_prealloc_size=1024*1024*1024*5; +--replace_column 1 <Id> 6 <Time> +SHOW PROCESSLIST; +--enable_warnings + === modified file 'storage/maria/ma_blockrec.c' --- a/storage/maria/ma_blockrec.c 2009-05-06 12:03:24 +0000 +++ b/storage/maria/ma_blockrec.c 2009-10-03 20:13:58 +0000 @@ -5448,7 +5448,7 @@ static size_t fill_insert_undo_parts(MAR Store total blob length to make buffer allocation easier during UNDO */ log_parts->str= info->length_buff; - log_parts->length= (uint) (ma_store_length((uchar *) log_parts->str, + log_parts->length= (uint) (ma_store_length(info->length_buff, info->cur_row.blob_length) - (uchar*) log_parts->str); row_length+= log_parts->length; @@ -5592,7 +5592,7 @@ static size_t fill_update_undo_parts(MAR MARIA_SHARE *share= info->s; MARIA_COLUMNDEF *column, *end_column; MARIA_ROW *old_row= &info->cur_row, *new_row= &info->new_row; - uchar *field_data, *start_field_data; + uchar *field_data, *start_field_data, *length_str; uchar *old_field_lengths= old_row->field_lengths; uchar *new_field_lengths= new_row->field_lengths; size_t row_length= 0; @@ -5749,9 +5749,9 @@ static size_t fill_update_undo_parts(MAR /* Store length of field length data before the field/field_lengths */ field_lengths= (uint) (field_data - start_field_data); - start_log_parts->str= ((start_field_data - - ma_calc_length_for_store_length(field_lengths))); - ma_store_length((uchar*)start_log_parts->str, field_lengths); + length_str= start_field_data - ma_calc_length_for_store_length(field_lengths); + start_log_parts->str= length_str; + ma_store_length(length_str, field_lengths); start_log_parts->length= (size_t) (field_data - start_log_parts->str); row_length+= start_log_parts->length; DBUG_RETURN(row_length); === modified file 'support-files/compiler_warnings.supp' --- a/support-files/compiler_warnings.supp 2009-09-03 13:20:22 +0000 +++ b/support-files/compiler_warnings.supp 2009-10-03 20:13:58 +0000 @@ -109,3 +109,6 @@ ma_packrec.c : .*result of 32-bit shift # .* : .*no matching operator delete found; memory will not be freed if initialization throws an exception.* ctype-simple.c : .*unary minus operator applied to unsigned type, result still unsigned.* + +# Wrong warning due to GCC bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478 +regexec\.c : .*passing argument 3 of.*matcher.* discards qualifiers from pointer target type.*
participants (1)
-
knielsen＠knielsen-hq.org