jimw@rama.(none)
7a23b1baf7
Merge rama.(none):/home/jimw/my/mysql-5.0-clean
...
into rama.(none):/home/jimw/my/mysql-5.1-clean
2006-09-28 20:20:33 -07:00
jimw@rama.(none)
d5d89bcf63
Fix merge of __attribute__ cleanup.
2006-09-28 20:15:58 -07:00
jimw@rama.(none)
68eadc8a79
Merge rama.(none):/home/jimw/my/mysql-4.1-clean
...
into rama.(none):/home/jimw/my/mysql-5.0-clean
2006-09-28 18:09:10 -07:00
jimw@rama.(none)
c8801bcecc
Merge rama.(none):/home/jimw/my/mysql-5.0-clean
...
into rama.(none):/home/jimw/my/mysql-5.1-clean
2006-09-28 18:00:26 -07:00
jimw@rama.(none)
9c3012e646
Merge rama.(none):/home/jimw/my/mysql-5.0-18246
...
into rama.(none):/home/jimw/my/mysql-5.0-clean
2006-09-28 17:56:51 -07:00
iggy@rolltop.ignatz42.dyndns.org
78154af633
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
2006-09-28 15:54:59 -04:00
iggy@rolltop.ignatz42.dyndns.org
ff66360d99
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my50-bug22224
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my51-bug22224
2006-09-28 15:30:22 -04:00
iggy@rolltop.ignatz42.dyndns.org
e89c10e99c
Bug#22224: Windows build depends on ib_config.h
...
This change has already been made to 5.1.
2006-09-28 15:18:33 -04:00
iggy@rolltop.ignatz42.dyndns.org
70dcbe3e6c
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305
2006-09-28 14:33:39 -04:00
iggy@rolltop.ignatz42.dyndns.org
d36444a9ec
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305
2006-09-28 14:32:30 -04:00
iggy@rolltop.ignatz42.dyndns.org
f063bee3b2
Bug#20305: PROCEDURE ANALYSE() returns wrong M for FLOAT(M, D) and DOUBLE(M, D)
2006-09-28 14:30:20 -04:00
iggy@rolltop.ignatz42.dyndns.org
e58341f53b
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my50-bug21449
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my51-bug21449
2006-09-28 14:01:12 -04:00
iggy@rolltop.ignatz42.dyndns.org
b7e1578264
Bug #21449 How to Resolve Stack Trace URL in MySQLD error log is incorrect.
2006-09-28 13:58:53 -04:00
cmiller@zippy.cornsilk.net
43bdd2c2ed
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-28 10:32:37 -04:00
cmiller@zippy.cornsilk.net
e72bc63906
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-28 10:15:32 -04:00
cmiller@zippy.cornsilk.net
2deb2bfc6e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
2006-09-28 09:52:46 -04:00
cmiller@zippy.cornsilk.net
ce24cb2d98
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
2006-09-28 09:51:46 -04:00
cmiller@zippy.cornsilk.net
75a1d1d56f
Additional patch to Bug#21476: Free newly-allocated memory in mysqltest.
2006-09-28 09:51:06 -04:00
msvensson@neptunus.(none)
5f099df3be
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-28 13:54:48 +02:00
cmiller@zippy.cornsilk.net
6042eebda6
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-28 07:35:04 -04:00
cmiller@zippy.cornsilk.net
ca7ade8825
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-28 07:30:24 -04:00
cmiller@zippy.cornsilk.net
290bb8ec14
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-28 07:26:45 -04:00
cmiller@zippy.cornsilk.net
a627b52843
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-28 07:20:50 -04:00
msvensson@neptunus.(none)
648a9ae116
Increase time to wait for mysqld to get restarted(it will take some time when running in valgrind)
2006-09-28 11:53:42 +02:00
msvensson@neptunus.(none)
3f59918eab
Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-28 10:39:55 +02:00
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
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
petr/cps@owlet.local
64c2c0cb19
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/cps/mysql/trees/5.1-runtime-new
2006-09-28 04:44:55 +04: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
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@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@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)
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
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)
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)
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)
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)
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