mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
59584 commits 2778 branches 343 tags 1.6 GiB
Commit graph

1385 commits

Author SHA1 Message Date
Bjorn Munch
d00c7a2d5f merge from trunk 2009-12-16 10:43:02 +01:00
Bjorn Munch
8e19b78124 merge 48250, 48918, 49096 2009-11-26 11:36:37 +01:00
Bjorn Munch
50ab925e04 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
22d80703ef 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
b84649d8b3 merge 47978,48683 2009-11-24 12:26:06 +01:00
Bjorn Munch
e1fbb32e76 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
fc772d0d48 upmerge 35543,48367,48671,48806,48808 2009-11-19 10:24:24 +01:00
Bjorn Munch
a9fd7242b5 merge 48808 2009-11-19 10:19:18 +01:00
Bjorn Munch
f84625778c merge 48806 2009-11-19 10:17:56 +01:00
Bjorn Munch
d97cc562fc merge 35543 2009-11-19 10:14:25 +01:00
Bjorn Munch
ea4618e1d1 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
9ea158edf0 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
eb2ad909d4 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
242f3f8cdd 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
b3d0174821 merge 48795 2009-11-16 15:30:25 +01:00
Bjorn Munch
858d260bd3 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
d1daf0740c merge 43418 2009-11-12 11:14:56 +01:00
Bjorn Munch
f1b4be2a21 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
e769bfac68 merge 47663 and 48209 2009-11-04 14:57:16 +01:00
Bjorn Munch
7bfd110102 merge 48209 2009-11-04 14:44:19 +01:00
Bjorn Munch
efd58d0a1f upmerge 48240 2009-10-26 15:29:38 +01:00
Bjorn Munch
c22826bfad 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
7d970f8285 automerge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge. 2009-10-25 22:58:52 +00:00
Bjorn Munch
d2d03e923e 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
e9acb9f021 Add semi-sync support for Windows 
CMakeLists.txt:
  Add plugin/semisync subdirectory
mysql-test/mysql-test-run.pl:
  Check for semisync dll for Windows
mysql-test/suite/rpl/r/rpl_semi_sync.result:
  Update result file
mysql-test/suite/rpl/t/rpl_semi_sync.test:
  Test semi-sync on Windows
plugin/semisync/semisync_master.cc:
  Define gettimeofday for Windows
 2009-10-23 12:56:30 +08:00
Luis Soares
f1bb8c3c55 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
e26a2f3b61 new merge from next-mr 2009-10-22 09:36:39 +02:00
Bjorn Munch
3a2434d432 new merge from trunk 2009-10-22 09:13:44 +02:00
Alexander Barkov
dcb8bb23c2 Merging mysql-next-mr-merge to mysql-next-mr. 2009-10-21 15:48:22 +05:00
Bjorn Munch
0632e9a407 merge from next-mr 2009-10-21 12:18:33 +02:00
Bjorn Munch
78b2ca30c6 merge 48149 2009-10-20 12:06:33 +02:00
Bjorn Munch
0777ef567d merge 48149 2009-10-20 12:05:28 +02:00
Bjorn Munch
4113d6ca88 merge 48149 2009-10-20 12:04:55 +02:00
Bjorn Munch
e6bc01d170 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
2f36bc160a merge 48130 and 48133 2009-10-19 15:33:34 +02:00
Bjorn Munch
6203b7b367 merge 48130 and 48133 from 5.1 2009-10-19 15:14:26 +02:00
Bjorn Munch
599b745bc1 merge 48130 and 48133 from 5.1 2009-10-19 15:12:16 +02:00
Bjorn Munch
c6533f9eb3 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
cf7afa1164 merge from next-mr 2009-10-18 10:08:07 +02:00
Bjorn Munch
dcf6aae407 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
Bjorn Munch
72c96cbd0e merge from 5.1 main 2009-10-16 23:25:05 +02:00
Bjorn Munch
06ac55980c merge 46007 from 5.1 2009-10-16 11:02:37 +02:00
Sergey Glukhov
d8c3f2263f WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00
Alexander Nozdrin
c30d924dd5 Manual merge from mysql-trunk-merge. 2009-10-14 12:25:39 +04:00
Bjorn Munch
972e938dac Bug #46007 Tests fail due to a crash while running 'check testcase before test' 
Difficult to debug due to lacking report
This does not solve the real issue, but extracts server log when it happens
Forst commit was incomplete, didn't cover all cases
 2009-10-14 09:31:34 +02:00
Alexander Nozdrin
c69629d269 Merge from mysql-5.1. 2009-10-13 13:42:38 +04:00
Bjorn Munch
bdc4070aab avoid regexp warning after 46625 2009-10-09 15:18:43 +02:00
Bjorn Munch
052d9bef83 avoid regexp warning after 46625 2009-10-09 15:16:36 +02:00
Bjorn Munch
891bad34ba Remove obsolete comments after fixing 42408 2009-10-08 14:32:45 +02:00
Bjorn Munch
79060e12ee Remove obsolete comments after fixing 42408 2009-10-08 14:31:39 +02:00