Commit graph

27997 commits

Author SHA1 Message Date
ramil@mysql.com
c0cdfe8599 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b15047
2005-11-24 13:42:47 +04:00
stewart@mysql.com
15227ff369 BUG#15215 mysqld fails at start-up because of illegal reply from mgmd
In the rare circumstance where a mysqld connects to a mgm server, then the
mgm server goes away before a node id can be allocated, it was possible to get
an Error in mgm protocol parser error message.
2005-11-24 17:30:25 +11:00
jimw@mysql.com
81cb8ad37d Fix handling of maximum value for MAX_ROWS on 64-bit platforms. (Bug ) 2005-11-23 17:05:59 -08:00
monty@mysql.com
f5804869e3 Don't use PATH_MAX for FN_REFLEN as this uses too much stack space
Larger stack size neaded for open table on x86 64 bit
Fix failing test cases
Deleted symlink from bk
2005-11-24 02:36:28 +02:00
jimw@mysql.com
86beb208aa Fix result of ROW_COUNT() after 'EXECUTE prepstmt'. (Bug ) 2005-11-23 14:57:26 -08:00
ranger@regul.home.lan
c571ec2da2 Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  regul.home.lan:/mnt/md/bk/mysql-5.0
2005-11-24 00:37:46 +02:00
konstantin@mysql.com
6fab184f30 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-root
2005-11-23 21:20:31 +03:00
konstantin@mysql.com
b1d951d462 Always initialize THD::thread_stack: it's used in
check_stack_overrun().
2005-11-23 21:18:10 +03:00
serg@serg.mylan
d50e8ea227 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-23 13:02:50 +01:00
pem@mysql.com
0411412403 Fixed BUG#13729 Stored procedures: packet error after exception handled
Don't set thd->is_fatal_error in sql_update for duplicate key errors.
2005-11-23 11:56:53 +01:00
bell@sanja.is.com.ua
1343975dda A name of macro is fixed. 2005-11-23 12:26:07 +02:00
serg@serg.mylan
151d75c241 merged 2005-11-23 09:52:18 +01:00
joerg@mysql.com
205c6fc1e9 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-11-23 09:38:12 +01:00
bell@sanja.is.com.ua
83d692da88 postmerge fix 2005-11-23 02:49:44 +02:00
bell@sanja.is.com.ua
e6b04edbb1 merge 2005-11-23 01:29:25 +02:00
bell@sanja.is.com.ua
db8f03ebe8 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
2005-11-23 01:28:32 +02:00
bell@sanja.is.com.ua
7bd691f11e Recursion support made for SP (BUG#10100). 2005-11-23 01:11:19 +02:00
bell@sanja.is.com.ua
7d2442a160 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
2005-11-23 00:58:13 +02:00
bell@sanja.is.com.ua
2bcd68973b Fix for BUG#13549 "Server crash with nested stored procedures
if inner routine has more local variables than outer one, and
one of its last variables was used as argument to NOT operator".

THD::spcont was non-0 when we were parsing stored routine/trigger
definition during execution of another stored routine. This confused
methods of Item_splocal and forced them use wrong runtime context.
Fix ensures that we always have THD::spcont equal to zero during
routine/trigger body parsing. This also allows to avoid problems
with errors which occur during parsing and SQL exception handlers.
2005-11-23 00:50:37 +02:00
ranger@regul.home.lan
6d34770eb3 Added support of stress mode to mysql-test-run.pl
Corrected function declaration
2005-11-22 23:46:54 +02:00
serg@serg.mylan
419d82f8c2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-22 21:16:11 +01:00
serg@serg.mylan
39cc20a265 German error messages 2005-11-22 21:10:38 +01:00
joerg@mysql.com
511fbac4df Manual merge from 4.1, bug#15145. 2005-11-22 20:15:54 +01:00
joerg@mysql.com
c735d07dec support-files/mysql.spec.sh
Fix a possible problem on RPM un-install. bug#15145
2005-11-22 19:58:58 +01:00
pem@mysql.com
7827fec43e Set type and default correctly for local SP variables during parsing. 2005-11-22 16:01:04 +01:00
pem@mysql.com
6c2f6e29b9 Post-merge fixes in sp_head.cc (print methods). 2005-11-22 14:25:44 +01:00
pem@mysql.com
d71d1242ff Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/show-sp-code/mysql-5.0
2005-11-22 13:24:53 +01:00
pem@mysql.com
962d2df6b0 Some final cleanup of the sp_instr print methods. 2005-11-22 13:06:52 +01:00
lars@mysql.com
a0487a8220 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
2005-11-22 11:34:55 +01:00
lars@mysql.com
9851469d12 Added explicit casts, since on i686, the fprintf function does not cast my_off_t correctly.
Changed wrong printf to fprintf.
2005-11-22 02:40:08 +01:00
ingo@production.mysql.com
c2abd08da5 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
2005-11-22 02:26:21 +01:00
kent@mysql.com
1483379b4c Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-11-22 01:47:15 +01:00
kent@mysql.com
9b14ee2ebc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
2005-11-22 01:17:06 +01:00
ingo@production.mysql.com
49ed3c589d Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
2005-11-21 23:30:14 +01:00
bell@sanja.is.com.ua
7f162c7899 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
2005-11-21 21:15:48 +02:00
bell@sanja.is.com.ua
fe44e364ca Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
2005-11-21 21:14:36 +02:00
bell@sanja.is.com.ua
87a199fc2a Avoiding removing dummy TABLE allocated on the stack (BUG#14726). 2005-11-21 21:11:02 +02:00
joerg@mysql.com
84bc725fb9 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-11-21 18:31:36 +01:00
bar@mysql.com
3d1c1d7f68 cast.result:
Fixing test results accordingly.
item_timefunc.cc:
  Displaying BINARY or CHAR in error messages,
  depending on the character set.
2005-11-21 21:11:28 +04:00
bar@mysql.com
225d009c6a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b14255
2005-11-21 20:01:16 +04:00
bar@mysql.com
435c2ba671 Additional fix for Bug#14255 CAST(x AS BINARY(N)) does not pad
cast.result:
cast.test:
  Avoid 0x00 byte in test results, use HEX instead.
2005-11-21 19:59:58 +04:00
eric@mysql.com
519139b63a Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/eric/fed-err-mysql-5.0
2005-11-21 07:52:21 -08:00
pem@mysql.com
7b78489e2d Check for zlib with a zzlibCompileFlags() function in config/ac-macros/zlib.m4.
(Patch provided by serg)
2005-11-21 16:05:40 +01:00
eric@mysql.com
ec341f0303 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/eric/fed-err-mysql-5.0
2005-11-21 07:05:14 -08:00
joerg@mysql.com
b3b124f9e4 Merge the last 5.0.16 (Unix, Windows) and 5.0.16a (Netware) changes to the general tree. 2005-11-21 15:49:34 +01:00
ingo@mysql.com
a0f14eb8ef Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug13707
2005-11-21 15:28:21 +01:00
bar@mysql.com
174d28e4cc Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b14255
2005-11-21 17:57:14 +04:00
bar@mysql.com
2f72e05903 Bug#10446 Illegal mix of collations:
item_strfunc.h, item_strfunc.cc, item.cc:
  Try to convert a const item into destination 
  character set. If conversion happens without
  data loss, then cache the converted value
  and return it during val_str().
  Otherwise, if conversion loses data, return
  Illeral mix of collations error, as it happened
  previously.
ctype_recoding.result, ctype_recoding.test:
  Fixing tests accordingly.
2005-11-21 17:26:31 +04:00
aivanov@mysql.com
d741ce9017 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/dev/mysql-5.0-14554
2005-11-21 15:56:29 +03:00
msvensson@neptunus.(none)
c9e0aab7b6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-11-21 13:42:36 +01:00