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

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

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

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

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

into mysql.com:/space/my/mysql-5.0

into mysql.com:/space/my/mysql-5.0

into mysql.com:/Users/mikron/bug10837

Moved enabling of warnings to ensure that no warnings are generated
when this test case is executed on a clone where InnoDB is not
activated. This would fail the test case in those clones otherwise.

into mysql.com:/home/pem/work/mysql-5.0

  Return an error if default() is used on a local variable.
  This is actaully a side-effect of BUG#5967: Stored procedure declared
  variable used instead of column (to be fixed later), so this is really a
  workaround until that is fixed.

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

After merge fixes.

- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
  spec file)

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

into mysql.com:/space/my/mysql-4.1

  Have to catch errors from SELECT when opening a cursor.

Manual merge from 4.1.

into siva.hindu.god:/opt/home/tim/m/50/a

After merge fix.

into xiphis.org:/usr/home/antony/work2/p4-bug10413.2

Hand merged from 4.0.

  Stop ignoring name parts and check for validity

                during creation.
  Although it returns an error, consistent with the behaviour for other objects.
  (Unclear why we would allow the creation of SPs with truncated names.)

merge with latest yaSSL, move templates instantiation into separate file where it is possible

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

  Fixed bug #10982.
item.cc:
  Fixed bug #10982. In the function Item_ref::val_decimal
  by mistake the method Item_ref::val_decimal was used
  instead of Item_ref::val_decimal_result.

  Post merge corrections.

into mysql.com:/home/pem/work/mysql-5.0

1.) Added a new option to mysql_lock_tables() for ignoring FLUSH TABLES.
Used the new option in create_table_from_items().
It is necessary to prevent the SELECT table from being reopend.
It would get new storage assigned for its fields, while the
SELECT part of the command would still use the old (freed) storage.
2.) Protected the CREATE TABLE and CREATE TABLE ... SELECT commands
against a global read lock. This prevents a deadlock in
CREATE TABLE ... SELECT in conjunction with FLUSH TABLES WITH READ LOCK
and avoids the creation of new tables during a global read lock.
3.) Replaced set_protect_against_global_read_lock() and
unset_protect_against_global_read_lock() by
wait_if_global_read_lock() and start_waiting_global_read_lock()
in the INSERT DELAYED handling.

into mysql.com:/home/gluh/MySQL/Merge/mysql-5.0