msvensson@neptunus.(none)
8399b9e155
Merge neptunus.(none):/home/msvensson/mysql/work/my51-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-28 09:38:26 +02:00
msvensson@neptunus.(none)
d4799d9edd
Directory mySTL has moved from extra/yassl/mySTL to extra/yassl/taocrypt/mySTL
2006-09-28 09:37:34 +02:00
msvensson@neptunus.(none)
d0bdc01ae3
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/work/my51-work
2006-09-28 09:33:09 +02:00
msvensson@neptunus.(none)
712a937e30
Increase test suite timeout to 3 hours
2006-09-28 09:30:24 +02:00
cmiller@zippy.cornsilk.net
95ccad5e02
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-27 20:08:07 -04:00
cmiller@zippy.cornsilk.net
150740cf8a
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-27 20:06:59 -04:00
elliot/emurphy@lost.local
d5c98585da
Merge mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint-gca
...
into mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.1-new-maint
2006-09-27 17:20:45 -04:00
elliot/emurphy@mysql.com/lost.local
d1fb415ad4
Temporary fix for bug#22268 (official patch will come soon)
...
Don't cap threads at 1000 on Windows any more.
2006-09-27 17:13:58 -04:00
cmiller@zippy.cornsilk.net
d34940c909
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
2006-09-27 15:48:40 -04:00
cmiller@zippy.cornsilk.net
c0ab40d390
Bug#21476: (Thread stack overrun not caught, causing SEGV)
...
The STACK_MIN_SIZE is currently set to 8192, when we actually need
(emperically discovered) 9236 bytes to raise an fatal error, on Ubuntu
Dapper Drake, libc6 2.3.6-0ubuntu2, Linux kernel 2.6.15-27-686, on x86.
I'm taking that as a new lower bound, plus 100B of wiggle-room for sundry
word sizes and stack behaviors.
The added test verifies in a cross-platform way that there are no gaps
between the space that we think we need and what we actually need to report
an error.
DOCUMENTERS: This also adds "let" to the mysqltest commands that evaluate
an argument to expand variables therein. (Only right of the "=", of course.)
2006-09-27 14:42:56 -04:00
msvensson@neptunus.(none)
cad834c972
Merge neptunus.(none):/home/msvensson/mysql/work/my51-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-27 18:36:04 +02:00
msvensson@neptunus.(none)
660c962bd3
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/work/my51-work
2006-09-27 18:34:36 +02:00
msvensson@neptunus.(none)
281b7ad19d
Add suppressions seen on maint1, nothing new just a nother version of libc
2006-09-27 18:10:15 +02:00
msvensson@neptunus.(none)
4f5161d6c5
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-27 17:03:54 +02:00
msvensson@neptunus.(none)
77a5a48611
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2006-09-27 16:58:05 +02:00
msvensson@neptunus.(none)
593fdc3f9b
The mySTL directory has moved from yassl/mySTL to yassl/taocrypt/mySTL
2006-09-27 16:51:59 +02:00
msvensson@neptunus.(none)
83a5e775f5
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-27 16:48:43 +02:00
msvensson@neptunus.(none)
d1f7bc0971
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2006-09-27 16:46:38 +02:00
msvensson@neptunus.(none)
ca0b8c552a
Fix compile failure on Sun C++ 5.7 in yaSSL code
...
- Trying to use unctions declared as static being used from another file, change them to be inline
2006-09-27 16:45:44 +02:00
msvensson@neptunus.(none)
9f7b589dd7
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-27 14:46:17 +02:00
msvensson@neptunus.(none)
980268df03
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2006-09-27 14:38:25 +02:00
msvensson@neptunus.(none)
e4676ef60a
Import yaSSL version 1.4.3
2006-09-27 14:36:12 +02:00
msvensson@neptunus.(none)
dc1ec664ce
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/work/my51-work
2006-09-27 13:56:32 +02:00
msvensson@neptunus.(none)
be9a5571f4
When valgrinding add /usr/lib/debug" to LD_LIBRARY_PATH if available
2006-09-27 13:42:16 +02:00
msvensson@neptunus.(none)
8b2c05de32
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/work/my51-work
2006-09-26 17:52:50 +02:00
msvensson@neptunus.(none)
43f67cc4de
Fir problem with winepath in mwenv
2006-09-26 17:52:15 +02:00
msvensson@neptunus.(none)
cc4d1a4d4d
Merge neptunus.(none):/home/msvensson/mysql/netware/my51-netware
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-26 16:32:34 +02:00
msvensson@neptunus.(none)
03ead53d56
Merge neptunus.(none):/home/msvensson/mysql/bug18969/my51-bug18969
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-26 16:30:50 +02:00
msvensson@neptunus.(none)
a29a522815
Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware
...
into neptunus.(none):/home/msvensson/mysql/netware/my51-netware
2006-09-26 16:28:28 +02:00
msvensson@neptunus.(none)
6a6345ef99
Hardcode the fact that we are using zlib 1.2.3(previously done via symlink zlib-1.1.4)
2006-09-26 16:25:01 +02:00
msvensson@neptunus.(none)
5481659f6e
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-26 16:05:11 +02:00
msvensson@neptunus.(none)
422674c73f
Update patch that restores slave databases from snapshots before start for 5.1
2006-09-26 16:01:16 +02:00
msvensson@neptunus.(none)
ea91c010de
Merge neptunus.(none):/home/msvensson/mysql/bug18969/my50-bug18969
...
into neptunus.(none):/home/msvensson/mysql/bug18969/my51-bug18969
2006-09-26 14:40:03 +02:00
msvensson@neptunus.(none)
dc02f761e5
Bug#18969 race condition involving slave and mysqltest. was rpl_insert_id test case fails
...
- As the slaves are restarted for each testcase, take the opportunity to restore their databases to a known state with the help of the snapshot(s)
- Count max number of slaves used in testcases
- Use copy_install_db to speed up "Installing db" phase
2006-09-26 13:49:42 +02:00
msvensson@neptunus.(none)
4ee6e94fde
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-25 20:45:27 +02:00
msvensson@neptunus.(none)
0be1bf6eac
Return from function 'collect_one_test_case' as sson it's detected that testcase should be skipped
2006-09-25 20:28:40 +02:00
msvensson@neptunus.(none)
40a655b1b8
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-25 20:18:01 +02:00
msvensson@neptunus.(none)
53b3faf783
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-09-25 20:03:22 +02:00
msvensson@neptunus.(none)
5edd58b14c
Bug#18888 Trying to overwrite sql/lex_hash.h during build
...
-Backport fix for bug19738 to 4.1
2006-09-25 20:01:39 +02:00
msvensson@neptunus.(none)
bcdecd96b7
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2006-09-25 16:46:37 +02:00
msvensson@neptunus.(none)
64a64d0fbf
Import yaSSL version 1.4.0
2006-09-25 16:40:29 +02:00
kaa@polly.local
1027446d12
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
2006-09-25 13:30:19 +04:00
kaa@polly.local
059b026dc1
Merge polly.local:/tmp/22129/bug22129/my51-bug22129
...
into polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
2006-09-25 13:23:33 +04:00
kaa@polly.local
c7c9cdf2d1
Merge polly.local:/tmp/22129/bug22129/my50-bug22129
...
into polly.local:/tmp/22129/bug22129/my51-bug22129
2006-09-25 12:52:01 +04:00
kaa@polly.local
781879adf9
Fixed broken 'strict' test which relied on incorrect behaviour of my_strtod() (fixed in bug #22129 )
2006-09-25 12:50:32 +04:00
cmiller@zippy.cornsilk.net
161fea4ac4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-23 09:51:20 -04:00
lars/lthalmann@dl145k.mysql.com
60e178bb73
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/users/lthalmann/bkroot/mysql-5.1
2006-09-23 08:45:26 +02:00
lars/lthalmann@dl145k.mysql.com
bab374162f
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-23 07:54:40 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
7a761a2545
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-23 07:37:41 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
7ce96bb579
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-23 07:12:00 +02:00