1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-02 02:53:04 +03:00
Commit Graph

1397 Commits

Author SHA1 Message Date
Alexey Kopytov
92a5dd0323 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:

Text conflict in client/mysqltest.cc
Text conflict in configure.in
Text conflict in mysql-test/include/mtr_warnings.sql
2010-02-23 16:26:45 +03:00
Bjorn Munch
4d5c86fb27 Bug #51135 Please increase the maximum number of connections allowed in mysqltest
Added --max-connections= argument to mysqltest and mtr
Small fix to first patch: forgot to check before free'ing connections array
2010-02-17 16:28:02 +01:00
Bjorn Munch
db1f4e0bf9 Bug #44054 MTR2: --no-reorder does not prevent reordering
Some logic would group by suite always
Disable this if using --noreorder
Also fix getting array from collect_one_suite() in this case
Amended according to previous comment
2010-02-17 12:37:37 +01:00
Bjorn Munch
5aa74ebab9 merge 31602 2010-02-11 14:00:34 +01:00
Bjorn Munch
445596a12c Bug #47389 Innodb tests are skipped when running as unix root user
Add --user=root to collect_mysqld_features() if running as root
Please disregard previous commit; this is much simpler.
2010-02-11 11:22:07 +01:00
Bjorn Munch
aed6da87c8 Bug #31602 mysql-test-run.pl seems to have problems with file names including spaces.
Too complex/risky to try to fix
Instead, detect the problem and communicate that this is not supported
2010-02-03 15:11:52 +01:00
Alexander Nozdrin
85c54dddc7 Manual merge from mysql-5.1-bugteam.
Conflicts:
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/r/rpl_binlog_grant.result
  - mysql-test/suite/rpl/r/rpl_sp.result
  - mysql-test/suite/rpl/t/rpl_binlog_grant.test
  - mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
2010-01-30 22:13:36 +03:00
Bjorn Munch
cf72d8679a merge 49210 2010-01-28 15:19:18 +01:00
Bjorn Munch
f363fece5e Bug #49210 Enable MTR timeout configuration through environment variables
Define env. vars for both timeout settings
Also incorporated 5.0 patch into mtr version 1
2010-01-27 16:32:59 +01:00
Bjorn Munch
6e351da89b Bug #49210 Enable MTR timeout configuration through environment variables
Define env. vars for both timeout settings
  This patch is for 5.0 (mtr v1) and should replaces for 5.1 up
2010-01-27 15:21:41 +01:00
Bjorn Munch
efd5ecb0e0 Bug #50182 mtr: allow $MTR_PORT_BASE or --port-base= as alternative to MTR_BUILD_THREAD
As suggested, convert internally to value of build_thread
2010-01-25 11:20:52 +01:00
Bernd Ocklin
bcc97357f1 fix LD_LIBRARY_PATH (bug#50540) 2010-01-22 14:12:17 +01:00
Bjorn Munch
be128c547f backport some changes from WL 4378 2010-01-07 13:17:54 +01:00
Bjorn Munch
fcb43b2956 merge 49345 2010-01-06 09:54:43 +01:00
Bjorn Munch
dc3a76b2da merge 49672 2010-01-06 09:52:55 +01:00
Bjorn Munch
1ae30d113d Bug #49345 re-introduce gprof to mysql-test-run.pl
Was available in v1
Porting to v2 required some rewriting
Updated after review comments
2010-01-05 21:35:50 +01:00
Bjorn Munch
eec8deed8b Bug #49166 mtr --combination is broken after restrictions of combination names
Combinations beginning with -- not allowed
Allow them...
2010-01-05 13:31:38 +01:00
Alexander Nozdrin
0b1a15e9a7 Backporing patch for Bug#48351 (Inconsistent library names for semisync plugin)
from mysql-next-mr-bugfixing to mysql-trunk-bugfixing.

Original revision:
------------------------------------------------------------
revision-id: zhenxing.he@sun.com-20091127084945-wng7gakygduv3q8k
committer: He Zhenxing <zhenxing.he@sun.com>
branch nick: 5.1-rep-semisync
timestamp: Fri 2009-11-27 16:49:45 +0800
message:
  Bug#48351 Inconsistent library names for semisync plugin
  
  The semisync plugin library names on Unix like systems were prefixed with
  'lib', which did not follow the conventions.
  
  Fix the problem by removing the 'lib' prefix on Unix systems.
------------------------------------------------------------
2009-12-15 23:40:20 +03:00
Alexander Nozdrin
7688c7369c Backporting a patch for Bug#49170 (Inconsistent placement of semisync
plugin prevents it from getting tested) from mysql-next-mr-bugfixing
to mysql-trunk-bugfixing.

Original revision:
------------------------------------------------------------
revision-id: zhenxing.he@sun.com-20091204014339-2m06r42vajhm9vke
committer: He Zhenxing <zhenxing.he@sun.com>
branch nick: 5.1-rep-semisync
timestamp: Fri 2009-12-04 09:43:39 +0800
message:
  Bug#49170 Inconsistent placement of semisync plugin prevents it from getting tested
  
  Add $basedir/lib/plugin to the search paths for semisync plugins.
------------------------------------------------------------
2009-12-15 23:23:01 +03:00
Bjorn Munch
b82642966b Bug #49672 mtr should extract end of result log if mysqltest fails without output
Extracts last 20 lines if no output after failure
2009-12-15 10:12:24 +01:00
He Zhenxing
75b9db91de Bug#48351 Inconsistent library names for semisync plugin
The semisync plugin library names on Unix like systems were prefixed with
'lib', which did not follow the conventions.

Fix the problem by removing the 'lib' prefix on Unix systems.
2009-11-27 16:49:45 +08:00
Bjorn Munch
15d5390010 Bug #48918 MTR uses an un-initialized value in comparison
mysqld->{proc} not defined for an embedded server
Check only if {proc} defined
2009-11-26 11:34:16 +01:00
Bjorn Munch
4deb53a56d Bug #49096 mtr: --mem option should be ignored on Windows
Ignored w/message in v1 and v2
2009-11-26 11:23:30 +01:00
Bjorn Munch
8e04f4c73c Bug #47978 timer : expired after 90 seconds
Problems occur after killing threads on Windows
Get rid of the timeout threads, implement simple timer in wait_any_timeout()
2009-11-24 09:12:48 +01:00
Bjorn Munch
db1b1160dd merge 48808 2009-11-19 10:19:18 +01:00
Bjorn Munch
964a6ebaac merge 48806 2009-11-19 10:17:56 +01:00
Bjorn Munch
1cc0f036d6 merge 35543 2009-11-19 10:14:25 +01:00
Bjorn Munch
91bb19f44e Bug #35543 mysqlbinlog.cc does not properly work with tmp files
mtr patch ported to v2
2009-11-19 10:10:21 +01:00
Bjorn Munch
9d69adc9d6 Bug #48367 MTR should react to server dying, rather than to resulting failure of mysqltest
For some reason it usually picks up mysqltest
Wait .1s and then see if a server has died
Change from first commit: label on separate line
2009-11-19 09:58:50 +01:00
Bjorn Munch
54bdfab91e Bug #48808 mysql-test-run.pl --debugger=devenv does not work
Wrong argument order, fixed
2009-11-18 10:27:43 +01:00
Bjorn Munch
2b0be38266 Bug #48806 mysql-test-run.pl --help should work even in the absence of binaries
Searches for my_safe_process binary too early
Put this into a sub() and call it after examining options (incl. --help)
2009-11-17 12:13:22 +01:00
Bjorn Munch
6edaebbf57 Bug #48795 Valgrind summary from tests where server has been restarted cause test failure
Seen in a few tests after 43418
Add code in extract_warning_lines() to skip this part
2009-11-16 11:18:16 +01:00
Bjorn Munch
59940cdcd2 Bug #43418 MTR2: does not notice a memory leak occuring at shutdown of mysqld w/ --valgrind
Checking is done before server is terminated
Adds post processing of server logs if --valgrind
Also had to remove --quiet option to valgrind
2009-11-12 11:04:01 +01:00
Bjorn Munch
ea91cac7eb merge 48209 2009-11-04 14:44:19 +01:00
Bjorn Munch
6c28505e6e Bug #48240 "Test suite timeout" and "Too many tests failed" is masked from status page
Prepend "Completed", "Timeout" or "Too many failed" to summary line
2009-10-26 14:28:51 +01:00
Luis Soares
78172f9e21 automerge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge. 2009-10-25 22:58:52 +00:00
Bjorn Munch
fe76fb69a0 Bug #48209 Confusing message "Test has succeeded" after test fails due to warnings
There's no need for --verbose for the mysqltest in check-warnings, remove it
2009-10-23 13:04:55 +02:00
He Zhenxing
b6529a140b Add semi-sync support for Windows 2009-10-23 12:56:30 +08:00
Luis Soares
58e2fde011 manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
Conflicts
=========

Text conflict in .bzr-mysql/default.conf
Text conflict in libmysqld/CMakeLists.txt
Text conflict in libmysqld/Makefile.am
Text conflict in mysql-test/collections/default.experimental
Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test
Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/CMakeLists.txt
Text conflict in sql/Makefile.am
Text conflict in sql/log_event_old.cc
Text conflict in sql/rpl_rli.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_binlog.cc
Text conflict in sql/sql_lex.h
21 conflicts encountered.

NOTE
====
 mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr:
 - "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr"

 This is the first cset (merge/...) committed after pulling 
 from mysql-next-mr.
2009-10-22 23:30:28 +01:00
Bjorn Munch
23e557d48a new merge from next-mr 2009-10-22 09:36:39 +02:00
Alexander Barkov
344ddc85fa Merging mysql-next-mr-merge to mysql-next-mr. 2009-10-21 15:48:22 +05:00
Bjorn Munch
b738a5e57e merge from next-mr 2009-10-21 12:18:33 +02:00
Bjorn Munch
d25a26268c merge 48149 2009-10-20 12:06:33 +02:00
Bjorn Munch
684b1d39ac merge 48149 2009-10-20 12:05:28 +02:00
Bjorn Munch
23ef842e03 Bug #48149 MTR should automatically skip SSL tests if SSL not supported
Knowledge of no SSL support is not used
Skip tests the same way e.g. innodb tests are
Does not refer to have_ssl_communication.inc, 
     will add this when merging to 6.0-codebase
2009-10-19 15:51:47 +02:00
Bjorn Munch
a47a167492 merge 48130 and 48133 2009-10-19 15:33:34 +02:00
Bjorn Munch
542ffe5e87 merge 48130 and 48133 from 5.1 2009-10-19 15:14:26 +02:00
Bjorn Munch
6c68019899 Bug #48133 MTR should not dump entire history of mysqld log when failing to start server
Don't print entire log, but use extract_server_log() introduced by 46007
2009-10-18 13:01:46 +02:00
Bjorn Munch
423dacf3c6 merge from next-mr 2009-10-18 10:08:07 +02:00
Bjorn Munch
264c330fd0 Bug #48130 Expected failures should not count towards max-test-fail
Test batches may be terminated too early
Avoid counting exp-fail tests
2009-10-17 18:34:56 +02:00