Commit graph

55601 commits

Author SHA1 Message Date
Andrei Elkin
126c0b4433 Bug#38934 slave slave until does not work with --replicate-same-server-id
Bug#38540 rpl_server_id2 uses show slave status unnecessarily
            
Slave did not perform any event recorded into the relay log from some
different master when it was started with --replicate-same-server-id.
The reason appeared to be a consequence of BUG#38734 which stopped the
sql thread at its startup time.
      
The real fixes for the current bug are in the patch for BUG#38734.
This changeset carries only a regression test for the bugs.  Bug#38540
gets fixed too by means of eliminating an extra show slave status.


mysql-test/suite/rpl/r/rpl_server_id2.result:
  Bug#38934 Bug#38540 changed results.
mysql-test/suite/rpl/t/disabled.def:
  rpl_server_id2 is re-enabled.
mysql-test/suite/rpl/t/rpl_server_id2.test:
  regression test for BUG#38734 is added.
  Bug#38540 requirement to get rid of show slave status is implemented.
2008-12-19 20:59:22 +02:00
Magnus Svensson
95b779ee53 Merge 2008-12-05 22:15:52 +01:00
Magnus Svensson
db6be73cf3 Bug#41061 analyze-warnings times out sporadically in pushbuild
mysql-test/include/mtr_warnings.sql:
  Slice the time the takes to load the servers error log into error_log table
  by using a declared variable instead of user variable.
  Also change the while loop to only do one LOCATE per loop.
  Drop the temporary tables created by sp
2008-12-05 19:24:10 +01:00
Bjorn Munch
d2e0e3ce35 Bug #40924 please print timestamp when mtr fails
Added text "Test ended at <time>" after failure reports
2008-12-03 14:11:03 +01:00
Sven Sandberg
0456662539 BUG#41018: innodb_max_dirty_pages_pct_func fails sporadically: error 28 from storage engine
BUG#39382: innodb_max_dirty_pages_pct_func failed with timeout on pushbuild
Disabled innodb_max_dirty_pages_pct_func.
Please re-enable if the test gets fixed.


mysql-test/t/disabled.def:
  Disabled innodb_max_dirty_pages_pct_func.
2008-12-02 20:07:18 +01:00
He Zhenxing
b443bbb47a Auto merge 2008-11-28 17:52:53 +08:00
Serge Kozlov
011d84bb27 Bug#40145. Argument for LOAD_FILE() can be too long and sometimes
a query with two or more these functions truncated. Therefore data 
from each LOAD_FILE() copied into its local variables and then used
in a query.
2008-11-27 15:15:14 +03:00
Serge Kozlov
28ce657919 Bug#40708: Sometimes DB mysqltest1 did not removed before
starting test rpl_row_create_table therefore the patch add 
the cleanup operation if DB with such name already exists.
2008-11-27 15:04:48 +03:00
Sven Sandberg
82efca8d6b Clarified the error message printed when mtr's test cleanup check fails.
mysql-test/mysql-test-run.pl:
  Clarified error message printed when test cleanup check fails.
2008-11-25 17:51:02 +01:00
Andrei Elkin
d4c246f7f9 merge 5.1 main -> rpl 2008-11-24 16:04:36 +02:00
He Zhenxing
5676a2d770 BUG#40707 rpl_multi_engine fails sporadically in pushbuild
If before running test rpl_mulit_engin, the mysqltest1 database exists
on master but not exists on slave, then the following statement:

  create database if not exists mysqltest1;

would not be logged to binary log, and so the database would not be
created on slave. This would cause the test to fail and reporting 
mysqltest1 database not existed on slave.

This patch fixed this problem by not using a different database for
the whole test, just use the default test database, there is no reason
why a seperate database is used for this test.


mysql-test/include/rpl_multi_engine.inc:
  use default test database instead of mysqltest1
mysql-test/suite/rpl/r/rpl_multi_engine.result:
  use default test database instead of mysqltest1
mysql-test/suite/rpl/t/rpl_multi_engine.test:
  use default test database instead of mysqltest1
  add missing --enable_warnings
2008-11-24 14:57:23 +08:00
Magnus Svensson
66ced5f490 Bug#40891 test suite timeouts on valgrind host in pushbuild 2008-11-21 13:45:28 +01:00
Magnus Svensson
39be835d9c mtr - temporarily turn on verbose 2008-11-21 08:57:46 +01:00
Joerg Bruehe
3d0798d07d Merge the 5.0.72 build tag up into 5.1, no source change. 2008-11-19 13:04:34 +01:00
unknown
1f09ede4e4 Merge from mysql-5.0.72-release 2008-11-18 23:37:54 +01:00
Serge Kozlov
ab0e404c73 Bug#39861, added comment to mtr 2008-11-15 14:40:40 +03:00
Serge Kozlov
6518490844 fix for bug#39861 2008-11-15 00:44:56 +03:00
Serge Kozlov
3e0fb46142 Bug#39861:
1. mysqltest.cc - added flush to log file after each executed command in a testcase.
2. mtr shows 20 last lines from test case log file if timeout reached.
3. Optimizing the code by Magnus review.
4. It is partially fix bug#40150
2008-11-14 23:35:32 +03:00
Sven Sandberg
46118a40ec BUG#39853: lowercase_table3 fails on powermacg5 in rpl tree
post-push fix. forgot to update result file.
2008-11-14 16:36:33 +01:00
Magnus Svensson
06fdd29404 Bug#40742 MTR_VERSION=1 perl mysql-test-run.pl --start-and-exit rpl_alter does not work
mysql-test/lib/v1/mtr_cases.pl:
  The combinations file in suite uses my.cnf file syntax - thus the options in the
  combinations file should not have -- prefixed.
  Add -- to the option while reading it from file.
2008-11-14 15:39:12 +01:00
Magnus Svensson
f462fac548 Bug#40705 mtr's check-warnings fails sporadically in pushbuild
- Change the logic slightly for when and how errors from
   check-warnings and check-testcase are reported. The prevoius logic
   reporting testfailed twice and that might have caused this.
 - Also print result code returned from mysqltest when it is "unexpected"
2008-11-14 13:19:37 +01:00
Magnus Svensson
950d5d2760 Bug#40715 mtr fails when running the same test case in parallel threads
mysql-test/lib/My/Test.pm:
  Use a more unique key to identify which test has been serialized
2008-11-14 11:49:12 +01:00
Magnus Svensson
562f1d6571 WL#4189 Make mysqltest die if fflush fails 2008-11-14 11:08:09 +01:00
Magnus Svensson
34ff714b0d WL#4189 Make mysqltest flush log file at close if logfile is stdout 2008-11-14 11:06:56 +01:00
Magnus Svensson
c35214cdd2 WL#4189 Temporarily set parallel=1 by default 2008-11-14 10:22:44 +01:00
Magnus Svensson
b719dfdee1 Merge 2008-11-14 10:21:23 +01:00
Magnus Svensson
b454d067cb WL#4189 Add full backward compatibility to mysql-test-run.pl
- Add copy of mtr v1 and make it possible to run it using MTR_VERSION=1
2008-11-14 09:45:32 +01:00
Sven Sandberg
ca59e88ce3 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.


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.
2008-11-13 20:19:00 +01:00
Andrei Elkin
ca2d184695 merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.
mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.
2008-11-12 19:51:47 +02:00
Joerg Bruehe
1d521f6c20 Upmerge merge changesets 5.0-build -> 5.1-build, no code changes. 2008-11-11 14:03:00 +01:00
Joerg Bruehe
a1e2d2d146 Merge main 5.1 -> 5.1-build 2008-11-10 20:32:45 +01:00
Joerg Bruehe
b0c90810c0 Merge main 5.0 -> 5.0-build 2008-11-10 17:01:51 +01:00
Magnus Svensson
6be5398f3b WL#4189 Use only one worker for --record 2008-11-10 16:10:49 +01:00
Magnus Svensson
63891d63d6 Bug#40193 mtr --record is currently broken in 5.1-rpl and 6.0-rpl 2008-11-10 14:53:53 +01:00
Magnus Svensson
754ee26310 WL#4189 removed unused variables 2008-11-10 14:53:21 +01:00
Magnus Svensson
3b6edab71f Fix DBUG_PRINT 2008-11-10 14:52:51 +01:00
Magnus Svensson
a0759813c9 Merge 2008-11-07 16:26:11 +01:00
Magnus Svensson
affa5fc62d WL#4189 - fix for running from bin dist 2008-11-07 16:22:53 +01:00
Matthias Leich
9a0637750a Merge 2008-11-07 15:19:27 +01:00
Kristofer Pettersson
66f8501d96 Automerge 2008-11-07 14:52:43 +01:00
Kristofer Pettersson
e88487cc27 Bug#38883 thd_security_context is not thread safe, crashes?
Innodb monitor could cause a server crash because of invalid access to a
shared variable in a concurrent environment.
                  
This patch adds a guard to protect against crashes but not against
inconsistent values because of performance reasons.

sql/sql_class.cc:
  * Attempt snapshot of static memory pointer proc_info to avoid null pointers.
2008-11-07 13:12:56 +01:00
Georgi Kodinov
21c1182cc5 merged 5.0-bugteam -> 5.1-bugteam 2008-11-06 21:00:51 +02:00
Georgi Kodinov
75c2daf24e merged 5.1-main -> 5.1-bugteam 2008-11-06 20:59:47 +02:00
Georgi Kodinov
ff5662df68 merged 5.0-main -> 5.0-bugteam 2008-11-06 20:57:47 +02:00
Matthias Leich
e6891a8717 Remove files which were created during an upmerge
where it was forgotten to remove them.
2008-11-06 18:51:00 +01:00
unknown
5e9d35d5a8 Raise version number after cloning 5.1.30 2008-11-06 18:21:02 +01:00
Andrei Elkin
72b951ba58 bug#38230
refining the regression test to avoid explicit innodb engine in create.
2008-11-06 19:10:09 +02:00
Joerg Bruehe
ff59fccc12 Merge current 5.0 main tree and fix for bug#40546 2008-11-06 17:42:04 +01:00
Joerg Bruehe
e9be23fae6 Merge main 5.1 and the 5.1 version of the fix for bug#40546 2008-11-06 17:30:33 +01:00
Joerg Bruehe
3080e061e8 Bug #40546 Debug server in RPM is built with compiler optimization
Prevent this by modifying CFLAGS and CXXFLAGS.

Upmerge from 5.0, modified according to the different spec file structure.

support-files/mysql.spec.sh:
  Bug #40546  Debug server in RPM is built with compiler optimization
  
  Modify CFLAGS and CXXFLAGS for the duration of the debug server build
  (implemented by doing it in a subshell)
  so that they do not contain any optimization flag.
  Play it safe and prepare for both gcc and icc.
2008-11-06 17:09:14 +01:00