cmiller@zippy.cornsilk.net
733fa61ee3
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 10:10:41 -04:00
cmiller@zippy.cornsilk.net
b2ee81a6ec
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-28 10:09:57 -04:00
cmiller@zippy.cornsilk.net
56d2406375
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-09-28 10:02:53 -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
ramil/ram@mysql.com/myoffice.izhnet.ru
326a56dc3f
Fix for bug #22271 : data casting may affect data stored in the next column(s?)
...
Using wrong filling value may cause unneeded extra bit rewriting.
Fix: use proper value to fill uneven bits.
2006-09-28 17:00:29 +05: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
msvensson@shellback.(none)
c6dc92c8de
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-09-28 13:20:40 +02:00
istruewing@chilla.local
52758d8615
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug20719-m
2006-09-28 12:20:17 +02:00
istruewing@chilla.local
4027fc8dca
Bug#22384 - DELETE FROM table causes "Incorrect key file for table"
...
Deletes on a big index could crash the index when it needs to
shrink.
Put a forgotten negation operator in.
No test case. It is too big for the test suite. And it does not
work with 4.0, only with higher versions. It is attached to the
bug report.
2006-09-28 11:41:38 +02:00
msvensson@neptunus.(none)
8ee337a590
Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-28 11:05:28 +02:00
gkodinov@dl145s.mysql.com
de5542a0d9
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-28 10:37:21 +02:00
gkodinov@dl145s.mysql.com
b0167d265f
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-28 10:36:04 +02:00
gkodinov@dl145s.mysql.com
55cc4fd5c6
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-09-28 10:19:25 +02:00
msvensson@neptunus.(none)
3eb44cb137
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-28 09:32:49 +02:00
msvensson@neptunus.(none)
712a937e30
Increase test suite timeout to 3 hours
2006-09-28 09:30:24 +02:00
kroki/tomash@moonlight.intranet
7bfe643120
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21081
2006-09-28 11:04:49 +04:00
dlenev@mockturtle.local
7897f061aa
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mockturtle.local:/home/dlenev/src/mysql-4.1-runtime
2006-09-28 11:02:10 +04: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
andrey@example.com
3b672c9a3c
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into example.com:/work/mysql-5.0-runtime
2006-09-27 22:25:23 +02:00
andrey@example.com
a4093f31d8
Fix for bug#21311: Possible stack overrun if SP has non-latin1 name
...
There was possible stack overrun in an edge case which handles invalid body of
a SP in mysql.proc . That should be case when mysql.proc has been changed
manually. Though, due to bug 21513, it can be exploited without having access
to mysql.proc only being able to create a stored routine.
2006-09-27 21:23:17 +02:00
kroki/tomash@moonlight.intranet
0bdc597b52
BUG#21081: SELECT inside stored procedure returns wrong results
...
Re-execution of a parametrized prepared statement or a stored routine
with a SELECT that use LEFT JOIN with second table having only one row
could yield incorrect result.
The problem appeared only for left joins with second table having only
one row (aka const table) and equation conditions in ON or WHERE clauses
that depend on the argument passed. Once the condition was false for
second const table, a NULL row was created for it, and any field involved
got NULL-value flag, which then was never reset.
The cause of the problem was that Item_field::null_value could be set
without being reset for re-execution. The solution is to reset
Item_field::null_value in Item_field::cleanup().
2006-09-27 23:11:45 +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
jani@ua141d10.elisa.omakaista.fi
dc0164e9ae
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2006-09-27 15:04:11 +03: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