msvensson@shellback.(none)
a5561176e4
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-18 16:31:38 +02:00
msvensson@shellback.(none)
4890ed261c
Fix bug where a timer was stopped by calling mtr_timer_stop with a "timer" instead of it's name
2006-10-18 16:30:51 +02:00
msvensson@shellback.(none)
ae10cfc01a
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-18 13:25:06 +02:00
msvensson@shellback.(none)
8d72bf9448
Make --with-ndbcluster only be valid together with --bench
...
Improve code that detects if ndb shuold be installed
Remove call to stop_all_servers after install db, if any servers are still running
and need to be stopped they will be stopped atuomatically
2006-10-18 13:24:06 +02:00
cmiller@zippy.cornsilk.net
0fdfb36263
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-10-17 16:24:47 -04:00
cmiller@zippy.cornsilk.net
cf9f5b8b14
Merge fixes.
2006-10-17 16:22:44 -04:00
tsmith/tim@siva.hindu.god
a42a06cff5
Update ps and show_check results to account for new -master.opt settings.
2006-10-17 12:15:14 -06:00
cmiller@zippy.cornsilk.net
7714fea9a2
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016
2006-10-17 12:31:52 -04:00
cmiller@zippy.cornsilk.net
91c4edfbfb
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-10-17 12:00:36 -04:00
cmiller@zippy.cornsilk.net
184467a2cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-10-17 11:23:07 -04:00
cmiller@zippy.cornsilk.net
3a709f50b2
Fix previous bad patch for Bug#14262.
...
Remove table engine qualification where it's unnecessary.
2006-10-17 11:06:11 -04:00
msvensson@shellback.(none)
84d455b4f2
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-17 11:31:56 +02:00
msvensson@shellback.(none)
d45b61b1b5
Remove warnings
...
Set comment properly before calling mtr_report_test failed and report_failure_restart
2006-10-17 10:31:06 +02:00
msvensson@shellback.(none)
3f46c5cdbd
When calculating what features to use for _this_ test run, don't look at test that already are deterined to be skipped
2006-10-17 08:10:51 +02:00
tsmith/tim@siva.hindu.god
df200bd018
Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/50
2006-10-16 20:15:14 -06:00
tsmith/tim@siva.hindu.god
9711333914
Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50
...
into siva.hindu.god:/usr/home/tim/m/bk/b19764/51
2006-10-16 18:42:22 -06:00
mikael/pappa@dator5.(none)
4a7cd3a1cb
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug18198
2006-10-16 15:40:40 -04:00
msvensson@shellback.(none)
947d219d1b
Cleanup mtr_timer
...
Add verbose printouts making it possible to see what happens.
Make it an error if trying to stop a non existing timer
Print warning if fork fails.
2006-10-15 15:38:56 +02:00
msvensson@shellback.(none)
ffc9538bb4
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-14 19:55:06 +02:00
msvensson@shellback.(none)
cfd442b67f
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-14 17:49:14 +02:00
msvensson@shellback.(none)
f60e544902
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-14 17:31:04 +02:00
msvensson@shellback.(none)
88e11706c3
No need to continue in 'mtr_report_test_failed' after timeout detected, return immediately after
2006-10-14 17:14:03 +02:00
msvensson@shellback.(none)
a9e60bab29
Use char as datatype for the byte that are read with my_fgetc, fixes problem with
...
mysqltest.test on Solaris and Mac. write_file produced nice files with all zeroes.
2006-10-14 17:09:06 +02:00
msvensson@shellback.(none)
a9bd28307d
Skip looking for mysql_client_test in 4.1 on windows as it's not built by default
2006-10-14 16:31:20 +02:00
msvensson@shellback.(none)
1c2113de40
Look for client bindirs client_release and client_debug before other directories.
2006-10-13 20:29:27 +02:00
msvensson@shellback.(none)
8c55cf8f9a
rpl_empty_master_crash need a master restart so that all log files are deleted
2006-10-13 20:22:56 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0e3ccedd6b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug23254/my41-bug23254
2006-10-13 21:12:07 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
23727a851b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug23254/my50-bug23254
2006-10-13 21:09:20 +05:00
ramil/ram@myoffice.izhnet.ru
bbd3470ec7
Merge mysql.com:/usr/home/ram/work/bug23254/my50-bug23254
...
into mysql.com:/usr/home/ram/work/bug23254/my51-bug23254
2006-10-13 19:33:28 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
84048dc763
Merge mysql.com:/usr/home/ram/work/bug23254/my41-bug23254
...
into mysql.com:/usr/home/ram/work/bug23254/my50-bug23254
2006-10-13 19:09:22 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
31402835d4
Fix for bug #23254 : COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL
...
We don't set null_value to 0 in the Item_func_compress::val_str() for
not-NULL results.
2006-10-13 19:05:54 +05:00
msvensson@shellback.(none)
c31a028b9d
Optimize restarts by using --force-restart option
2006-10-13 11:53:19 +02:00
msvensson@shellback.(none)
c2574de306
Improve the function that parses test files looking for what features it uses
...
Now also detects "source nnnn;" command, previous version only detected
"--source"
2006-10-13 11:05:46 +02:00
msvensson@shellback.(none)
927c20dd0f
Improve function that finds the reason why test was skipped, the old version only looked at the ast line, but there might be some additional debug info there so it's better to scan the whole file.
...
There should be only one line that says "reason: <reason>"
2006-10-13 10:41:40 +02:00
msvensson@shellback.(none)
6e3280fd3b
Add missing semicolon in test file
2006-10-13 08:48:47 +02:00
tsmith/tim@siva.hindu.god
0e3cfe02ec
Bug #19764 : SHOW commands end up in the slow log as table scans
...
Do not consider SHOW commands slow queries, just because they don't use proper indexes.
This bug fix is not needed in 5.1, and the code changes will be null merged. However, the test cases will be propogated up to 5.1.
2006-10-12 17:10:34 -06:00
msvensson@shellback.(none)
31f4aaa5be
Skip looking for ndbapi-examples in 4.1, not part of dist
2006-10-12 20:52:53 +02:00
msvensson@shellback.(none)
1be01ceea8
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-12 18:48:03 +02:00
msvensson@shellback.(none)
1b06c7c78e
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint-new
2006-10-12 17:37:59 +02:00
msvensson@shellback.(none)
de5262252f
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-12 16:18:14 +02:00
msvensson@shellback.(none)
fe7fce3664
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-12 16:17:31 +02:00
msvensson@shellback.(none)
2db82814c4
Add missing semicolon
2006-10-12 16:17:09 +02:00
msvensson@shellback.(none)
57ad872b24
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-12 13:53:21 +02:00
msvensson@shellback.(none)
925220627c
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-12 13:51:54 +02:00
msvensson@shellback.(none)
2c4456d30f
Add win paths for mysql_client_test
2006-10-12 13:49:12 +02:00
msvensson@shellback.(none)
bcf1bc4ccb
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-12 12:21:16 +02:00
msvensson@shellback.(none)
1d77363c40
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-12 12:19:52 +02:00
msvensson@shellback.(none)
d093b1029a
Look for mysql_client_test in $path_client_bindir
2006-10-12 12:19:23 +02:00
msvensson@shellback.(none)
e42934f169
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-12 11:57:50 +02:00
kaa@polly.local
8c88bb4eaa
Merge polly.local:/tmp/maint/bug22728/my41-bug22728
...
into polly.local:/home/kaa/src/maint/m41-maint--07OGk
2006-10-12 13:39:52 +04:00