msvensson@neptunus.(none)
9a50d74fbb
Change the ssl related variables to loose so they work also when the server is compiled without ssl
2006-10-19 00:53:01 +02:00
msvensson@neptunus.(none)
4b9ea8c0e2
Merge neptunus.(none):/home/msvensson/mysql/bug21868/my50-bug21868
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-19 00:12:36 +02:00
msvensson@neptunus.(none)
4cf0a5ee74
Merge neptunus.(none):/home/msvensson/mysql/bug17039/my50-bug17039
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-19 00:10:36 +02:00
msvensson@neptunus.(none)
722aec24d3
Remove extra whitespace in result file
2006-10-18 22:47:30 +02:00
msvensson@neptunus.(none)
ecccb89ca2
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-18 21:16:04 +02:00
msvensson@neptunus.(none)
a755fae8d6
Merge 192.168.0.4:mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-18 21:15:27 +02:00
msvensson@neptunus.(none)
d4d84a88f6
Merge 192.168.0.4:mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-18 19:17:15 +02:00
msvensson@shellback.(none)
f83e9e4f18
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-18 18:02:07 +02:00
msvensson@shellback.(none)
4cefd49b81
Put the printf of failed ratio on itäs only line, printf was tricked
...
into thinking the escaped % + w was a format specifier
2006-10-18 17:58:26 +02:00
msvensson@shellback.(none)
d71d1a64de
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-18 17:16:53 +02:00
msvensson@shellback.(none)
770a1f919f
Don't stop the time in mtr_timer_timeout, that will be done after testcase or when program exit
2006-10-18 17:16:08 +02:00
msvensson@shellback.(none)
09d069fa01
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-18 16:41:01 +02:00
msvensson@shellback.(none)
dd6a9307f1
Remove some junk
2006-10-18 16:40:22 +02:00
msvensson@shellback.(none)
1feac4d44f
Stop all timers before exiting when --start-and-exit
2006-10-18 16:39:00 +02:00
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
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
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
Kristofer.Pettersson@naruto.
550c9e55f3
Merge naruto.:C:/cpp/bug23010/my50-bug23010
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-10-17 10:53:53 +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
93d351f4c6
Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/50
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/50
2006-10-16 20:03:43 -06:00
msvensson@neptunus.(none)
f105e16b64
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-16 21:23:23 +02:00
msvensson@neptunus.(none)
85fb3817f7
yassl build fixes for hpux and netware
2006-10-16 18:36:33 +02:00
msvensson@neptunus.(none)
82b6ac52e5
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-16 17:08:16 +02:00
msvensson@neptunus.(none)
ecb518a9f0
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-16 17:01:02 +02: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)
5dc23bcc2b
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-14 17:22:31 +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)
d8b9f7cb0e
Improving debugging support in 'read_line' function
2006-10-14 17:02:43 +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
cmiller@zippy.cornsilk.net
adea21fd1c
Merge fix-up.
2006-10-13 10:57:50 -04: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
cmiller@zippy.cornsilk.net
87ba07e832
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262
2006-10-13 08:57:15 -04:00
kroki/tomash@moonlight.intranet
62a697aab9
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug9678
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real
2006-10-13 14:40:26 +04:00
kroki/tomash@moonlight.intranet
ec523c650e
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.0
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug9678
2006-10-13 14:26:28 +04:00
msvensson@shellback.(none)
c31a028b9d
Optimize restarts by using --force-restart option
2006-10-13 11:53:19 +02:00