Hi Sven
Thank your for the work! Patch approved! I only have some minor
comments.
Sven Sandberg wrote:
> #At file:///home/sven/bzr/b38350-test_cleanup/5.1-rpl/
>
> 2689 Sven Sandberg 2008-10-31
> BUG#38350: Many tests don't clean up after themselves on exit.
> Problem: Many test cases don't clean up after themselves (fail
> to drop tables or fail to reset variables). This implies that:
> (1) check-testcase in the new mtr that currently lives in
> 5.1-rpl failed. (2) it may cause unexpected results in
> subsequent tests.
> Fix: make all tests clean up.
> Also: cleaned away unnecessary output in rpl_packet.result
> Also: fixed bug where rpl_log called RESET MASTER with a running
> slave. This is not supposed to work.
> Also: removed unnecessary code from rpl_stm_EE_err2 and made it
> verify that an error occurred.
> Also: removed unnecessary code from rpl_ndb_ctype_ucs2_def.
> modified:
> mysql-test/extra/rpl_tests/rpl_loaddata.test
> mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
> mysql-test/extra/rpl_tests/rpl_truncate_helper.test
> mysql-test/include/query_cache.inc
> mysql-test/mysql-test-run.pl*
> mysql-test/r/cache_innodb.result
> mysql-test/r/innodb-autoinc-optimize.result
> mysql-test/r/innodb.result
> mysql-test/r/log_tables.result
> mysql-test/r/mysql_client_test.result
> mysql-test/r/partition.result
> mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result
> mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
> mysql-test/suite/rpl/r/rpl_alter_db.result
> mysql-test/suite/rpl/r/rpl_drop_db.result
> mysql-test/suite/rpl/r/rpl_drop_view.result
> mysql-test/suite/rpl/r/rpl_events.result
> mysql-test/suite/rpl/r/rpl_idempotency.result
> mysql-test/suite/rpl/r/rpl_ignore_table.result
> mysql-test/suite/rpl/r/rpl_loaddata.result
> mysql-test/suite/rpl/r/rpl_packet.result
> mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
> mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
> mysql-test/suite/rpl/r/rpl_truncate_2myisam.result
> mysql-test/suite/rpl/r/rpl_truncate_3innodb.result
> mysql-test/suite/rpl/t/rpl_alter_db.test
> mysql-test/suite/rpl/t/rpl_drop_db.test
> mysql-test/suite/rpl/t/rpl_drop_view.test
> mysql-test/suite/rpl/t/rpl_events.test
> mysql-test/suite/rpl/t/rpl_idempotency.test
> mysql-test/suite/rpl/t/rpl_ignore_table.test
> mysql-test/suite/rpl/t/rpl_packet.test
> mysql-test/suite/rpl/t/rpl_row_max_relay_size.test
> mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result
> mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result
> mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result
> mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test
> mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test
> mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test
> mysql-test/t/innodb-autoinc-optimize.test
> mysql-test/t/innodb.test
> mysql-test/t/log_tables.test
> mysql-test/t/mysql_client_test.test
> mysql-test/t/partition.test
> mysql-test/t/status.test
>
> per-file messages:
> mysql-test/extra/rpl_tests/rpl_loaddata.test
> Made test clean up after itself.
> mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
> Made test clean up after itself.
> Also removed unnecessary save_master_pos.
> Also made test verify that an error occurred.
> mysql-test/extra/rpl_tests/rpl_truncate_helper.test
> Made test clean up after itself.
> mysql-test/include/query_cache.inc
> Made test clean up after itself.
> mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
> Made test clean up after itself.
> mysql-test/suite/rpl/t/rpl_alter_db.test
> Made test clean up after itself.
> Easiest to refactor the test a little, to use an auxiliary database instead of
> mysql:
> Then we don't need to read the collation at the start of the test and reset it at
> the
> end of the test. We can just drop the database.
> mysql-test/suite/rpl/t/rpl_drop_db.test
> Made test clean up after itself.
> mysql-test/suite/rpl/t/rpl_drop_view.test
> Made test clean up after itself.
> mysql-test/suite/rpl/t/rpl_events.test
> Made test clean up after itself.
> mysql-test/suite/rpl/t/rpl_idempotency.test
> Made test clean up after itself.
> mysql-test/suite/rpl/t/rpl_ignore_table.test
> Made test clean up after itself.
> The existing cleanup code didn't work, because the --replicate-*
> options prevented the "drop table" from being replicated. Moved
> "drop table t4" to a statement of its own.
> mysql-test/suite/rpl/t/rpl_packet.test
> Made test clean up after itself.
> Also replaced SHOW SLAVE STATUS by query_get_value(SHOW SLAVE STATUS...),
> since only one column of the result was interesting.
> mysql-test/suite/rpl/t/rpl_row_max_relay_size.test
> Made test clean up after itself.
> Instead of setting binlog format at the beginning of the test, we just
> do 'source include/have_binlog_format_row.inc' like all other tests.
> mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test
> Made test clean up after itself.
> mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test
> Made test clean up after itself.
> Also removed unnecessary 'create table; drop table'
> Also removed unnecessary use of --command
> mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test
> Made test clean up after itself.
> mysql-test/t/innodb-autoinc-optimize.test
> Made test clean up after itself.
> mysql-test/t/innodb.test
> Made test clean up after itself.
> mysql-test/t/log_tables.test
> Made test clean up after itself.
> mysql-test/t/mysql_client_test.test
> Made test clean up after itself.
> mysql-test/t/partition.test
> Made test clean up after itself.
> mysql-test/t/status.test
> Made test clean up after itself.
> === modified file 'mysql-test/extra/rpl_tests/rpl_loaddata.test'
> --- a/mysql-test/extra/rpl_tests/rpl_loaddata.test 2008-03-25 17:40:49 +0000
> +++ b/mysql-test/extra/rpl_tests/rpl_loaddata.test 2008-10-31 15:15:18 +0000
> @@ -146,10 +146,9 @@ terminated by ',' optionally enclosed by
> '\n##\n' starting by '>' ignore 1 lines;
> connection slave;
> --source include/wait_for_slave_sql_to_stop.inc
> -drop table t2;
> +drop table t1, t2;
> connection master;
> -drop table t2;
> -drop table t1;
> +drop table t1, t2;
>
> # BUG#17233 LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed
> CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB;
> @@ -157,8 +156,6 @@ CREATE TABLE t1 (word CHAR(20) NOT NULL
> --error ER_DUP_ENTRY
> LOAD DATA INFILE "../../std_data/words.dat" INTO TABLE t1;
>
> ---disable_warnings
> DROP TABLE IF EXISTS t1;
> ---enable_warnings
>
> # End of 4.1 tests
>
> === modified file 'mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test'
> --- a/mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test 2007-06-13 03:52:43 +0000
> +++ b/mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test 2008-10-31 15:15:18 +0000
> @@ -18,13 +18,18 @@ eval create table t1 (a int, unique(a))
> set sql_log_bin=0;
> insert into t1 values(2);
> set sql_log_bin=1;
> -save_master_pos;
> +
> --error ER_DUP_ENTRY
> insert into t1 values(1),(2);
> drop table t1;
> -save_master_pos;
> +
> connection slave;
> --source include/wait_for_slave_sql_to_stop.inc
> +let $error= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1);
> +let $errno= query_get_value(SHOW SLAVE STATUS, Last_SQL_Errno, 1);
> +--echo Error: "$error" (expected different error codes on master and slave)
> +--echo Errno: "$errno" (expected 0)
How about change to something like this?
echo # expected different error codes on master and slave;
echo Error: "$error";
echo # expected 0;
echo Errno: "$errno";
> +drop table t1;
>
> # End of 4.1 tests
>
[snip]
> === modified file 'mysql-test/r/log_tables.result'
> --- a/mysql-test/r/log_tables.result 2008-10-23 19:27:09 +0000
> +++ b/mysql-test/r/log_tables.result 2008-10-31 15:15:18 +0000
> @@ -1,5 +1,10 @@
> SET @old_general_log_state = @@global.general_log;
> -SET @old_slow_log_state = @@global.slow_query_log;
> +SET @old_log_slow_queries= @@global.log_slow_queries;
> +SET @old_log_output= @@global.log_output;
> +SET @old_slow_query_log= @@global.slow_query_log;
> +SET @old_general_log= @@global.general_log;
> +SET @old_log= @@global.log;
> +SET @old_long_query_time= @@session.long_query_time;
> use mysql;
> truncate table general_log;
> select * from general_log;
> @@ -356,7 +361,6 @@ slow_log
> slow_log_new
> drop table slow_log_new, general_log_new;
> use test;
> -SET @my_log_output= @@global.log_output;
> SET GLOBAL LOG_OUTPUT = 'TABLE';
> SET GLOBAL general_log = 0;
> FLUSH LOGS;
> @@ -393,7 +397,6 @@ SET GLOBAL general_log = 0;
> FLUSH LOGS;
> ALTER TABLE mysql.general_log DROP COLUMN seq;
> ALTER TABLE mysql.general_log ENGINE = CSV;
> -SET @old_long_query_time:=@@long_query_time;
> SET GLOBAL slow_query_log = 0;
> FLUSH LOGS;
> TRUNCATE TABLE mysql.slow_log;
> @@ -425,8 +428,8 @@ SET SESSION long_query_time =@old_long_q
> FLUSH LOGS;
> ALTER TABLE mysql.slow_log DROP COLUMN seq;
> ALTER TABLE mysql.slow_log ENGINE = CSV;
> -SET GLOBAL general_log = @old_general_log_state;
> -SET GLOBAL slow_query_log = @old_slow_log_state;
> +SET GLOBAL general_log = @old_general_log;
> +SET GLOBAL slow_query_log = @old_slow_query_log;
> drop procedure if exists proc25422_truncate_slow;
> drop procedure if exists proc25422_truncate_general;
> drop procedure if exists proc25422_alter_slow;
> @@ -598,8 +601,6 @@ UNTIL done END REPEAT;
> CLOSE cur1;
> TRUNCATE mysql.general_log;
> END //
> -SET @old_general_log_state = @@global.general_log;
> -SET @old_slow_log_state = @@global.slow_query_log;
> SET GLOBAL general_log = ON;
> SET GLOBAL slow_query_log = ON;
> select "put something into general_log";
> @@ -619,11 +620,10 @@ DROP TABLE `db_17876.general_log_data`;
> DROP PROCEDURE IF EXISTS `db_17876.archiveSlowLog`;
> DROP PROCEDURE IF EXISTS `db_17876.archiveGeneralLog`;
> DROP DATABASE IF EXISTS `db_17876`;
> -SET GLOBAL general_log = @old_general_log_state;
> -SET GLOBAL slow_query_log = @old_slow_log_state;
> +SET GLOBAL general_log = @old_general_log;
> +SET GLOBAL slow_query_log = @old_slow_query_log;
> select CONNECTION_ID() into @thread_id;
> truncate table mysql.general_log;
> -set @old_general_log_state = @@global.general_log;
> set global general_log = on;
> set @lparam = "000 001 002 003 004 005 006 007 008 009"
> "010 011 012 013 014 015 016 017 018 019"
> @@ -730,7 +730,6 @@ execute long_query using @lparam;
> set global general_log = off;
> select command_type, argument from mysql.general_log where thread_id = @thread_id;
> command_type argument
> -Query set @old_general_log_state = @@global.general_log
> Query set global general_log = on
> Query set @lparam = "000 001 002 003 004 005 006 007 008 009"
> "010 011 012 013 014 015 016 017 018 019"
> @@ -838,7 +837,7 @@ Query execute long_query using @lparam
> Execute select '000 001 002 003 004 005 006 007 008 009010 011 012 013 014 015 016
> 017 018 019020 021 022 023 024 025 026 027 028 029030 031 032 033 034 035 036 037 038
> 039040 041 042 043 044 045 046 047 048 049050 051 052 053 054 055 056 057 058 059060 061
> 062 063 064 065 066 067 068 069070 071 072 073 074 075 076 077 078 079080 081 082 083 084
> 085 086 087 088 089090 091 092 093 094 095 096 097 098 099100 101 102 103 104 105 106 107
> 108 109110 111 112 113 114 115 116 117 118 119120 121 122 123 124 125 126 127 128 129130
> 131 132 133 134 135 136 137 138 139140 141 142 143 144 145 146 147 148 149150 151 152 153
> 154 155 156 157 158 159160 161 162 163 164 165 166 167 168 169170 171 172 173 174 175 176
> 177 178 179180 181 182 183 184 185 186 187 188 189190 191 192 193 194 195 196 197 198
> 199200 201 202 203 204 205 206 207 208 209210 211 212 213 214 215 216 217 218 219220 221
> 222 223 224 225 226 227 228 229230 231 232 233 234 235 236 237 238 239240 241 242 243 244
> 245 246 247 24!
8 2
> 49250 251 252 253 254 255 256 257 258 259260 261 262 263 264 265 266 267 268 269270
> 271 272 273 274 275 276 277 278 279280 281 282 283 284 285 286 287 288 289290 291 292 293
> 294 295 296 297 298 299300 301 302 303 304 305 306 307 308 309310 311 312 313 314 315 316
> 317 318 319320 321 322 323 324 325 326 327 328 329330 331 332 333 334 335 336 337 338
> 339340 341 342 343 344 345 346 347 348 349350 351 352 353 354 355 356 357 358 359360 361
> 362 363 364 365 366 367 368 369370 371 372 373 374 375 376 377 378 379380 381 382 383 384
> 385 386 387 388 389390 391 392 393 394 395 396 397 398 399400 401 402 403 404 405 406 407
> 408 409410 411 412 413 414 415 416 417 418 419420 421 422 423 424 425 426 427 428 429430
> 431 432 433 434 435 436 437 438 439440 441 442 443 444 445 446 447 448 449450 451 452 453
> 454 455 456 457 458 459460 461 462 463 464 465 466 467 468 469470 471 472 473 474 475 476
> 477 478 479480 481 482 483 484 485 486 487 488 489490 491 492 493 494 495 496 497 498
> 499500 501 5!
02
> 503 504 505 506 507 508 509510 511 512 513 514 515 516 517 518 519520 521 522 523
> 524 525 526 527 528 529530 531 532 533 534 535 536 537 538 539540 541 542 543 544 545 546
> 547 548 549550 551 552 553 554 555 556 557 558 559560 561 562 563 564 565 566 567 568
> 569570 571 572 573 574 575 576 577 578 579580 581 582 583 584 585 586 587 588 589590 591
> 592 593 594 595 596 597 598 599600 601 602 603 604 605 606 607 608 609610 611 612 613 614
> 615 616 617 618 619620 621 622 623 624 625 626 627 628 629630 631 632 633 634 635 636 637
> 638 639640 641 642 643 644 645 646 647 648 649650 651 652 653 654 655 656 657 658 659660
> 661 662 663 664 665 666 667 668 669670 671 672 673 674 675 676 677 678 679680 681 682 683
> 684 685 686 687 688 689690 691 692 693 694 695 696 697 698 699700 701 702 703 704 705 706
> 707 708 709710 711 712 713 714 715 716 717 718 719720 721 722 723 724 725 726 727 728
> 729730 731 732 733 734 735 736 737 738 739740 741 742 743 744 745 746 747 748 749750 751
> 752 753 754 755!
75
> 6 757 758 759760 761 762 763 764 765 766 767 768 769770 771 772 773 774 775 776 777
> 778 779780 781 782 783 784 785 786 787 788 789790 791 792 793 794 795 796 797 798 799800
> 801 802 803 804 805 806 807 808 809810 811 812 813 814 815 816 817 818 819820 821 822 823
> 824 825 826 827 828 829830 831 832 833 834 835 836 837 838 839840 841 842 843 844 845 846
> 847 848 849850 851 852 853 854 855 856 857 858 859860 861 862 863 864 865 866 867 868
> 869870 871 872 873 874 875 876 877 878 879880 881 882 883 884 885 886 887 888 889890 891
> 892 893 894 895 896 897 898 899900 901 902 903 904 905 906 907 908 909910 911 912 913 914
> 915 916 917 918 919920 921 922 923 924 925 926 927 928 929930 931 932 933 934 935 936 937
> 938 939940 941 942 943 944 945 946 947 948 949950 951 952 953 954 955 956 957 958 959960
> 961 962 963 964 965 966 967 968 969970 971 972 973 974 975 976 977 978 979980 981 982 983
> 984 985 986 987 988 989990 991 992 993 994 995 996 997 998 999' as long_query
> Query set global general_log = off
Very strange!!!! The upper long line is splitted into several lines, I
don't know if this is problem of bzr or mail agent, I manually fixed
this in order to apply this patch, there are several instance of this
kind of error in this patch.
[snip]
> === modified file 'mysql-test/suite/rpl/r/rpl_packet.result'
> --- a/mysql-test/suite/rpl/r/rpl_packet.result 2008-07-10 16:09:39 +0000
> +++ b/mysql-test/suite/rpl/r/rpl_packet.result 2008-10-31 15:15:18 +0000
> @@ -31,42 +31,9 @@ include/stop_slave.inc
> include/start_slave.inc
> CREATE TABLe `t1` (`f1` LONGTEXT) ENGINE=MyISAM;
> INSERT INTO `t1`(`f1`) VALUES
> ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaa
>
> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
aaa
>
> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa2048');
Here too, long line is splited.
[snip]
>
> === modified file 'mysql-test/suite/rpl/t/rpl_ignore_table.test'
> --- a/mysql-test/suite/rpl/t/rpl_ignore_table.test 2007-12-12 19:12:29 +0000
> +++ b/mysql-test/suite/rpl/t/rpl_ignore_table.test 2008-10-31 15:15:18 +0000
> @@ -127,7 +127,8 @@ show grants for mysqltest4@localhost;
> set global slave_exec_mode='IDEMPOTENT';
>
> connection master;
> -drop table t1, t4, mysqltest2.t2;
> +drop table t1, mysqltest2.t2;
> +drop table t4;
Isn't the orginal line the same as your modified lines?
[snip]
