Commit graph

47 commits

Author SHA1 Message Date
Frazer Clement
5f8cfacf6c Merge 5.0-bugteam-> 5.1-bugteam 2009-10-08 16:36:36 +01:00
Frazer Clement
bbda071ed5 Merge 5.0-bugteam->5.1 bugteam 2009-10-05 13:57:59 +01:00
Georgi Kodinov
bafc15748b automerge 2009-09-23 11:31:18 +03:00
Georgi Kodinov
5d68d4a534 automerge 2009-09-18 16:35:40 +03:00
Alexander Nozdrin
96c8843514 A patch for Bug#45118 (mysqld.exe crashed in debug mode
on Windows in dbug.c) -- part 2: a patch for the DBUG subsystem
to detect misuse of DBUG_ENTER / DBUG_RETURN macros.
5.1 version.
2009-09-10 11:40:57 +04:00
Bjorn Munch
39fca129fb second merge from main, with adaptions 2009-09-02 23:29:11 +02:00
Bjorn Munch
588e9930b4 first merge from main 2009-09-02 18:58:17 +02:00
Bjorn Munch
d65168fdda Bug #32296 mysqltest fails to parse "append_file" inside a "while", it works inside
a "if"
Bug #41913 mysqltest cannot source files from if inside while
Some commands require additional processing which only works first time
Keep content for write_file or append_file with the st_command struct
Add tests for those cases to mysqltest.test
2009-09-02 11:17:33 +02:00
Bjorn Munch
5703baad97 merge 2009-09-01 19:31:28 +02:00
Staale Smedseng
f59ef9eafa Merge from 5.0 for 43414 2009-08-28 18:21:54 +02:00
Bjorn Munch
3efecb1626 Bug #39003 mtr's diff_files command failed in pushbuild without printing a result diff
diff was actually called but result never outputted before exiting
Added extra code to dump output *unless* failure was expected
2009-08-19 13:48:56 +02:00
Bjorn Munch
0211f76d14 Bug #46164 memory leak in mysqltest after parse error with --debug
Moved some dynstr_free() further up
2009-08-18 15:26:17 +02:00
Bjorn Munch
c32c55eef7 Bug #44012 mtr: test cases that are not supposed to return output always fail
Output would match an empty result file but we don't check
Allow empty output IFF there is an empty result file.
2009-08-11 23:41:44 +02:00
Davi Arnaut
02a5dd38f3 Merge from 5.1 main. 2009-06-08 09:55:37 -03:00
Tatiana A. Nurnberg
69e78274ae manual merge 2009-06-06 18:41:40 +02:00
Bjorn Munch
524bd596e2 merge from 5.1 main 2009-05-29 13:04:02 +02:00
Bjorn Munch
f26f8edff4 cherry picking fix for Bug #39542 from 6.0-runtime 2009-05-27 22:54:40 +02:00
Bjorn Munch
f7f400bc5e Bug #44964 mysqltest: connection <connection><some spaces>; fails now
Incorrection assumption about delimiter character in connection command
2009-05-26 12:45:14 +02:00
Bjorn Munch
a3c7d96742 Bug #44922 mysqltest's query_get_value function can't work with queries containing ','
check_command_args() always looks for the first , (or whatever)
Extended check_command_args() to let arguments be quoted
Added test in mysqltest.test
2009-05-25 17:19:20 +02:00
Jim Winstead
6280e26c48 Various command-line utilities, including mysqlbinlog and mysqldump, don't
handle the --skip-password option correctly. (Bug #28479)
2009-05-07 10:51:55 -07:00
Jim Winstead
55e33e6292 Make SSL options appear in correct place in mysql_upgrade and mysqltest
usage information. (Bug #31883)
2009-04-28 11:26:31 -07:00
Georgi Kodinov
706a0a39ed merged 5.0-bugteam -> 5.1-bugteam 2009-03-24 15:58:52 +02:00
Georgi Kodinov
f7cfb8ea0e merged 5.1-main -> 5.1-bugteam 2009-03-23 11:36:39 +02:00
Magnus Svensson
9ed35a59f9 Merge 2009-03-19 12:42:55 +01:00
Bjorn Munch
1b922ca6e8 merge from main 2009-03-18 13:44:05 +01:00
Ignacio Galarza
428e28e00c auto-merge 2009-03-17 16:29:24 -04:00
Magnus Svensson
788c1e7e7b Bug#43361 msyql_client_test output lost
- Print the output(if any) from the command that failed, in many 
   cases this will make it possible to immediately see what went wrong.
2009-03-13 16:06:50 +01:00
Bjorn Munch
44db33e0eb Bug #43532 mtr should not rely on diff to report test results
mtr on Windows does not give decent diff due to missing diff install
Modified to look for 'mtrdiff' if diff not available.
2009-03-11 14:52:50 +01:00
Ignacio Galarza
2d9421c3bb Bug#29125 Windows Server X64: so many compiler warnings
- Remove bothersome warning messages.  This change focuses on the warnings 
that are covered by the ignore file: support-files/compiler_warnings.supp.
- Strings are guaranteed to be max uint in length
2009-02-13 11:41:47 -05:00
Rafal Somla
060c89940f Modifications to MTR and mysqltest to improve feedback from the latter when
testcase checks are made.
      
MTR spawns mysqltest to run check-testcase test before and after each testcase 
it runs. It can also run check-warnings using mysqltest. Since it happened on PB 
that these checks hanged, this patch provides additional feedback to help 
investigating such failures:
      
- mysqltest is modified to give feedback about main steps in execution of a 
testcase if run in verbose mode (including connection to the server),
     
- MTR is modified to run mysqltest in verbose mode when doing check-testcase or 
check-warnings. The diagnostic output from mysqltest is preserved so that it is 
saved upon test failure.
2009-02-13 16:27:33 +01:00
Georgi Kodinov
bae06d9d45 merged 5.0-bugteam -> 5.1-bugteam 2009-01-30 15:57:02 +02:00
Luis Soares
14d4576bfe merge: 5.1 -> 5.1-rpl
conflicts:
  Text conflict in client/mysqltest.cc
  Text conflict in mysql-test/include/wait_until_connected_again.inc
  Text conflict in mysql-test/lib/mtr_report.pm
  Text conflict in mysql-test/mysql-test-run.pl
  Text conflict in mysql-test/r/events_bugs.result
  Text conflict in mysql-test/r/log_state.result
  Text conflict in mysql-test/r/myisam_data_pointer_size_func.result
  Text conflict in mysql-test/r/mysqlcheck.result
  Text conflict in mysql-test/r/query_cache.result
  Text conflict in mysql-test/r/status.result
  Text conflict in mysql-test/suite/binlog/r/binlog_index.result
  Text conflict in mysql-test/suite/binlog/r/binlog_innodb.result
  Text conflict in mysql-test/suite/rpl/r/rpl_packet.result
  Text conflict in mysql-test/suite/rpl/t/rpl_packet.test
  Text conflict in mysql-test/t/disabled.def
  Text conflict in mysql-test/t/events_bugs.test
  Text conflict in mysql-test/t/log_state.test
  Text conflict in mysql-test/t/myisam_data_pointer_size_func.test
  Text conflict in mysql-test/t/mysqlcheck.test
  Text conflict in mysql-test/t/query_cache.test
  Text conflict in mysql-test/t/rpl_init_slave_func.test
  Text conflict in mysql-test/t/status.test
2009-01-23 13:22:05 +01:00
Magnus Svensson
37e91accb0 Bug#35701 please allow test language variables in connection and
sync_slave_with_master
 - Additional patch for "disconnect $variable"
2009-01-15 09:05:51 +01:00
He Zhenxing
e58f77bbf0 BUG#40704 main.events_restart fails sporadically in pushbuild: "server has gone away"
mysqltest command 'shutdown_server' is supposed to shutdown the server
and wait for it to be gone, and kill it when timeout. But because the
arguments passed to my_kill were in the wrong order, 'shutdown_server'
does not wait nor kill the server at all. So after 'shutdown_server',
the server is still running, and the server may still accepting
connections.
2008-12-25 17:53:24 +08:00
Serge Kozlov
f51cfbbc26 Bug#39861:
1. mysqltest.cc - added flush to log file after each executed command in a testcase.
2. mtr shows 20 last lines from test case log file if timeout reached.
3. Optimizing the code by Magnus review.
4. It is partially fix bug#40150
2008-11-14 23:35:32 +03:00
Magnus Svensson
742b41b976 WL#4189 Make mysqltest die if fflush fails 2008-11-14 11:08:09 +01:00
Magnus Svensson
1449202bdb WL#4189 Make mysqltest flush log file at close if logfile is stdout 2008-11-14 11:06:56 +01:00
Magnus Svensson
dafbde4979 Fix DBUG_PRINT 2008-11-10 14:52:51 +01:00
Sven Sandberg
39987388a0 BUG#35701: please allow test language variables in connection and sync_slave_with_master
Problem: In the mysqltest language, it was not possible to set the current
connection from a variable, and it was not possible to read the current
connection.
Fix: Allow setting the connection from a variable, like:
connection $variable;
and introduce the mysqltest language variable $CURRENT_CONNECTION, which
holds the name of the current connection.
2008-10-23 16:23:13 +02:00
Magnus Svensson
37e6f0c6ab Print error message in diff_files if any of the two files to diff does not exist 2008-08-29 12:25:19 +02:00
Magnus Svensson
552d514d0b Fix VS8 build error 2008-08-09 14:59:57 +02:00
Magnus Svensson
4202897da7 Open result file in binary moe to avoid CR/LF problems 2008-08-09 14:52:39 +02:00
Magnus Svensson
66b42a13f2 Make events_restart more stable by waiting for the server to be stopped before starting it again 2008-08-09 11:16:12 +02:00
Magnus Svensson
02e48e886f Fix warnings in mysqltest 2008-08-09 10:52:50 +02:00
Magnus Svensson
69f9ec281d Merge 2008-08-08 20:10:43 +02:00
Magnus Svensson
ed8bc526ae Merge 2008-08-04 22:25:45 +02:00
Magnus Svensson
39ad2dc05a Bug #38181 Please print more debug info when tests fail 2008-08-04 21:54:44 +02:00
Renamed from client/mysqltest.c (Browse further)