into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-runtine-merge

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge

into  janus.mylan:/usr/home/serg/Abk/m51

how did it get in?!? (it's only in local csets so no other tree is affected)

into janus.mylan:/usr/home/serg/Abk/m51

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge

  After merge fix

into  lmy004.:/work/mysql-5.1-runtime

    
create function func() returns char(10) binary ...
is no more possible. This will be reenabled when 
bug 2676 "DECLARE can't have COLLATE clause in stored procedure"
is fixed.

Fix after 2nd review

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-rt-merge

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge

  After merge fix

into  sunlight.local:/local_work/leak_fix-5.1-mysql

into  sunlight.local:/local_work/leak_fix

into  sunlight.local:/local_work/leak_fix

(this is not a fix to the bug, but simply to disable the test in 
order to push a 5.0 to 5.1 merge)

This merge contains:

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge

  Correct memory leak fix

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge

we didn't check for NULL value of the
lex_create_info->db_type pointer.
The pointer is NULL in the case, when the engine name is
unknown to the server. This happens with NDB on Windows.

  Memory leak fix

into  sunlight.local:/local_work/leak_fix

into  sunlight.local:/local_work/leak_fix

  Memory leak fix

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.

into  mysql.com:/home/cps/mysql/devel/5.1-curs-bug

into  maint1.mysql.com:/data/localhome/tsmith/bk/mrg51-c

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint

into  rama.(none):/home/jimw/my/mysql-5.1-clean