mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
54772 commits 2781 branches 343 tags 1.6 GiB
Commit graph

54772 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sven Sandberg
73e253370b merged 5.1 main to 5.1-rpl 
manually resolved conflicts:
Text conflict in client/mysqltest.c
Contents conflict in mysql-test/include/have_bug25714.inc
Text conflict in mysql-test/include/have_ndbapi_examples.inc
Text conflict in mysql-test/mysql-test-run.pl
Text conflict in mysql-test/suite/parts/inc/partition_check_drop.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout_check1.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout_check2.inc
Text conflict in mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter1_1_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter1_2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter3_innodb.result
Text conflict in mysql-test/suite/parts/r/partition_alter3_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_basic_innodb.result
Text conflict in mysql-test/suite/parts/r/partition_basic_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_engine_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_syntax_myisam.result
Text conflict in mysql-test/suite/rpl_ndb/t/disabled.def
Text conflict in mysql-test/t/disabled.def
 2008-08-04 07:04:47 +02:00
He Zhenxing
b1252a7ccf Rmove RESET MASTER from have_log_bin.inc because it can cause some 
test to stall for slave_net_timeout and cause some test case fail
 2008-07-28 15:15:20 +08:00
Serge Kozlov
f763a96d2b Bug#37732 2008-07-25 21:23:50 +04:00
Georgi Kodinov
b467c15e36 Disabled 5.1 tests (and reported bugs) 2008-07-25 13:32:05 +03:00
Magnus Svensson
4b9e18b82a merge 2008-07-24 23:30:37 +02:00
Magnus Svensson
c1430dc8b0 BUG#37832 Parallel-running mtr --help prints usage many times 2008-07-24 22:58:18 +02:00
Magnus Svensson
05386f9033 Remove debug printout 2008-07-24 22:22:47 +02:00
Magnus Svensson
ac1aa0cd70 Add all server arguments to mysqltest_embedded when running check_warnings 2008-07-24 22:21:19 +02:00
Magnus Svensson
ee3b5acc62 Check that the default-storage-engine used by test is a supported engine 2008-07-24 22:20:35 +02:00
Chad MILLER
27699fac9c Make community features (including profiling) on by default. 2008-07-24 13:43:14 -04:00
Sven Sandberg
5c11b98b6e Add doxygen files to .bzrignore 2008-07-24 16:44:41 +02:00
Sven Sandberg
b6545b30fa BUG#37717: rpl.rpl_stm_until 'stmt' fails sporadically on pushbuild 
Problem: After START SLAVE, the Slave_IO_Status column of
SHOW SLAVE STATUS goes from No to Yes asynchronously. That
caused sporadic failures on pushbuild in rpl_stm_until since
the test contains SHOW SLAVE STATUS right after START SLAVE.
Fix: Wait until Slave_IO_Status becomes Yes after each
START SLAVE.
 2008-07-23 13:23:52 +02:00
Sven Sandberg
818802a6ea BUG#37834: mtr --max-test-fail=0 does not set max number of failed tests to unlimited 
Problem: mtr --max-test-fail=0 should allow unlimited number
of errors, but stops after the second error.
Fix: It's just a typo in mysql-test-run.pl
 2008-07-22 20:55:20 +02:00
Davi Arnaut
cf586451df Merge 5.1-bugteam into main. 2008-07-22 15:24:31 -03:00
Davi Arnaut
58daa8d50a Silence warning due to unused function. 2008-07-22 14:53:36 -03:00
Davi Arnaut
aa21daf60a Merge from mysql-5.1.27 release tree. 2008-07-22 14:41:26 -03:00
Sergei Golubchik
821683a19c merge 2008-07-22 16:42:03 +02:00
Kristofer Pettersson
597fe73cb8 auto merge 2008-07-22 13:33:37 +02:00
Kristofer Pettersson
906f061c76 Disabled two test cases in 5.1 because of random failures. 2008-07-22 13:04:32 +02:00
Kristofer Pettersson
9d83bfb469 merge 5.1->5.1-bugteam 2008-07-22 12:56:36 +02:00
Kristofer Pettersson
25dd8b33d7 merge 5.0->5.0-bugteam 2008-07-22 12:55:15 +02:00
Kristofer Pettersson
de4d31f2ac 2008-07-22 12:41:55 +02:00
Tatiana A. Nurnberg
0fc2eeb67d auto-merge 2008-07-22 08:54:07 +02:00
Sven Sandberg
5ca789693b 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.
 2008-07-21 21:05:06 +02:00
Kristofer Pettersson
f5668bc865 Corrected merge misstake. 2008-07-21 16:41:17 +02:00
Kristofer Pettersson
3f332ceae5 Auto merge 2008-07-21 14:00:13 +02:00
Kristofer Pettersson
df89855e70 Auto merge 2008-07-21 12:24:31 +02:00
Kristofer Pettersson
71930db28f 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.
 2008-07-24 14:28:21 +02:00
Sergei Golubchik
50e23ee8ee 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
c990f5d378 auto-merge + post-merge fixies 2008-07-21 11:20:03 +02:00
Kristofer Pettersson
d8eb66127b Manual merge 2008-07-21 11:18:35 +02:00
Kristofer Pettersson
e443cafb09 Null merge 2008-07-24 15:41:55 +02:00
Timothy Smith
91d19a1bea Up-merge latest changes from 5.0-build 2008-07-20 22:01:25 -06:00
Timothy Smith
528b3105f5 Merge latest changes from 5.0-build 2008-07-20 21:59:47 -06:00
Timothy Smith
6e8eaa8e21 Up-merge of merges, some criss-cross resolved with --weave. 2008-07-19 02:31:33 -06:00
Timothy Smith
e6f3e65a3a Merge in changes from 5.0.66a (via mysql-5.0) 2008-07-18 21:48:18 -06:00
Timothy Smith
f44c3210ce Merge 5.0.66a-release changes 2008-07-18 21:46:03 -06:00
kent@mysql.com
18e0e280e4 Merge from mysql-5.0.66-release 2008-07-19 02:52:13 +02:00
Andrei Elkin
209e3395d2 merge 2008-07-18 17:02:42 +03:00
Georgi Kodinov
38dcc057c2 merge of 38158 to 5.1-bugteam 2008-07-18 15:00:45 +03:00
Andrei Elkin
a5d1e6101e 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.
 2008-07-18 14:53:16 +03:00
Georgi Kodinov
5c256ec67a Bug 38158: mysql client regression, can't read dump files 
- Revert the fix for bug 33812
- fixed a win32 warning
 2008-07-18 13:24:59 +03:00
Alexander Barkov
e390f843d5 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
58cb8cbeb4 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.
 2008-07-18 11:20:55 +03:00
Sergey Petrunia
19e2ed7642 Automerge 2008-07-17 22:28:42 +04:00
Sergey Petrunia
6cac08bcfb Merge BUG#35478 into mysql-5.1-bugteam 2008-07-17 22:26:55 +04:00
Davi Arnaut
57ba2374f8 Bug#33812: mysql client incorrectly parsing DELIMITER 
Revert fix for this bug as it introduced a regression
reported in Bug#38158.
 2008-07-17 15:20:01 -03:00
Timothy Smith
6eacf838ff 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
791c7ff788 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
Sergey Petrunia
e8a5662ea9 Automerged 2008-07-17 20:22:39 +04:00