Sergey Petrunya
29f0dcb563
Merge MySQL->MariaDB
...
* Finished Monty and Jani's merge
* Some InnoDB tests still fail (because it's old xtradb code run against
newer testsuite). They are expected to go after mergning with the latest
xtradb.
2009-09-08 00:50:10 +04:00
Bjorn Munch
29a142043e
initial merge from 5.1-mtr
2009-09-04 15:20:58 +02:00
Bjorn Munch
b5dd609a55
initial merge from 5.1-mtr
2009-09-04 15:20:58 +02:00
Bjorn Munch
31f9d5fd16
second merge from main, with adaptions
2009-09-02 23:29:11 +02:00
Bjorn Munch
39fca129fb
second merge from main, with adaptions
2009-09-02 23:29:11 +02:00
Bjorn Munch
a829604260
first merge from main
2009-09-02 18:58:17 +02:00
Bjorn Munch
588e9930b4
first merge from main
2009-09-02 18:58:17 +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
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
d4854d7494
merge
2009-09-01 19:31:28 +02:00
Bjorn Munch
5703baad97
merge
2009-09-01 19:31:28 +02:00
Staale Smedseng
5be4c38226
Merge from 5.0 for 43414
2009-08-28 18:21:54 +02:00
Staale Smedseng
f59ef9eafa
Merge from 5.0 for 43414
2009-08-28 18:21:54 +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
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
b9d1c04b79
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
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
b742c771af
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
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
55eee5208c
Merge from 5.1 main.
2009-06-08 09:55:37 -03:00
Davi Arnaut
02a5dd38f3
Merge from 5.1 main.
2009-06-08 09:55:37 -03:00
Tatiana A. Nurnberg
d7d61f59dd
manual merge
2009-06-06 18:41:40 +02:00
Tatiana A. Nurnberg
69e78274ae
manual merge
2009-06-06 18:41:40 +02:00
Bjorn Munch
cf6aeea48c
merge from 5.1 main
2009-05-29 13:04:02 +02:00
Bjorn Munch
524bd596e2
merge from 5.1 main
2009-05-29 13:04:02 +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
f26f8edff4
cherry picking fix for Bug #39542 from 6.0-runtime
2009-05-27 22:54:40 +02:00
Bjorn Munch
d07bef15c6
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
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
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
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
038be08a1b
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
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
23116951ae
Make SSL options appear in correct place in mysql_upgrade and mysqltest
...
usage information. (Bug #31883 )
2009-04-28 11:26:31 -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
Michael Widenius
e726e587ec
Merged with mysql-5.1 tree.
...
client/mysqltest.cc:
Manually merged
configure.in:
Manually merged
mysql-test/r/variables.result:
Manually merged
mysql-test/t/variables.test:
Manually merged
mysys/my_pread.c:
Manually merged
mysys/my_read.c:
Manually merged
sql/mysqld.cc:
Manually merged
storage/csv/ha_tina.h:
Manually merged
storage/myisam/ha_myisam.cc:
Manually merged
storage/myisam/mi_check.c:
Manually merged
storage/myisam/mi_search.c:
Manually merged
2009-04-25 13:05:32 +03:00
Michael Widenius
210a412522
bzr merge from guilhem's maria tree to our local 5.1
...
configure.in:
Manually merged
mysql-test/lib/My/ConfigFactory.pm:
Manually merged
mysql-test/mysql-test-run.pl:
Manually merged
mysql-test/t/information_schema.test:
Manually merged
sql/handler.cc:
Manually merged
support-files/mysql.spec.sh:
Manually merged
2009-04-25 12:04:38 +03:00
Guilhem Bichot
c71aae73f6
merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except
...
those of davi.arnaut@sun.com-20090219210935-9vilvcisyyieffxl (TODO).
2009-04-01 11:34:52 +02:00
Georgi Kodinov
c36e935ac2
merged 5.0-bugteam -> 5.1-bugteam
2009-03-24 15:58:52 +02:00
Georgi Kodinov
706a0a39ed
merged 5.0-bugteam -> 5.1-bugteam
2009-03-24 15:58:52 +02:00
Georgi Kodinov
84557d4423
merged 5.1-main -> 5.1-bugteam
2009-03-23 11:36:39 +02:00
Georgi Kodinov
f7cfb8ea0e
merged 5.1-main -> 5.1-bugteam
2009-03-23 11:36:39 +02:00
Michael Widenius
806ec1b062
Merge with trunk
2009-03-20 13:45:54 +02:00
Michael Widenius
4dc093cee4
Avoid compiler warnings on windows
...
include/config-win.h:
Added missing typedef ssize_t
Added some other useful defines from MySQL 6.0
unittest/mysys/waiting_threads-t.c:
Fixed link failure for 'ftruncate' on Windows
2009-03-20 13:41:30 +02:00
Magnus Svensson
776bb04abf
Merge
2009-03-19 12:42:55 +01:00
Magnus Svensson
9ed35a59f9
Merge
2009-03-19 12:42:55 +01:00
unknown
ce956c8f2d
Add testing of extra port for pool-of-threads.
...
The additional test uses up all threads in the pool with SELECT
SLEEP(), and tests that this makes normal connections block, but
connections on the extra port still work.
Also test connection limit on extra port with and without
pool-of-threads enabled.
Add --connect-timeout option to mysqltest program.
Add facility for --extra-port option to ConfigFactory.
Fix regexp typo in ConfigFactory.pm
2009-03-18 16:46:32 +01:00
Bjorn Munch
9f32fdd9e2
merge from main
2009-03-18 13:44:05 +01:00
Bjorn Munch
1b922ca6e8
merge from main
2009-03-18 13:44:05 +01:00
Ignacio Galarza
0d588edf61
auto-merge
2009-03-17 16:29:24 -04:00
