Commit graph

54635 commits

Author SHA1 Message Date
Davi Arnaut
afeab2052f Merge 5.1-bugteam into main. 2008-07-22 15:24:31 -03:00
Davi Arnaut
a555716d44 Silence warning due to unused function.
sql/field.cc:
  Function is only used if replication is compiled in.
2008-07-22 14:53:36 -03:00
Davi Arnaut
2f22ef15e3 Merge from mysql-5.1.27 release tree. 2008-07-22 14:41:26 -03:00
Horst Hunger
2017e5f944 Fix for bug#37708:
Deleted the removed tests.
2008-07-22 19:00:27 +02:00
Horst Hunger
56729a758c 2008-07-22 18:56:50 +02:00
Horst Hunger
ec7b92d7a0 Fix for bug#37708:The result files of the removed 64 bit tests. 2008-07-22 18:50:36 +02:00
Horst Hunger
5d938a8dbe Fix for bug#37708: Result files of removed 32 bit tests. 2008-07-22 18:48:47 +02:00
Horst Hunger
235f9bb6c2 Fix for bug#37708:The allocation of very large buffer must not be done in the pushbuild.
hhunger.
2008-07-22 18:45:55 +02:00
Horst Hunger
7200c5bad0 merge from parent. 2008-07-22 18:39:56 +02:00
Sergei Golubchik
233e216209 merge 2008-07-22 16:42:03 +02:00
Horst Hunger
2d83978f13 Fix for bug#37708:The allocation of very large buffer must not be done in the pushbuild. 2008-07-22 15:58:21 +02:00
Kristofer Pettersson
daa884375c auto merge 2008-07-22 13:33:37 +02:00
Kristofer Pettersson
3a3894d2ca Disabled two test cases in 5.1 because of random failures. 2008-07-22 13:04:32 +02:00
Kristofer Pettersson
14afcb436f merge 5.1->5.1-bugteam 2008-07-22 12:56:36 +02:00
Kristofer Pettersson
f5bbcba96f merge 5.0->5.0-bugteam 2008-07-22 12:55:15 +02:00
Kristofer Pettersson
3d3b04e06d sql/log.cc:
Auto merge
2008-07-22 12:41:55 +02:00
Tatiana A. Nurnberg
d78158f471 auto-merge 2008-07-22 08:54:07 +02:00
Sven Sandberg
6334196bd7 BUG#38269: pushbuild gives valgrind error in ha_statistic_increment for rpl_temporary
This does not fix the bug. It only disables the failing test.


mysql-test/suite/rpl/t/disabled.def:
  disable rpl_temporary
2008-07-21 21:05:06 +02:00
Kristofer Pettersson
8544ee54e2 Corrected merge misstake. 2008-07-21 16:41:17 +02:00
Kristofer Pettersson
60a21d5159 Auto merge 2008-07-21 14:00:13 +02:00
Kristofer Pettersson
6da6bbc75e Auto merge 2008-07-21 12:24:31 +02:00
Kristofer Pettersson
b7d4c76a54 Bug#37027 expire_logs_days and missing binlogs cause a crash !
If the server failed to expired log files during start up it could crash.

sql/log.cc:
  Added predicate to protect againt cases when current_thd might be NULL.
2008-07-24 14:28:21 +02:00
Sergei Golubchik
6077ebea1c Bug#34409 LOCK_plugin contention via ha_release_temporary_latches/plugin_foreach
use thread-local data structures in ha_release_temporary_latches()
2008-07-21 12:01:22 +02:00
Tatiana A. Nurnberg
bb827398ab auto-merge + post-merge fixies 2008-07-21 11:20:03 +02:00
Kristofer Pettersson
ace7798e7d Manual merge 2008-07-21 11:18:35 +02:00
Kristofer Pettersson
c137f3d450 Null merge 2008-07-24 15:41:55 +02:00
Timothy Smith
9115320342 Up-merge latest changes from 5.0-build 2008-07-20 22:01:25 -06:00
Timothy Smith
6825ffd153 Merge latest changes from 5.0-build 2008-07-20 21:59:47 -06:00
Timothy Smith
9e6621b861 Up-merge of merges, some criss-cross resolved with --weave. 2008-07-19 02:31:33 -06:00
Timothy Smith
92ba017b2c Merge in changes from 5.0.66a (via mysql-5.0) 2008-07-18 21:48:18 -06:00
Timothy Smith
100d417ec2 Merge 5.0.66a-release changes 2008-07-18 21:46:03 -06:00
unknown
7da2f133e0 Merge from mysql-5.0.66-release 2008-07-19 02:52:13 +02:00
Andrei Elkin
5ec6659e1e merge 2008-07-18 17:02:42 +03:00
Sven Sandberg
b51c2eb3aa BUG#38077: rpl_incident At line 22: query 'SELECT * ...' Table 'test.t1' doesn't exist
This is not a fix to the bug. It only adds debug info, so
that we can analyze the bug better next time it happens.
Please revert the patch after the bug is fixed.


mysql-test/suite/rpl/t/rpl_incident.test:
  Added debug info. This will only be printed if the
  test fails.
2008-07-18 15:07:14 +02:00
Georgi Kodinov
5f5a3cf1aa merge of 38158 to 5.1-bugteam 2008-07-18 15:00:45 +03:00
Andrei Elkin
7d1bc0a4f9 Bug #36818 rpl_server_id1 fails expecting slave has stopped
the reason for the failure is that io thread passes through a sequence of state
changes before it eventually got stuck at the expect running state as NO.
It's unreasonble to wait for the running status while the whole idea of the test is
to get to the IO thread error.

Fixed with changing the waiting condition.

mysql-test/suite/rpl/r/rpl_server_id1.result:
  results changed
mysql-test/suite/rpl/t/disabled.def:
  re-enabling rpl_server_id1
mysql-test/suite/rpl/t/rpl_server_id1.test:
  deploying the exact waiting condition i.e to wait for the slave io error.
2008-07-18 14:53:16 +03:00
Sven Sandberg
620c4878b3 BUG#38178: rpl_loaddata_map fails sporadically in pushbuild
Problem: master binlog has 'create table t1'. Master binlog
was removed before slave could replicate it. In test's cleanup
code, master did 'drop table t1', which caused slave sql
thread to stop with an error since slave sql thread did not
know about t1.
Fix: t1 is just an auxiliary construction, only needed on
master. Hence, we turn off binlogging before t1 is created,
drop t1 as soon as we don't need it anymore, and then turn
on binlogging again.


mysql-test/include/show_binlog_events.inc:
  Filter out directories and block_len from
  LOAD DATA INFILE events.
mysql-test/suite/rpl/r/rpl_loaddata_map.result:
  updated result file
mysql-test/suite/rpl/t/rpl_loaddata_map.test:
  Turn off binlogging while t1 is used, drop t1 as soon
  as we don't need it anymore, and turn on binlogging again.
  Also added some comments and replaced 'show binlog events'
  by 'source include/show_binlog_events.inc'.
2008-07-18 13:34:19 +02:00
Georgi Kodinov
88d66418c8 Bug 38158: mysql client regression, can't read dump files
- Revert the fix for bug 33812
- fixed a win32 warning

client/mysql.cc:
  revert the fix for bug 33812
mysql-test/r/mysql.result:
  revert the fix for bug 33812
mysql-test/t/mysql_delimiter.sql:
  revert the fix for bug 33812
mysys/default.c:
  fixed a win32 warning
2008-07-18 13:24:59 +03:00
Alexander Barkov
6a42c35fa7 Bug#27934 test client_xml misssing initialization
Problem: missing initialization, if the previous test
fails leaving table t1, client_xml fails as well.
Fix: adding initialization.
2008-07-18 14:07:16 +05:00
Andrei Elkin
f8e8332100 Bug #34647 rpl_temporary discovers more than one dump thread and fails to select
Many dump threads can exist due to a way the new version of mtr governs suites.

For this immediate problem the test is refined not to use I_S but rather to reconnect
explicitly with preserving logics of a an old target bug fixes verification.

mysql-test/suite/rpl/r/rpl_temporary.result:
  results changed
mysql-test/suite/rpl/t/rpl_temporary.test:
  refining the bug#17284 test to avoid counting dump threads in favor to reconnect
  explicitly with preserving the orig logics.
2008-07-18 11:20:55 +03:00
Sergey Petrunia
516312dda6 Automerge 2008-07-17 22:28:42 +04:00
Sergey Petrunia
bf1447115c Merge BUG#35478 into mysql-5.1-bugteam 2008-07-17 22:26:55 +04:00
Davi Arnaut
c313a5afc5 Bug#33812: mysql client incorrectly parsing DELIMITER
Revert fix for this bug as it introduced a regression
reported in Bug#38158.


client/mysql.cc:
  Revert changes introduced by fix for Bug#33812
mysql-test/r/mysql.result:
  Revert changes introduced by fix for Bug#33812
mysql-test/t/mysql_delimiter.sql:
  Revert changes introduced by fix for Bug#33812
2008-07-17 15:20:01 -03:00
Timothy Smith
44b549fd51 Up-merge 5.0.66a-release changes (via 5.0) into 5.1.
Includes fix for Bug #38180, "options are read from ~/my.cnf instead of ~/.my.cnf"
2008-07-17 11:45:08 -06:00
Timothy Smith
006a3a0059 Merge in changes from mysql-5.0.66a-release into 5.0.
Includes fix for Bug #38180, "options are read from ~/my.cnf instead of ~/.my.cnf"
2008-07-17 11:08:49 -06:00
Sven Sandberg
ca505ca2bd BUG#38170: rpl_variables failed on pushbuild: could not sync with master
Problem: the test set @@global.init_slave to garbage at a time
which was not guaranteed to be after the time when the slave's
SQL thread used it. That would cause the slave's SQL thread to
stop in rare cases.
Fix: The test does not care about the value of
@@global.init_slave, except that it should be different on
master and slave. Hence, we set @@global.init_slave to
something that is valid SQL.


mysql-test/suite/rpl/r/rpl_variables.result:
  updated result file.
mysql-test/suite/rpl/t/rpl_variables.test:
  Set @@global.init_slave to something that is valid SQL.
2008-07-17 18:26:59 +02:00
Sergey Petrunia
4540ffa835 Automerged 2008-07-17 20:22:39 +04:00
Georgi Kodinov
804277fdbe merge of bug #37830 to 5.1 2008-07-17 18:51:24 +03:00
Georgi Kodinov
430aaacdaf Folow-up on Bug#37069: fix a valgrind warning
Don't initalize federated if it's disabled by a command line option.

sql/ha_federated.cc:
  Folow-up on Bug#37069: Don't initalize federated if it's disabled 
  by a command line option.
2008-07-17 17:33:41 +03:00
Georgi Kodinov
99cc894f91 auto merged 5.0-bugteam to /Users/kgeorge/B37830-5.0-bugteam 2008-07-17 15:14:35 +03:00