into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged

into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged

into  example.com:/work/mysql-5.1-runtime-fresh2

into  mysql.com:/home/cps/mysql/trees/5.1-runtime-new

into  example.com:/work/mysql-5.1-runtime-fresh2

  
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.

at the moment, so we can safely do that). Update an error
mesage to make it translateable.

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

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21414

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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-runtime

A better fix for bug#10025.

Fixed test case plus added new tests.

After fixing Bug#20208 "Blobs greater than 8K are being truncated to 8K"
the fix to bug#10025 "Misleading error with COLLATE mediumtext and UNION"
became more accurate. Earlier mediumtext got converted to longtext,
although mediumtext was enough to contain the results. Now it converts
correctly to mediumtext, if the length does not exceed that and if none
of the original fields were type longtext.

Type longtext still converts correctly to type longtext, as the extra
tests prove.

when set to DISABLED
  
It was a silly ordering number error.

  
ALTER EVENT in stored procedure body led to a crash during the
procedure call. Affected was only ALTER EVENT which changed the
interval of the event. No problems with AT, STARTS, ENDS and so on.

into  neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my51-bug22379_runtime

Remove race situations that occur when removing pidfiles. Primarily each process should remove its own
pidfile, secondly it should be removed by the process that created it and _only_ if it's
certain the process is dead. Third, mysql-test-run.pl will remove the pidfile when process has been killed.
- Set state of an instance to STARTING _before_ calling instance->start()
- Check that pidfile of instance has been created before changing STARTING => STARTED
- Only remove the pidfile if IM kills an instance with SIGKILL, otherwise the instance will remove it itself

into  production.mysql.com:/usersnfs/jamppa/mysql-5.1-bug-20208

into  mysql.com:/Users/kent/mysql/bk/mysql-5.1

into  mysql.com:/Users/kent/mysql/bk/mysql-5.0

  Filter out plain -O and Sun C/C++ style optimization flags, -xO<level>
  Filter out icc specific options from cflags/libs(_r)

into  zim.(none):/home/brian/mysql/merge-5.1

  Added "test" RPM package
  Install all binaries "make install" would
make_binary_distribution.sh:
  Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)

into  zim.(none):/home/brian/mysql/merge-5.1

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1

into  zim.(none):/home/brian/mysql/arch-5.1

into  zim.(none):/home/brian/mysql/merge-5.1

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge