Commit graph

32241 commits

Author SHA1 Message Date
rburnett@bk-internal.mysql.com
f80ba7a147 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-28 17:56:44 +02:00
timour/tkatchaounov@dl145s.mysql.com
4761ea5c82 Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  dl145s.mysql.com:/data/tkatchaounov/autopush/5.0-bug-21456
2006-08-28 16:08:48 +02:00
jonas@perch.ndb.mysql.com
67a5d98c1d ndb - bug#21615
Improve error message when detecting corrupted REDO log
2006-08-28 10:26:21 +02:00
evgen@moonbone.local
109d58af66 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-08-27 23:43:11 +04:00
evgen@moonbone.local
7a55f7fac4 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
into  moonbone.local:/work/tmp_merge-5.0-mysql
2006-08-27 00:32:14 +04:00
evgen@moonbone.local
13f50fdb69 Merge moonbone.local:/work/tmp_merge-4.1-mysql
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-08-26 23:11:34 +04:00
evgen@moonbone.local
bafd6d5065 Merge moonbone.local:/work/tmp_merge-5.0-opt-mysql
into  moonbone.local:/work/tmp_merge-5.0-mysql
2006-08-26 22:17:34 +04:00
msvensson@neptunus.(none)
4703f302fe Dont' ever use cluster for slave in 4.1 2006-08-26 18:38:42 +02:00
kaa@polly.local
b0619ace21 Post-review fix (bug #21250) 2006-08-26 10:21:26 +04:00
andrey@example.com
3cbb16587f Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  example.com:/work/mysql-5.0-runtime
2006-08-25 20:04:19 +02:00
jonas@perch.ndb.mysql.com
f03cdb01aa Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-08-25 19:07:58 +02:00
cmiller@zippy.cornsilk.net
c7431de431 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-release_mergable
into  zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-release
2006-08-25 11:56:19 -04:00
cmiller@zippy.cornsilk.net
5ea2a01fee Merge zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-release_mergable
into  zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-maint
2006-08-25 11:55:43 -04:00
cmiller@zippy.cornsilk.net
89d759b93e Bug#21543: 5.0.24 breaks ABI compatibility for python bindings: \
InterfaceError on connect

Removed the bool flag from the st_mysql_options struct, since it adds 
another word in size to the memory size and shifts member memory locations
down, both of which break binary-interface compatibility.

Instead, use a flag, 2**30, in the client_options bit-field to represent
that the client should check the SSL certificate of the server.
2006-08-25 11:54:33 -04:00
msvensson@neptunus.(none)
5abbe9eb00 Ignore --skip-im if specified on command line
Null merge to 5.0
2006-08-25 17:01:04 +02:00
kaa@polly.local
17a3c45122 Added stacktrace dumps for x86_64 (bug #21250)
Fixed stacktrace dumps for i386/NPTL
2006-08-25 17:59:47 +04:00
andrey@example.com
f115ecf89f Fix for bug#21795: SP: sp_head::is_not_allowed_in_function() contains
erroneous check

Problem: Actually there were two problems in the server code. The check
for SQLCOM_FLUSH in SF/Triggers were not according to the existing
architecture which uses sp_get_flags_for_command() from sp_head.cc .
This function was also missing a check for SQLCOM_FLUSH which has a
problem combined with prelocking. This changeset fixes both of these
deficiencies as well as the erroneous check in
sp_head::is_not_allowed_in_function() which was a copy&paste error.
2006-08-25 15:51:29 +02:00
msvensson@neptunus.(none)
7e8f06c46f Add mysqld-max-nt to list of mysqld executales to look for on windows 2006-08-25 15:23:42 +02:00
msvensson@neptunus.(none)
f0c4aba723 Backport from 5.0 a fix that will start ndb only for tests that needs it 2006-08-25 15:17:03 +02:00
sergefp@mysql.com
46480b22d2 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/psergey/mysql-5.0-bug16255-merge
2006-08-25 14:44:28 +04:00
anozdrin/alik@alik.
7121f5b351 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  alik.:/mnt/raid/alik/MySQL/devel/5.0-rt-bug16899
2006-08-25 13:37:07 +04:00
igor@rurik.mysql.com
d10d5b835d Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-08-25 02:18:30 -07:00
igor@rurik.mysql.com
218a96d2c6 Fixed bug #21390: wrong estimate of rows after elimination of
const tables. This resulted in choosing extremely inefficient
execution plans in same cases when distribution of data in
joined were skewed (see the customer test case for the bug).
2006-08-25 02:17:41 -07:00
msvensson@neptunus.(none)
31aa966718 Fix running tests suite with non standard tmp dir.
Default is "var/tmp"
2006-08-25 10:46:14 +02:00
msvensson@neptunus.(none)
655bdac0bc Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-08-25 10:11:55 +02:00
msvensson@neptunus.(none)
37be9fa3a7 Backport fix for finding executables from 5.0 2006-08-25 10:11:15 +02:00
kroki/tomash@moonlight.intranet
e48e2e4613 Comment cleanup after push of bug#21166. 2006-08-25 11:34:13 +04:00
evgen@sunlight.local
32cab70cfa opt_range.cc:
Corrected fix for bug#18165
2006-08-25 00:23:42 +04:00
evgen@moonbone.local
7240c97d48 opt_range.cc:
Corrected fix for bug#18165
2006-08-24 23:16:54 +04:00
andrey@example.com
85e6c3bfc1 Fix for bug#21416 SP: Recursion level higher than zero needed for non-recursive call
The following procedure was not possible if max_sp_recursion_depth is 0
create procedure show_proc() show create procedure show_proc;
  
Actually there is no recursive call but the limit is checked.
  
Solved by temporarily increasing the thread's limit just before the fetch from cache
and decreasing after that.
2006-08-24 19:36:26 +02:00
sergefp@mysql.com
84e9cb794f BUG#16255: Merge to 5.0 2006-08-24 20:56:28 +04:00
iggy@rolltop.ignatz42.dyndns.org
e4bfce3058 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972
2006-08-24 11:19:33 -04:00
sergefp@mysql.com
848548e16f BUG#16255: Post-review fixes: adjust the testcase. 2006-08-24 19:16:27 +04:00
iggy@rolltop.ignatz42.dyndns.org
8bc745456f Bug #11972: client uses wrong character set after reconnect.
The mysql client uses the default character set on reconnect.  The default character set is now controled by the client charset command while the client is running.  The charset command now also issues a SET NAMES command to the server to make sure that the client's charset settings are in sync with the server's.
2006-08-24 11:15:08 -04:00
sergefp@mysql.com
d4cacdb5cc Bug #16255: Subquery in WHERE (the cset by Georgi Kodinov)
Must not use Item_direct_ref in HAVING because it points to
 the new value (witch is not yet calculated for the first row).
2006-08-24 19:14:36 +04:00
anozdrin/alik@alik.
ad7d4b0c3f Polishing (was the part of original patch for BUG#16899):
Changed trigger-handling code so that there will be the one
place for generate statement string for replication log
and for trigger file.
2006-08-24 18:48:26 +04:00
msvensson@neptunus.(none)
0b3c2aa1b3 Merge neptunus.(none):/home/msvensson/mysql/bug21749/my50-bug21749
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-24 16:46:37 +02:00
msvensson@neptunus.(none)
984e9ce099 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-24 16:08:25 +02:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
68e1e60f27 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-maint
2006-08-24 14:51:54 +02:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
13e0fa2ccf Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1-maint
2006-08-24 14:48:22 +02:00
anozdrin/alik@alik.
df28e14b3a Fix for BUG#16899: Possible buffer overflow in handling of DEFINER-clause
User name (host name) has limit on length. The server code relies on these
limits when storing the names. The problem was that sometimes these limits
were not checked properly, so that could lead to buffer overflow.
  
The fix is to check length of user/host name in parser and if string is too
long, throw an error.
2006-08-24 16:29:24 +04:00
kroki/tomash@moonlight.intranet
b6bee0a394 BUG#21166: Prepared statement causes signal 11 on second execution
Changes in an item tree done by optimizer weren't properly
registered and went unnoticed, which resulted in preliminary freeing
of used memory.
2006-08-24 15:49:12 +04:00
msvensson@neptunus.(none)
b25b49a05a Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060612110740|13873 2006-08-24 11:39:52 +02:00
jonas@perch.ndb.mysql.com
7cb75fc850 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-24 07:18:04 +02:00
jonas@perch.ndb.mysql.com
b60be73461 ndb - bug#21800
read TransactionDeadlockTimeout (for scans) to cater for insane settings
2006-08-24 07:14:46 +02:00
tsmith@maint1.mysql.com
2225f14755 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  maint1.mysql.com:/data/localhome/tsmith/bk/50
2006-08-24 02:49:03 +02:00
tsmith@maint1.mysql.com
679d1e27ed Merge tim@tsmith.mysql.internal:m/bk/41
into  maint1.mysql.com:/data/localhome/tsmith/bk/41
2006-08-24 02:44:49 +02:00
tsmith/tim@siva.hindu.god
80e565dfe1 Merge siva.hindu.god:/usr/home/tim/m/bk/beef-50
into  siva.hindu.god:/usr/home/tim/m/bk/50
2006-08-23 18:31:15 -06:00
tsmith/tim@siva.hindu.god
df6b8516c4 Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41
into  siva.hindu.god:/usr/home/tim/m/bk/beef-50
2006-08-23 18:24:59 -06:00
tsmith/tim@siva.hindu.god
e8cbda2c27 Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41
into  siva.hindu.god:/usr/home/tim/m/bk/41
2006-08-23 18:06:07 -06:00