1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-05 12:42:17 +03:00
Commit Graph

1558 Commits

Author SHA1 Message Date
fefb7c6be6 Merge bk-internal:/home/bk/mysql-5.1
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam


mysql-test/t/disabled.def:
  Auto merged
2008-05-01 13:25:38 +03:00
8cc540767d Bug #36435 rpl_events uses non-deterministic check
Select of the test could not perform deterministically, because the table remains to be 
updatable by the running event handler.

Fixed with changing verification to use a logical values instead of comparison 
with a pre-recorded results.


mysql-test/include/rpl_events.inc:
  changing verification to use a logical values instead of comparison with a pre-recorded
  results
mysql-test/suite/rpl/r/rpl_events.result:
  resutls updated.
2008-04-30 21:41:50 +03:00
06ddedd731 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
2008-04-30 10:15:32 -03:00
f4bd5105e2 Backport kostja's fix for Bug#32724 "innodb_mysql.test fails randomly".
Enable back the disabled test case.


mysql-test/include/mix1.inc:
  Fix a race condition in the test, causing a sporadic failure.
mysql-test/r/innodb_mysql.result:
  Update test case result.
mysql-test/t/disabled.def:
  Enable the test case innodb_mysql.
sql/sql_parse.cc:
  Fix the random failure of innodb_mysql test. The failure is not
  random any more after a patch for Bug 12713 added asserts around
  handler commit.
2008-04-29 00:03:19 -03:00
dda1dbbbd8 WL#3754, circular replication tests
BitKeeper/deleted/.del-rpl_ndb_circular_2ch-master.opt:
  Delete: mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-master.opt
BitKeeper/deleted/.del-rpl_ndb_circular_2ch-slave.opt:
  Delete: mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt
BitKeeper/deleted/.del-rpl_circular_for_4_hosts-master.opt:
  Delete: mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt
BitKeeper/deleted/.del-rpl_circular_for_4_hosts-slave.opt:
  Delete: mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-slave.opt
mysql-test/include/circular_rpl_for_4_hosts_init.inc:
  initialization primitive
mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result:
  result file
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
  result file
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.cnf:
  config file for test
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf:
  config file for test
2008-04-25 20:54:42 +04:00
994e9d6362 Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  mysql.com:/home/ksm/mysql/WL3754/commit-mysql-5.1-new-rpl
2008-04-25 00:47:36 +04:00
55d18e13ca WL#3754, testing circular replication
mysql-test/include/circular_rpl_for_4_hosts_init.inc:
  The primitive for 4 hosts non-cluster circular replication
mysql-test/include/circular_rpl_for_4_hosts_sync.inc:
  The primitive for sync for 4 hosts non-cluster circular replication
mysql-test/include/ndb_master-slave_2ch.inc:
  The primitive for initialization of two-channel cluster replication
mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result:
  Result file
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-master.opt:
  Options file
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts-slave.opt:
  Options file
mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test:
  The test case for non-cluster circular replication A->B->C->D->A
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result:
  Result file
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-master.opt:
  Options file
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch-slave.opt:
  Options file
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
  The test case for cluster circular replication by two channels
2008-04-25 00:41:04 +04:00
032f64f3ff Allow 2002 as a valid error for connect fails. It's common on windows where
we don't use Unix domin sockets for connection to server
2008-04-24 14:16:32 +02:00
9ac15b610e Add warning supressions for bug#31590 and bug#26402 that gort lost when
moving the supressions from perl to SQL
2008-04-24 13:26:28 +02:00
857a6dc14c Rename "shutdown" -> "send_shutdown" and "kill_server" to "shutdown_server"
Fix warnings


mysql-test/mysql-test-run.pl:
  Symlink var/tmp to $opt_tmpdir if not using var/tmp
mysql-test/include/restart_mysqld.inc:
  Renama
2008-04-21 17:39:13 +02:00
4638c78d35 Add "kill_server", call shutdown on current conneciton and then make sure
the server dissapears
Check return code of 'mysql_ping'
Add "shutdown", call 'mysql_shutdown' on the current connection 


mysql-test/include/restart_mysqld.inc:
  Use "kill_server"
mysql-test/include/wait_until_connected_again.inc:
  Init $mysql_errno to 9999
  Add workaround for BUG#36228
2008-04-21 14:16:54 +02:00
13f394b6d6 Fix for main.events_restart
mysql-test/include/wait_until_connected_again.inc:
  added new errno 1053
mysql-test/include/wait_until_disconnected.inc:
  added new errno 1053
2008-04-20 22:24:00 +04:00
6116e30633 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
into  hh-nb.hungers:/work/merge/mysql-5.1-build
2008-04-15 15:56:11 +02:00
53c1832680 Third set of fixes for bug#35988. 2008-04-15 15:44:11 +02:00
3c565a66b5 Set mysqladmin shutdown timeout to 60 seconds
mysql-test/mysql-test-run.pl:
  Add printout
2008-04-14 14:25:57 +02:00
3828535bbe Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
into  hh-nb.hungers:/work/merge/mysql-5.1-build


BitKeeper/etc/ignore:
  auto-union
2008-04-10 18:32:37 +02:00
b00c536378 System variable tests delivered by Folio3 (see WL4288).
BitKeeper/etc/ignore:
  Added mysql-test/linux_sys_vars.inc mysql-test/load_sysvars.inc mysql-test/windows_sys_vars.inc to the ignore list
2008-04-10 15:14:28 +02:00
4bdec18f75 Improve readability of check testcase data and add order by 2008-04-09 22:06:02 +02:00
5242048883 Fix return code from check-warnings to indicate if test failed or not.
No more string matching


mysql-test/include/check-warnings.test:
  Check return value from check_warnings and call skip if ok
mysql-test/include/mtr_check.sql:
  Improve readability
mysql-test/include/mtr_warnings.sql:
  Add out parameter for result.
  Increase the max_allowed_packet variable so the load_file works
  even if the server is started with low such value
2008-04-09 14:38:42 +02:00
fc0de68e00 Turn on --check-testcase by default
Don't log check_warnings to binlog


mysql-test/include/check-testcase.test:
  Change to use a stored pårocedure for check_testcase
mysql-test/include/mtr_warnings.sql:
  Don't log the check_warning procedure to binlog
mysql-test/mysql-test-run.pl:
  Turn on --check-testcase by default
mysql-test/include/mtr_check.sql:
  New BitKeeper file ``mysql-test/include/mtr_check.sql''
2008-04-09 12:27:39 +02:00
f84ba1b5b7 Merge pilot:mysql/mysql-5.1-rpl
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-rpl
2008-04-09 09:55:30 +02:00
7d4b25bda2 Update comment to reflect reality 2008-04-09 09:44:08 +02:00
fb5ad5e75d Mereg events_restart_phase* to events_restart
BitKeeper/deleted/.del-events_restart_phase2.test:
  Delete: mysql-test/t/events_restart_phase2.test
BitKeeper/deleted/.del-events_restart_phase2-master.opt:
  Delete: mysql-test/t/events_restart_phase2-master.opt
BitKeeper/deleted/.del-events_restart_phase3.test:
  Delete: mysql-test/t/events_restart_phase3.test
BitKeeper/deleted/.del-events_restart_phase3-master.opt:
  Delete: mysql-test/t/events_restart_phase3-master.opt
BitKeeper/deleted/.del-events_restart_phase2.result:
  Delete: mysql-test/r/events_restart_phase2.result
BitKeeper/deleted/.del-events_restart_phase3.result:
  Delete: mysql-test/r/events_restart_phase3.result
mysql-test/include/restart_mysqld.inc:
  New BitKeeper file ``mysql-test/include/restart_mysqld.inc''
mysql-test/include/wait_until_disconnected.inc:
  New BitKeeper file ``mysql-test/include/wait_until_disconnected.inc''
mysql-test/t/events_restart-master.opt:
  New BitKeeper file ``mysql-test/t/events_restart-master.opt''
2008-04-09 09:43:20 +02:00
d4779aaa48 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-warnings2
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl


mysql-test/mysql-test-run.pl:
  Auto merged
2008-04-08 16:52:15 +02:00
2c4ca51050 Check warnings in servers error log as part of test case
BitKeeper/deleted/.del-rpl_bug33931-slave.opt:
  Delete: mysql-test/suite/rpl/t/rpl_bug33931-slave.opt
mysql-test/include/default_mysqld.cnf:
  Set a default name for "log-bin"
mysql-test/mysql-test-run.pl:
  Check for warnings in mysqld error log files after each testcase,
  using SQL
mysql-test/lib/mtr_cases.pm:
  Make mtr_match into a perl module
mysql-test/lib/mtr_match.pm:
  Make mtr_match into a perl module
mysql-test/lib/mtr_report.pm:
  Make mtr_match into a perl module
  Print warnings if testcase failed from warnings
mysql-test/r/information_schema.result:
  Be more selective which databases and tables are select in the queries
mysql-test/r/mysql_upgrade.result:
  Update result, mysql_upgrade will check _all_ databases
mysql-test/r/mysqlcheck.result:
  Update result, mysql_upgrade should check _all_ databases
mysql-test/r/sp-destruct.result:
  Be more selective which databases and tables are select in the queries
mysql-test/r/sp-error.result:
  Backup and restore mysql.proc table
mysql-test/r/sp-security.result:
  Be more selective which databases and tables are select in the queries
mysql-test/r/sp.result:
  Be more selective which databases and tables are select in the queries
mysql-test/suite/rpl/r/rpl_bug33931.result:
  Move the setting of debug flag into the test file instead of in -slave.opt
  Add supression
mysql-test/suite/rpl/r/rpl_idempotency.result:
  Add supression
  Add master-slave-end.inc
mysql-test/suite/rpl/t/rpl_bug33931.test:
  Move the setting of debug flag into the test file instead of in -slave.opt
  Add supression
mysql-test/suite/rpl/t/rpl_idempotency.test:
  Add supression
  Add master-slave-end.inc
mysql-test/t/information_schema.test:
  Be more selective which databases and tables are select in the queries
mysql-test/t/sp-destruct.test:
  Be more selective which databases and tables are select in the queries
mysql-test/t/sp-error.test:
  Backup and restore mysql.proc table
mysql-test/t/sp-security.test:
  Be more selective which databases and tables are select in the queries
mysql-test/t/sp.test:
  Be more selective which databases and tables are select in the queries
mysql-test/include/check-warnings.test:
  New BitKeeper file ``mysql-test/include/check-warnings.test''
mysql-test/include/mtr_warnings.sql:
  New BitKeeper file ``mysql-test/include/mtr_warnings.sql''
2008-04-08 16:51:26 +02:00
f361b632f4 Merge bk-internal:/home/bk/mysql-5.1-rpl
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
2008-04-03 21:51:26 +02:00
3ad402570d Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-rpl_row_charset.test:
  Auto merged
CMakeLists.txt:
  Auto merged
configure.in:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/include/commit.inc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/lib/mtr_report.pm:
  Auto merged
mysql-test/r/commit_1innodb.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/ctype_big5.result:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/partition_error.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_unsafe.result:
  Auto merged
mysql-test/suite/binlog/t/binlog_unsafe.test:
  Auto merged
mysql-test/suite/federated/federated.result:
  Auto merged
mysql-test/suite/federated/federated.test:
  Auto merged
mysql-test/suite/parts/r/partition_alter1_myisam.result:
  Auto merged
mysql-test/suite/parts/r/partition_alter2_myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_log.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_log_innodb.result:
  Auto merged
mysql-test/suite/rpl/t/disabled.def:
  Auto merged
mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result:
  Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/distinct.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/partition_error.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
BitKeeper/deleted/.del-combinations:
  Delete: mysql-test/suite/binlog/combinations
mysql-test/r/partition_not_windows.result:
  Use remote
mysql-test/r/partition_symlink.result:
  Use remote
mysql-test/r/symlink.result:
  SCCS merged
mysql-test/suite/parts/inc/partition_basic.inc:
  SCCS merged
mysql-test/suite/parts/inc/partition_check_drop.inc:
  Use remote
mysql-test/suite/parts/inc/partition_layout_check1.inc:
  Use remote
mysql-test/suite/parts/inc/partition_layout_check2.inc:
  Use remote
mysql-test/suite/parts/r/partition_basic_innodb.result:
  Use remote
mysql-test/suite/parts/r/partition_basic_myisam.result:
  Use remote
mysql-test/suite/parts/r/partition_engine_myisam.result:
  Use remote
mysql-test/suite/parts/t/partition_sessions.test:
  SCCS merged
mysql-test/t/partition.test:
  SCCS merged
mysql-test/t/partition_not_windows.test:
  Use remote
mysql-test/t/partition_symlink.test:
  Use remote
mysql-test/t/symlink.test:
  Use remote
mysql-test/suite/binlog/r/binlog_multi_engine.result:
  Manual merge, name of binlog file changed
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test:
  Manual merge
mysys/my_init.c:
  Manual merge
2008-04-03 11:50:43 +02:00
1ed79b8b5c Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  mysql.com:/home/ksm/mysql/bugs/commit-mysql-5.1-new-rpl-bug30128
2008-04-03 13:08:03 +04:00
0ad6f5915f Bug#30128, The reason that sometimes events were executed because without STARTS clause server fires immediately after creating event and
time between create and delete event sometimes is enough for firing. So adding STARTS clause moves first execution in future after drop of event.


mysql-test/include/rpl_events.inc:
  Updated test file
mysql-test/suite/rpl/r/rpl_events.result:
  Updated result file
2008-04-02 19:41:49 +04:00
f6f2398185 Fixes to eliminate some race conditions in tests.
mysql-test/include/master-slave-reset.inc:
  Adding missing waits for slave to start and stop causing test failures.
mysql-test/suite/rpl/t/rpl_insert.test:
  Waiting for the rows to be inserted instead of relying on the binlog position
  to be updated correctly.
2008-04-01 14:40:23 +02:00
5ba1762d70 Merge bk-internal:/home/bk/mysql-5.1-bugteam
into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
2008-03-31 12:38:01 +03:00
600a664a5a Updating commit.inc since the number of commits done for non-transactional
tables is not zero any more. For row-based logging, there is an extra commit
for sending rows changed by the statement to the binary log.


mysql-test/include/commit.inc:
  For row-based logging, an extra commit is done for each statement to commit
  non-transactional changes to the binary log.
mysql-test/r/commit_1innodb.result:
  Result change.
2008-03-31 11:29:03 +02:00
d59b8cf093 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-03-31 09:57:29 +02:00
cfc420976e Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl


client/mysqltest.c:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
2008-03-29 14:19:53 +02:00
98b7766053 Merge stella.local:/home2/mydev/mysql-5.1-amain
into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/t/query_cache.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
mysql-test/r/query_cache.result:
  SCCS merged
2008-03-26 17:36:12 +01:00
6d2976c044 Merge mail.hezx.com:/media/sda3/work/mysql/bkroot/mysql-5.1-new-rpl
into  mail.hezx.com:/media/sda3/work/mysql/bkwork/b33029_5.0_to_5.1_fails_on_dup_key/5.1


sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2008-03-26 21:40:44 +08:00
a5ac54566c Merge mail.hezx.com:/media/sda3/work/mysql/bkroot/mysql-5.0-rpl
into  mail.hezx.com:/media/sda3/work/mysql/bkwork/b33029_5.0_to_5.1_fails_on_dup_key/5.0
2008-03-26 21:37:34 +08:00
03c110ea21 Merge stella.local:/home2/mydev/mysql-5.1-amain
into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/ctype_big5.result:
  Auto merged
mysql-test/r/ctype_euckr.result:
  Auto merged
mysql-test/r/ctype_gb2312.result:
  Auto merged
mysql-test/r/ctype_gbk.result:
  Auto merged
mysql-test/r/ctype_uca.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/lib/mtr_report.pl:
  SCCS merged
2008-03-26 10:27:00 +01:00
0d6f9bad70 Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg


mysql-test/r/ctype_big5.result:
  Auto merged
mysql-test/r/ctype_cp932.result:
  Auto merged
mysql-test/r/ctype_euckr.result:
  Auto merged
mysql-test/r/ctype_gb2312.result:
  Auto merged
mysql-test/r/ctype_gbk.result:
  Auto merged
mysql-test/r/ctype_uca.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/slave.cc:
  Auto merged
2008-03-26 09:33:55 +01:00
bd02573610 After merge fixes
mysql-test/include/commit.inc:
  Adjust path
  Add missing drop tables
mysql-test/mysql-test-run.pl:
  Remove duplicate printout
mysql-test/lib/mtr_report.pm:
  Only print each test that has failed once
mysql-test/r/commit_1innodb.result:
  Adjust path
  Add missing drop table
mysql-test/suite/binlog/r/binlog_multi_engine.result:
  Remove merge error - extra s
mysql-test/suite/binlog/r/binlog_unsafe.result:
  Remove drop of non existing view
mysql-test/suite/binlog/t/binlog_unsafe.test:
  Remove drop of non existing view
2008-03-26 07:22:42 +01:00
9cf8329833 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/extra/rpl_tests/rpl_loaddata.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/lib/mtr_report.pm:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_flushlog_loop.result:
  Auto merged
mysql-test/suite/rpl/t/disabled.def:
  Auto merged
mysql-test/suite/rpl/t/rpl_flushlog_loop.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Use local
mysql-test/r/type_blob.result:
  Manual merge
mysql-test/suite/binlog/r/binlog_multi_engine.result:
  Manual merge
mysql-test/suite/binlog/r/binlog_unsafe.result:
  Manual merge
mysql-test/suite/binlog/t/binlog_unsafe.test:
  Manual merge
mysql-test/suite/rpl/r/rpl_loaddata.result:
  Manual merge
mysql-test/t/mysqlbinlog2.test:
  Manual merge
2008-03-25 18:40:49 +01:00
6cd3a1503b Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged


sql/sql_delete.cc:
  Auto merged
2008-03-25 14:54:08 +03:00
07db330a55 Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged


libmysql/libmysql.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2008-03-18 13:51:17 +03:00
6cf64b26d8 Bug #18199 PURGE BINARY LOGS fails silently with missing logs;
Bug #18453  Warning/error message if there is a mismatch between ...
 
There were three problems:
 
 1. the reported lack of warnings for the BEFORE syntax of PURGE;
 2. the similar lack of warnings for the TO syntax;
 3. incompatible behaviour between the two in that the latter blanked out
    regardlessly of presence or lack the actual file corresponding to
    an index record; the former version gave up at the first mismatch.

fixed with deploying the warning's generation and synronizing logics of 
purge_logs() and purge_logs_before_date().
my_stat() is called in either of two branches of purge_logs() (responsible
for the TO syntax of PURGE) similarly to how it has behaved in the BEFORE syntax.
If there is no actual binlog file, my_stat returns NULL and my_delete is
not invoked.
A critical error is reported to the user if a file from the index
could not be retrieved info about or deleted with a system error code
different than ENOENT.


sql/log.cc:
  generating warning in two functions.
  refining logics to call my_stat() by purge_logs() as it happens
  in purge_logs_before_date().
  my_delete() is called only if my_stat() ensured existance of the file.
  A critical error is reported to the user if a file from the index
  could not be my_stat():ed or my_delete():d with an error different
  than ENOENT.
sql/share/errmsg.txt:
  new error message
mysql-test/include/show_binary_logs.inc:
  a new macro - shortcut of show binary logs
mysql-test/r/binlog_index.result:
  new results
mysql-test/t/binlog_index.test:
  a regression test for the bugs
2008-03-17 20:19:04 +02:00
c1e69a77a6 Avoid races in connect.test.
The problem was in a test case for Bug33507:
  - when the number of active connections reaches the limit,
    the server accepts only root connections. That's achieved by
    accepting a connection, negotiating with the client and
    checking user credentials. If it is not SUPER, the connection
    is dropped.
  - when the server accepts connection, it increases the counter;
  - when the server drops connection, it decreases the counter;
  - the race was in between of decreasing the counter and accepting
    new connection:
    - max_user_connections = 2;
    - 2 oridinary user connections accepted;
    - extra user connection is establishing;
    - server checked user credentials, and sent 'Too many connections'
      error;
    - the client receives the error and establishes extra SUPER user
      connection;
    - the server however didn't decrease the counter (the extra
      user connection still is "alive" in the server) -- so, the new
      SUPER-user connection, will be dropped, because it exceeds
      (max_user_connections + 1).

The fix is to implement "safe connect", which makes several attempts
to connect and use it in the test script.


mysql-test/r/connect.result:
  Update test file.
mysql-test/t/connect.test:
  Avoid races in connect.test.
mysql-test/include/connect2.inc:
  Auxiliary routine to establish a connection reliably.
2008-03-17 14:26:00 +03:00
774d21cf3b Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


mysql-test/include/commit.inc:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/commit_1innodb.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2008-03-14 18:32:01 +01:00
e79249f81b Manual merge
configure.in:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_symlink.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_parse.cc:
  Manual merge. Needs later fix. New code in create table was not
  accepted. Needs to be added to mysql_create_table_no_lock().
2008-03-14 12:02:11 +01:00
f21ee5d00d BUG#33029 5.0 to 5.1 replication fails on dup key when inserting
using a trig in SP

For all 5.0 and up to 5.1.12 exclusive, when a stored routine or
trigger caused an INSERT into an AUTO_INCREMENT column, the
generated AUTO_INCREMENT value should not be written into the
binary log, which means if a statement does not generate
AUTO_INCREMENT value itself, there will be no Intvar event (SET
INSERT_ID) associated with it even if one of the stored routine
or trigger caused generation of such a value. And meanwhile, when
executing a stored routine or trigger, it would ignore the
INSERT_ID value even if there is a INSERT_ID value available set
by a SET INSERT_ID statement.

Starting from MySQL 5.1.12, the generated AUTO_INCREMENT value is
written into the binary log, and the value will be used if
available when executing the stored routine or trigger.

Prior fix of this bug in MySQL 5.0 and prior MySQL 5.1.12
(referenced as the buggy versions in the text below), when a
statement that generates AUTO_INCREMENT value by the top
statement was executed in the body of a SP, all statements in the
SP after this statement would be treated as if they had generated
AUTO_INCREMENT by the top statement.  When a statement that did
not generate AUTO_INCREMENT value by the top statement but by a
function/trigger called by it, an erroneous Intvar event would be
associated with the statement, this erroneous INSERT_ID value
wouldn't cause problem when replicating between masters and
slaves of 5.0.x or prior 5.1.12, because the erroneous INSERT_ID
value was not used when executing functions/triggers. But when
replicating from buggy versions to 5.1.12 or newer, which will
use the INSERT_ID value in functions/triggers, the erroneous
value will be used, which would cause duplicate entry error and
cause the slave to stop.

The patch for 5.1 fixed it to ignore the SET INSERT_ID value when
executing functions/triggers if it is replicating from a master
of buggy versions, another patch for 5.0 fixed it not to generate
the erroneous Intvar event.


mysql-test/include/show_binlog_events.inc:
  add $binlog_start parameter to show binlog events from a given position
sql/slave.cc:
  Add function to check for bug#33029
sql/slave.h:
  Add function to check for bug#33029
sql/sql_class.cc:
  if master has bug#33029, reset auto_inc_intervals_forced for sub statements
  
  add a new function Discrete_intervals_list::append that takes a Discrete_interval as argument
sql/sql_class.h:
  Add member to save and restore auto_inc_intervals_forced
sql/structs.h:
  add copy constructor and assignment operator for Discrete_intervals_list
  
  add a new function Discrete_intervals_list::append that takes a Discrete_interval as argument
mysql-test/std_data/bug33029-slave-relay-bin.000001:
  relay logs from a buggy 5.0 master for test case of BUG#33029
mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result:
  Test if the slave can process relay logs from a buggy master of BUG#33029
mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt:
  Test if the slave can process relay logs from a buggy master of BUG#33029
mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test:
  Test if the slave can process relay logs from a buggy master of BUG#33029
2008-03-14 11:35:41 +08:00
d5f09a13de BUG#33029 5.0 to 5.1 replication fails on dup key when inserting
using a trig in SP

For all 5.0 and up to 5.1.12 exclusive, when a stored routine or
trigger caused an INSERT into an AUTO_INCREMENT column, the
generated AUTO_INCREMENT value should not be written into the
binary log, which means if a statement does not generate
AUTO_INCREMENT value itself, there will be no Intvar event (SET
INSERT_ID) associated with it even if one of the stored routine
or trigger caused generation of such a value. And meanwhile, when
executing a stored routine or trigger, it would ignore the
INSERT_ID value even if there is a INSERT_ID value available set
by a SET INSERT_ID statement.

Starting from MySQL 5.1.12, the generated AUTO_INCREMENT value is
written into the binary log, and the value will be used if
available when executing the stored routine or trigger.

Prior fix of this bug in MySQL 5.0 and prior MySQL 5.1.12
(referenced as the buggy versions in the text below), when a
statement that generates AUTO_INCREMENT value by the top
statement was executed in the body of a SP, all statements in the
SP after this statement would be treated as if they had generated
AUTO_INCREMENT by the top statement.  When a statement that did
not generate AUTO_INCREMENT value by the top statement but by a
function/trigger called by it, an erroneous Intvar event would be
associated with the statement, this erroneous INSERT_ID value
wouldn't cause problem when replicating between masters and
slaves of 5.0.x or prior 5.1.12, because the erroneous INSERT_ID
value was not used when executing functions/triggers. But when
replicating from buggy versions to 5.1.12 or newer, which will
use the INSERT_ID value in functions/triggers, the erroneous
value will be used, which would cause duplicate entry error and
cause the slave to stop.

The patch for 5.0 fixed it not to generate the erroneous Intvar
event, another patch for 5.1 fixed it to ignore the SET INSERT_ID
value when executing functions/triggers if it is replicating from
a master of buggy versions.


mysql-test/include/show_binlog_events.inc:
  add $binlog_start parameter to set the start position when show binlog events, if not set a default value will be used.
  
  mask out column 2(Pos), 4(Server_id), table_id, and file_id
sql/sql_class.cc:
  Reset insert_id_used after each query in SP
mysql-test/r/rpl_auto_increment_bug33029.result:
  Add test for bug33029, test if the master generate the erroneous event or not
mysql-test/t/rpl_auto_increment_bug33029.test:
  Add test for bug33029, test if the master generate the erroneous event or not
2008-03-14 10:03:01 +08:00
3155a88d6c Fixed test failures caused by insufficient cleanups in the tests for
bug12713.
2008-03-12 16:52:29 +03:00