mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
68631 commits 2781 branches 343 tags 1.6 GiB
Commit graph

142 commits

Author SHA1 Message Date
Bjorn Munch
8937cbd5ae upmerge 58896,58900,59002 2011-01-11 15:15:25 +01:00
Bjorn Munch
5376a76dea Bug #58900 query_get_value crashes when result begins with dollar sign 
Generalized fix for recursive backtick
Optional arg to eval_expr telling it not to interpret
 2011-01-11 10:54:42 +01:00
Bjorn Munch
2c8bccadcc merge from 5.5 main 2010-12-17 10:37:46 +01:00
Georgi Kodinov
b908a74bc9 merge 2010-12-16 16:40:52 +02:00
Bjorn Munch
5a95f0aeb1 upmerge 58511,58522,58608,58092 2010-12-09 15:32:39 +01:00
Bjorn Munch
06790ea7be Bug #58695 mysqltest coredumps on "if($x == ){" 
Add check that there is a RHS of the expression
Added to mysqltest.test
 2010-12-09 12:15:25 +01:00
Bjorn Munch
cc21483fcf Bug #58092 Test "rpl_cross_version" has "copy_file" failing 
I am not fixing the test failure
Adds printing of my_errno when commands fail, could hopefully help
 2010-12-01 11:11:16 +01:00
Bjorn Munch
ca2ea5541e Bug #58412 mysqltest: allow quoting of strings in let and in if comparison 
Stripping quotes in let was a bad idea, will not fix
Added code to strip quotes from rhs in comparisons
 2010-11-26 10:57:01 +01:00
Ramil Kalimullin
bd557f04f6 Manual merge from mysql-5.5-bugteam. 2010-11-22 14:47:28 +03:00
Ramil Kalimullin
65116d3408 Manual-merge from mysql-5.1-bugteam. 2010-11-22 12:21:10 +03:00
Bjorn Munch
5da7193a7b upmerge 58257 2010-11-18 16:41:35 +01:00
Bjorn Munch
32ea070845 Bug #58257 mysqltest: in if(), ! $var with space is always false 
Evaluation would start with the space and thus ignore the $
Added while() to skip past white space
 2010-11-17 16:05:52 +01:00
Bjorn Munch
32b7c75073 upmerge 58087 2010-11-17 11:18:52 +01:00
Bjorn Munch
ef4458af07 Tests: many if/while expresissons simplified after 57276 2010-11-17 11:16:13 +01:00
Mattias Jonsson
2db0a406fd merge 2010-11-17 10:41:54 +01:00
Mattias Jonsson
21bc09c26b post-push fix, backported --replace_result patch 
for --list_files in mysqltest.

client/mysqltest.cc:
  Backported --replace_result for --list_files.
mysql-test/r/mysqltest.result:
  updated test.
mysql-test/t/mysqltest.test:
  added test for replace_result on list_files.
 2010-11-17 10:13:57 +01:00
Bjorn Munch
92a1a11203 Bug #58087 mysqltest re-evaluates 'let' expressions infinitely 
Results from query is sent for evaluation
Break recursion by asking for ` to be ignored
 2010-11-15 14:23:02 +01:00
Bjorn Munch
3fab294616 Bug #57276 mysqltest: add support for simple compares in if/while conditions 
Added more parsing in do_block()
      Limitation: left operand must be variable
      Also changed var_set_int from 57036 to var_check_int
      Added tests to mysqltest.test
      Some tests can now be simplified but will take this later
      Updated after comments, now white space around operator not needed
 2010-11-10 09:42:14 +01:00
Bjorn Munch
7cd0a0d7d0 upmerge 56654 2010-10-19 14:13:05 +02:00
Bjorn Munch
84c57a5e27 Bug #52828 Tests that use perl fail when perl is not in path 
main.mysqltest skipped on Windows because a perl intentionally does exit(1)
Use exit(2), as exit(1) on Windows is indistinguishable from failing to
execute perl.
 2010-10-19 13:56:30 +02:00
Bjorn Munch
bd71a48649 upmerge 56125,56921 2010-09-28 16:00:11 +02:00
Bjorn Munch
500cb49295 Bug #57036 Add checks in mysqltest that variables treated as ints are in fact ints 
Adds boolean flag is_int and a separete function to check for int value
Added tests to mysqltest.test
 2010-09-27 14:36:16 +02:00
Bjorn Munch
7b216d7625 Bug #56921 It should be possible to log connection statements in mysqltest 
Added --enable-connect-log, somewhet similar to --enable-query-log
If query log is disabled, disable connect log too
Also some related cleanup in mysqltest.test: removing duplicate test loop
 2010-09-22 10:57:10 +02:00
Bjorn Munch
ee6f8ae1bd test fixes after 56753 2010-09-21 11:16:20 +02:00
Bjorn Munch
6ff48a61f2 Bug #56753 mtr silently ignores junk after backticks 
When stepping backward to end of `` expression, check for illegal chars
 2010-09-15 14:56:22 +02:00
Bjorn Munch
788b4e404b Bug #55413 mysqltest gives parse error for lines matching "^let.*\\.*;$" 
Allow escaped quotes also in statements not starting with --
But will not support single unescaped ' or `
 2010-08-10 12:13:58 +02:00
Bjorn Munch
2d2da6e793 Bug #55582 mtr root detection (and if-expression execution) broken 
Follow-up patch: added test cases for -0 and while
 2010-08-04 10:52:45 +02:00
Bjorn Munch
5e92df6e0e Bug #55582 mtr root detection (and if-expression execution) broken 
if() treated any non-numeric string as false
Fixed to treat those as true instead
Added some test cases
Fixed missing $ in variable name in include/mix2.inc
 2010-08-03 16:11:23 +02:00
Bjorn Munch
7f20e9fd06 Bug #43603 mysqltest command disable_abort_on_error does not affect all built-in commands 
After disable_abort_on_error, behaved as if --error was in effect
Add condition before die, as after queries
 2010-03-22 11:28:57 +01:00
Bjorn Munch
ddb6a95abd Bug #43588 mysqltest command disable_abort_on_error logs connect commands 
Only log connects after --error
A few small test adjustments needed/possible
 2010-03-17 15:25:55 +01:00
Bjorn Munch
1a6a540286 followup test fix after 49761 2010-03-03 11:17:00 +01:00
Bjorn Munch
4760adbf3f Bug #51590 mysqltest: --disable_abort_on_error does not work inside while/if 
abort_on_error flag for stmt was set at initial parse
(Re)-set flag before execution instead, also added to test
 2010-03-02 12:39:32 +01:00
Bjorn Munch
0ad9a5992d Bug #50618 Please allow 'sleep $variable' in mtr 
Made mtr's sleep function understand $variables
A few fixes since previous patch, added tests
 2010-02-09 18:13:57 +01:00
Bjorn Munch
01c0d46af8 Bug #39774 mysql-test-run's remove_file can't use wildcards, this should be documented 
Added remove_files_wildcard that allows to remove multiple files at once.
This is a port of original patch to Windows.
 2010-02-04 13:15:42 +01:00
Bjorn Munch
84616df3ff merge 49837 2010-01-20 14:23:57 +01:00
Bjorn Munch
87ff57cb7e merge 48888 2010-01-20 14:22:34 +01:00
Bjorn Munch
94ccc34537 Bug #49878 delimiter under false 'if' makes mysqltest test fail with 'Missing end of block' 
delimiter not executed so does not recognize end of block
Always execute delimiter command, revert after false if() block.
 2010-01-20 14:18:27 +01:00
Bjorn Munch
b554f4c52d Bug #48888 mysqltest crashes on --replace_result if 'from' is longer than ~1024 symbols 
valgrind pointed to a buffer allocated by my_realloc which looked fishy
Replaced size with what was probably intended, added test case.
Now also fixed line after review comment
 2010-01-20 12:52:35 +01:00
Bjorn Munch
5ae2eda776 Bug #49837 mysqltest exec cannot handle multi-line command correctly 
Since the exec command line is passed on externally, it cannot take newlines
Simply replace \n with space
Now also added test case
 2010-01-20 12:51:18 +01:00
Bjorn Munch
e1b42965a5 Bug #49269 mysqltest crashes on 'reap' if query executed after 'send' 
Undid amendment allowing pending reap after switching connections
Moved check for pending reap earlier; failed if running with ps-protocol
 2010-01-07 11:22:45 +01:00
Bjorn Munch
ed64190b23 Bug #49269 mysqltest crashes on 'reap' if query executed after 'send' 
Small amendment: ignore pending reap when switching connection, add test
 2010-01-06 12:56:22 +01:00
Bjorn Munch
04a5dcb136 Bug #49761 mysqltest.test does not have any tests for send/reap 
Added them
NB the 6th case is adapted to Bug no. 49269, gives wrong output without it
 2010-01-06 09:47:25 +01:00
Bjorn Munch
5b66dab00f Bug #48863 mysql test: enable and disable case insensitive compare mode 
Implemented --lowercase_result which lower cases next result
 2010-01-06 09:42:21 +01:00
Bjorn Munch
b229781c2d Bug #48671 mysqltest fails on 'perl' in file sourced inside 'while' 
Actually, fails on 'perl' in any while
Fixed essentially the same way as for append_file
 2009-11-11 12:46:19 +01:00
Bjorn Munch
9edd40c87e Bug #47218 mysqltest ignores "error" command inside if inside loop 
This was affected by same problem as append_file etc.
Added Q_ERROR to special handling, and added small test
 2009-10-08 11:30:03 +02:00
Bjorn Munch
fe3ea31d93 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
d19eda4a9b 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
444bbe56f5 cherry picking fix for Bug #39542 from 6.0-runtime 2009-05-27 22:54:40 +02:00
Bjorn Munch
b12bb225d1 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
Matthias Leich
2417d31045 Merge 5.0 -> 5.1 of fix for Bug#42003 and Bug#43114 2009-03-06 15:56:17 +01:00