Bjorn Munch
423dacf3c6
merge from next-mr
2009-10-18 10:08:07 +02:00
Bjorn Munch
d30c25ce14
merge 46007 from 5.1->trunk
2009-10-16 11:15:35 +02:00
Bjorn Munch
b21c62bedd
merge 46007 from 5.1
2009-10-16 11:02:37 +02:00
Alexander Barkov
583b853092
A postfix for backporting WL#1397 convert XML -> SQL
...
mysql-test/r/loadxml.result
mysql-test/t/loadxml.test
Fixing non-deterministic test results
sql/sql_yacc.yy
Initializing fname_first using get_tok_end() instead of get_ptr().
The latter is grammar-dependant. The former is not.
2009-10-14 17:10:22 +05:00
Bjorn Munch
23306c563a
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 Barkov
741a1df4cc
WL#1397 convert XML -> SQL
2009-10-12 11:22:53 +05:00
Alexander Nozdrin
946dc457fa
Merge from mysql-next-mr.
2009-10-10 19:22:31 +04:00
Alexander Nozdrin
8975cc5f98
Merge. Backport WL#4085 from 6.0.
2009-10-10 19:19:12 +04:00
Alexander Nozdrin
84f90701d9
Merge from mysql-trunk.
2009-10-09 19:56:30 +04:00
Alexander Nozdrin
3dcbeb36b4
Update version in default.conf.
2009-10-09 19:54:56 +04:00
Bjorn Munch
347b860ef1
avoid regexp warning after 46625
2009-10-09 15:24:55 +02:00
Bjorn Munch
de54fa30a6
avoid regexp warning after 46625
2009-10-09 15:18:43 +02:00
Bjorn Munch
1cfe27ba58
avoid regexp warning after 46625
2009-10-09 15:16:36 +02:00
Alexander Nozdrin
bf1ed58676
Merge from mysql-next-mr-alik (WL#4085).
2009-10-09 17:10:13 +04:00
Alexander Nozdrin
84510f0375
Merge from mysql-next-mr.
2009-10-09 17:09:16 +04:00
Alexander Nozdrin
be37e44946
Merge from mysql-next-mr.
2009-10-09 17:05:11 +04:00
Alexander Nozdrin
5afc219d01
Merge from mysql-trunk.
2009-10-09 13:23:23 +04:00
Alexander Nozdrin
f1c6580b49
Change the version tag (to 5.5.0).
2009-10-09 13:22:26 +04:00
Alexander Nozdrin
952b6f5360
Merge from mysql-trunk.
2009-10-09 12:56:39 +04:00
Alexander Nozdrin
0ca1292d3b
Fix default.cof.
2009-10-09 12:48:08 +04:00
Alexander Nozdrin
4e3fbcd156
Merge from mysql-trunk-bugfixing.
2009-10-09 12:30:34 +04:00
Alexander Nozdrin
3f76ffd433
Mark main.log_tables experimental (Bug 47924).
2009-10-08 23:13:33 +04:00
Bjorn Munch
5447969d43
Remove obsolete comments after fixing 42408
2009-10-08 14:34:24 +02:00
Bjorn Munch
e2e8115528
Remove obsolete comments after fixing 42408
2009-10-08 14:32:45 +02:00
Bjorn Munch
ebd84796fe
Remove obsolete comments after fixing 42408
2009-10-08 14:31:39 +02:00
Bjorn Munch
2477b72b5a
merge from trunk-mtr
2009-10-08 11:37:55 +02:00
Bjorn Munch
79a1ba30e1
merge from mtr-51
2009-10-08 11:34:42 +02:00
Bjorn Munch
9a3d3f4724
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
Alexander Nozdrin
a2dfafd4d7
Merge from mysql-trunk-bugfixing.
2009-10-08 13:29:48 +04:00
Alexander Nozdrin
633625e8fc
Fix index_merge_innodb.result (Bug 45727).
2009-10-08 13:27:45 +04:00
Bjorn Munch
57d40c6ba4
Bug #47716 mtr2 prints obscure error when started with -gdb and xterm is missing
...
Tried to use an expression inside ""
Go via variable, and add $exe to the output
2009-10-08 11:23:04 +02:00
Bjorn Munch
00709918e4
Bug #46625 Pushbuild2: does not notice test failure in "Innodb Plugin" mode
...
Disallow (and don't use) space in combination names
2009-10-08 11:14:42 +02:00
Magnus Blåudd
700f21b7a0
Bug#47801 The plugin test fails with the Embedded Server on Windows
...
- Remove the "hack" from mtr.pl that skipped searching for the .dll files
when embedded and windows. Now the variables will be preoperly initialized.
- Make the tests detect that they can't run on windows+embedded
2009-10-08 10:39:15 +02:00
Magnus Blåudd
d94752f42b
Merge
2009-10-08 10:32:43 +02:00
Alexander Nozdrin
f4d27e81bb
Merge from mysql-next-mr.
2009-10-08 11:42:38 +04:00
Alexander Nozdrin
d8a8170863
Merge from mysql-trunk-bugfixing.
2009-10-07 19:42:50 +04:00
Alexander Nozdrin
019f5121ad
Disabled index_merge2.inc due to Bug 45727.
2009-10-07 19:37:36 +04:00
Vladislav Vaintroub
d003ddfdab
merge
2009-10-07 16:34:45 +02:00
Magnus Blåudd
8ccd9d7cbe
BUG#47612 - fix review comment
2009-10-07 16:25:36 +02:00
Alexander Nozdrin
50486457b1
Backport WL#4085: Merge revno:2617.56.29 from 6.0.
2009-10-06 14:57:07 +04:00
Alexander Nozdrin
f952bbe55c
Merge revno:2617.31.54 from 6.0.
2009-10-06 14:56:23 +04:00
Alexander Nozdrin
f81b26509e
Backport WL#4085: Merge revno:2476.1338.9 from 6.0.
2009-10-06 14:53:47 +04:00
Alexander Nozdrin
aabeeccf86
Backport WL#4085: Merge revno:2476.1105.1 from 6.0.
2009-10-06 14:52:26 +04:00
Alexander Nozdrin
ca8706ff0f
Backport WL#4085: Merge revno:2476.657.219 from 6.0.
2009-10-06 14:47:04 +04:00
Alexander Barkov
a16a82d4eb
Bsckporting WL#3764 Sinhala Collation
...
modified:
mysql-test/r/ctype_utf8.result
mysql-test/t/ctype_utf8.test
mysys/charset-def.c
strings/ctype-uca.c
2009-10-06 15:34:49 +05:00
Bjorn Munch
957648b313
merge 46327 and 47811 from 5.1-mtr->trunk-mtr
2009-10-06 11:00:13 +02:00
Bjorn Munch
a3f4fcc5ae
merge 46327 and 47811 from 5.1-mtr
2009-10-06 10:58:29 +02:00
Bjorn Munch
0311f538b0
Bug #47811 ./mysql-test-run.pl --valgrind uses old (too narrow) allignment
...
Remove the alignment option, let valgrind use its default
2009-10-06 10:42:05 +02:00
Bjorn Munch
a0ed9a389d
Bug #46327 MTR2 prevents gcov data accumulation
...
mysqladmin fails on Linux in 6.0 without --character-sets-dir
Also added timeout for server shutdown, hope this will solve it
2009-10-06 10:35:35 +02:00
Alexander Barkov
1c58e90695
Backporting WL#4642 Greek locale for DAYNAME, MONTHNAME, DATE_FORMAT
...
added:
mysql-test/r/locale.result
mysql-test/t/locale.test
modified:
mysql-test/r/variables.result
mysql-test/t/variables.test
sql/sql_locale.cc
2009-10-06 11:02:51 +05:00
