Commit graph

32512 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
712a937e30 Increase test suite timeout to 3 hours 2006-09-28 09:30:24 +02:00
msvensson@neptunus.(none)
4a00ae2d02 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-28 08:55:44 +02:00
istruewing@chilla.local
629076c5b3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  chilla.local:/home/mydev/mysql-5.0-bug20719-m
2006-09-28 08:55:01 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
47c2c590c8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0-maint.b22227
2006-09-28 10:41:09 +05:00
cmiller@zippy.cornsilk.net
33bf71e9d1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-27 20:08:44 -04:00
cmiller@zippy.cornsilk.net
78aea70393 Bug #20778: strange characters in warning message 1366 when called in SP
The function receives an exactly-sized buffer (not a C NUL-terminated string)
and passes it into a printf function to be interpreted with "%s".

Instead, create an intermediate String object, and copy the data into it, 
and pass in a pointer to the String's NUL-terminated buffer.
2006-09-27 19:26:25 -04:00
elliot/emurphy@mysql.com/lost.local
194f12ff0c Merge mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint
into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint-gca
2006-09-27 17:28:31 -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
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)
841bcbe79e Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-27 18:39:01 +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)
c4a50dea3f Build fixes for netware/ directory
- Create the file netware/libmysql.imp from libmysql/libmysql.def
 - Remove the outdated netware/libmysql.imp file from version control
2006-09-27 17:11:19 +02:00
gluh@mysql.com/gluh.(none)
4aaf7e34ff additional 'after merge' fix 2006-09-27 20:11:11 +05:00
msvensson@neptunus.(none)
912075ba4d Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-27 17:00:25 +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)
161b64def2 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-27 16:47:59 +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
gluh@mysql.com/gluh.(none)
c3d63bef2b after merge fix 2006-09-27 19:21:29 +05:00
svoj@mysql.com/april.(none)
b724a03e08 After merge fix. 2006-09-27 18:33:31 +05:00
gluh@mysql.com/gluh.(none)
437c94317b Merge mysql.com:/home/gluh/MySQL/Merge/4.1
into  mysql.com:/home/gluh/MySQL/Merge/5.0
2006-09-27 18:06:46 +05:00
gluh@mysql.com/gluh.(none)
a039376c43 Patch for bug#21432 is reverted 2006-09-27 17:49:16 +05:00
msvensson@neptunus.(none)
312b4de035 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-27 14:44:06 +02:00
msvensson@neptunus.(none)
7f209e3152 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-27 14:41:29 +02:00
msvensson@neptunus.(none)
e4676ef60a Import yaSSL version 1.4.3 2006-09-27 14:36:12 +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
svoj@mysql.com/april.(none)
bfb6ff6bdd Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-27 15:42:00 +05:00
svoj@mysql.com/april.(none)
a324cb8934 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-09-27 15:34:52 +05:00
istruewing@chilla.local
cab5981250 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into  chilla.local:/home/mydev/mysql-4.0-bug20719
2006-09-27 12:29:12 +02:00
svoj@mysql.com/april.(none)
c41bd4461b Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-27 15:25:00 +05:00
istruewing@chilla.local
fdc6500965 Merge chilla.local:/home/mydev/mysql-4.1-bug20719-m
into  chilla.local:/home/mydev/mysql-5.0-bug20719-m
2006-09-27 12:03:49 +02:00
istruewing@chilla.local
ac778232cd Bug#20719 - Reading dynamic records with write buffer could fail
After merge fix.
2006-09-27 11:55:30 +02:00
gkodinov/kgeorge@macbook.gmz
903387afc0 Bug #21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
- reversed the patch for 5.0 and moved to 5.1
2006-09-27 12:53:53 +03:00
istruewing@chilla.local
6ff6d80e57 Merge chilla.local:/home/mydev/mysql-4.1-bug20719
into  chilla.local:/home/mydev/mysql-4.1-bug20719-m
2006-09-27 09:30:54 +02:00
holyfoot/hf@mysql.com/deer.(none)
542cdbbc42 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/mysql-5.0-mrg
2006-09-27 11:46:02 +05:00
holyfoot/hf@mysql.com/deer.(none)
4716c99a17 Merge bk@192.168.21.1:mysql-4.1-opt
into  mysql.com:/home/hf/work/mysql-4.1.15428
2006-09-27 11:44:05 +05:00
msvensson@neptunus.(none)
35ca84b31d Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-26 17:53:01 +02:00
msvensson@neptunus.(none)
43f67cc4de Fir problem with winepath in mwenv 2006-09-26 17:52:15 +02:00
msvensson@neptunus.(none)
f84b9577e2 Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-26 16:29:36 +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)
85cdcc8ea4 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-26 16:04:16 +02:00
msvensson@neptunus.(none)
14b02f75aa Merge neptunus.(none):/home/msvensson/mysql/bug18969/my50-bug18969
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-26 15:07:00 +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
joerg@trift2.
3799f32f76 Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-09-26 12:00:18 +02:00
msvensson@neptunus.(none)
06ae3e0e5f Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-25 20:25:13 +02:00
msvensson@neptunus.(none)
e12092627e Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-09-25 20:15:51 +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
igor@rurik.mysql.com
df1376a542 Merge rurik.mysql.com:/home/igor/mysql-5.0-opt
into  rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug21646
2006-09-25 07:40:54 -07:00
msvensson@neptunus.(none)
64a64d0fbf Import yaSSL version 1.4.0 2006-09-25 16:40:29 +02:00
igor@rurik.mysql.com
c0569012d0 Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-09-25 06:46:15 -07:00