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
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@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
msvensson@shellback.(none)
de3f217e10
Use 'my_strnncoll_simple' instead of 'strncasecmp'
2006-10-13 11:38:32 +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)
889e7147f6
Add ATTRIBUTE_FORMAT specifier to _db_doprnt, which is used by DBUG_PRINT
...
This will hopefully avoiid annoying crashes when running with --debug
Fix warnings from the above in mysqltest.c
2006-10-12 20:15:56 +02:00
msvensson@shellback.(none)
21e257b9af
Add ATTRIBUTE_FORMAT for _db_doprnt, it will catch problems
...
with DBUG_PRINT format specifiers
2006-10-12 20:02:17 +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)
c8261b1208
Use autorun.sh from BUILD/ instead of netware specific version
2006-10-12 17:55:06 +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
kaa@polly.local
d0d17b4b0a
Merge polly.local:/tmp/maint/bug22728/my50-bug22728
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-10-12 18:25:30 +04: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
kaa@polly.local
667f5b1470
Merge polly.local:/tmp/maint/bug22728/my41-bug22728
...
into polly.local:/tmp/maint/bug22728/my50-bug22728
2006-10-12 18:14:12 +04:00
msvensson@shellback.(none)
5abdd04686
Make all compile-netware-* scripts executable
2006-10-12 14:14:54 +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)
6c31690bbd
Move the reconnect variable to beginning of function
...
Fix warning about value from "*ptr++" not being used. Changed it to ptr++
2006-10-12 13:50:50 +02:00
msvensson@shellback.(none)
2c4456d30f
Add win paths for mysql_client_test
2006-10-12 13:49:12 +02:00
msvensson@shellback.(none)
27737f0bd4
Use libc-2003 if available else default to libc
2006-10-12 13:28:18 +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)
42a227e967
Switch to use yaSSL instead of OpenSSL on Netware
2006-10-12 12:11:23 +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
msvensson@shellback.(none)
5741683d12
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-12 11:30:07 +02:00
msvensson@shellback.(none)
3c66250e84
Fix unhandled exception in mysql-test-run.pl, creating a dir that already exist
2006-10-12 11:29:13 +02:00
msvensson@shellback.(none)
71cb0e8dc5
Only print cur_file->filename if cur_file->file is set
...
MOve DBUG_ASSERT(result_file_name) to after DBUG_ENTER
Change type of "reconnect" variable from int to my_bool, reconnect didn't work on Solaris without that
2006-10-12 10:49:59 +02:00
msvensson@shellback.(none)
d534a6b905
Add DBUG_ASSERT to check that mysql is not null when mysql_reconnect is called
...
Add DBUG_PRINT to show the value of mysql->reconnect
2006-10-12 10:27:44 +02:00