database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Code Activity
46,939 Commits 3,270 Branches 1,096 Tags
016bff8adcc2332772b51f8dbdc5a3d926f5a04c
Commit Graph

18065 Commits

Author SHA1 Message Date
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
msvensson@shellback.(none)
9157b04664 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-28 13:28:18 +02:00
anozdrin/alik@alik.
2c73dbfaac Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2006-09-28 15:10:18 +04:00
mikael/pappa@dator5.(none)
fef3cb337c Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 
into  dator5.(none):/home/pappa/bug18198
 2006-09-28 06:16:16 -04:00
mikael/pappa@dator5.(none)
c7a3df765d Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug18198
 2006-09-28 06:10:28 -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
gluh@gluh.(none)
b7e59b7085 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.1
 2006-09-28 14:09:31 +05:00
gkodinov@dl145s.mysql.com
3abb604333 Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-28 10:41:42 +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)
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)
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)
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
79d196be86 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21081
 2006-09-28 11:12:28 +04:00
andrey@example.com
00c54ad530 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  example.com:/work/mysql-5.1-runtime-fresh2
 2006-09-28 09:11:22 +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
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
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
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
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
e9ecbf5b46 post-merge fix 2006-09-27 22:14:31 +02: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
andrey@example.com
c4afe67ff5 Merge example.com:/work/mysql-5.0-runtime 
into  example.com:/work/mysql-5.1-runtime-fresh2
 2006-09-27 21:31:34 +02:00
kroki/tomash@moonlight.intranet
978d251834 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21081 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21081
 2006-09-27 23:26:13 +04: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)
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
gkodinov/kgeorge@macbook.gmz
4dcac0ff19 merge fixes 5.0-opt -> 5.1-opt 2006-09-27 17:49:51 +03:00
svoj@april.(none)
9353e3cf73 Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-27 18:58:23 +05:00
petr/cps@mysql.com/owlet.local
6cb96bb8b4 Remove unused error messages (no release contains them 
at the moment, so we can safely do that). Update an error
mesage to make it translateable.
 2006-09-27 17:48:00 +04: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)
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
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
e025b95e0f Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
 2006-09-27 15:00:00 +03: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
mikael/pappa@dator5.(none)
36017d0f49 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug18198
 2006-09-27 06:49:25 -04: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
gkodinov/kgeorge@macbook.gmz
24c5bf6a96 Bug#21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX 
- fix moved to 5.1
 2006-09-27 13:11:00 +03:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
a2f5edebfc One more fix for binlog_row_binlog due to interminism of checking with 
SHOW BINLOG event. The latter should be either fixed or replaced to favor
reading from binlog as the check.
 2006-09-27 13:05:29 +03:00
gkodinov/kgeorge@macbook.gmz
a01e7b12ce Merge macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.1-opt
 2006-09-27 13:03:41 +03:00