into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss11
Null merge

into  mysql.com:/home/novo/MySQL/mysql-5.0

  * made the following changes for the generic 5.0 RPM spec file
  - Added zlib to the list of (static) libraries installed
  - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
  - Compile MySQL with bundled zlib
  - Fixed %packager name to "MySQL Production Engineering Team"

into  mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss11

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into mysql.com:/M41/mysql-4.1

 table' lockup".
 Changes from the innodb-4.1-ss11 snapshot.
 Do not call os_file-create_tmpfile() at runtime. Instead, create
 a tempfile at startup and guard access to it with a mutex.
 Also, fix bugs:
 10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE";
 13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN
 KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that
 datatypes between foreign key references are compatible.
 Also, added test cases (also for bug 9802).

Manual merge from 4.1,
extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.

Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
The value is not important, and it depends on timing. Mask it.

Backport and extension of a fix made by Matthias in 5.0, originally it was
1.1976 05/12/05 17:57:48 mleich@mysql.com

into  mysql.com:/home/alexi/dev/mysql-5.0-14614

  Post review corrections in comments.

 error message if database is changed.

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2

into  devsrv-b.mysql.com:/space/magnus/my50-bug9535

to Crash": the bug was that due to non-standard name
resolution precedence in stored procedures (See Bug#5967)
a stored procedure variable took precedence over a table column
when the arguments for VALUES() function were resolved.
The implementation of VALUES() function was not designed to work
with Item_splocal and crashed.
VALUES() function is non-standard. It can refer to, and
is meaningful for, table columns only. The patch disables SP 
variables as possible arguments of VALUES() function.

handling so that indexes are closed before trying to commit the
transaction. (Bug #15536)

into  devsrv-b.mysql.com:/space/magnus/my50-bug9535

into  mysql.com:/home/dlenev/src/mysql-5.0-merges

into  mysql.com:/home/dlenev/src/mysql-5.0-merges

into  devsrv-b.mysql.com:/space/magnus/my50-bug9535

into  neptunus.(none):/home/msvensson/mysql/bug9535/my50-bug9535

into  mysql.com:/home/dlenev/src/mysql-5.0-merges

into  mysql.com:/home/dlenev/src/mysql-5.0-merges

into  devsrv-b.mysql.com:/space/magnus/my41-bug9535

into  mysql.com:/home/jimw/my/mysql-5.0-release

into  mysql.com:/opt/local/work/mysql-5.0-root

into  mysql.com:/home/dlenev/src/mysql-5.0-merges

latin5.xml:
  - Fixing order thee Turkish letters to conform Turkish rules.
  - All non-Turkish accented letters are mappend
    to their non-accented counterparts.

into  devsrv-b.mysql.com:/space/magnus/my41-bug9535

   - Set max_length of Item_func_uuid to max_length*system_charset_info->mbmaxlen
    Note! Item_func_uuid should be set to use 'ascii' charset when hex(), format(), md5()
etc will use 'ascii'
    - Comitting again, the old patch seems to have been lost.

into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-sp-vars-merge-2

according to the standard.

The idea is to use Field-classes to implement stored routines
variables. Also, we should provide facade to Item-hierarchy
by Item_field class (it is necessary, since SRVs take part
in expressions).

The patch fixes the following bugs:
  - BUG#8702: Stored Procedures: No Error/Warning shown for inappropriate data 
    type matching; 
 
  - BUG#8768: Functions: For any unsigned data type, -ve values can be passed 
    and returned; 
 
  - BUG#8769: Functions: For Int datatypes, out of range values can be passed 
    and returned; 
 
  - BUG#9078: STORED PROCDURE: Decimal digits are not displayed when we use 
    DECIMAL datatype; 
 
  - BUG#9572: Stored procedures: variable type declarations ignored; 
 
  - BUG#12903: upper function does not work inside a function; 
 
  - BUG#13705: parameters to stored procedures are not verified; 
 
  - BUG#13808: ENUM type stored procedure parameter accepts non-enumerated
    data; 
 
  - BUG#13909: Varchar Stored Procedure Parameter always BINARY string (ignores 
    CHARACTER SET); 
 
  - BUG#14161: Stored procedure cannot retrieve bigint unsigned;

  - BUG#14188: BINARY variables have no 0x00 padding;

  - BUG#15148: Stored procedure variables accept non-scalar values;

current SP tables locking make impossible view security" with main tree.