Please use "ul" when merging this changeset to 5.0.

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461

  Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)

into  mysql.com:/usr/home/ram/work/4.1.b15195

to avoid the potential security problem.
(see bug #15195: Security Breach with MERGE table)

into  mysql.com:/home/hf/work/mysql-4.1.16017

into  mysql.com:/home/hf/work/mysql-4.1.16017

into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5

into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5

into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-15977

do not look for client-specific commands while inside a multi-line comment.
we will allow multi-comments pretty much anywhere within SQL-statements,
but client-specific commands (help, use, print, ...) must be the first token
in the input.

into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-4.1-rpl

into  maint1.mysql.com:/data/localhome/cmiller/mysql-4.1

into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5

    
The problem is that the author used the wrong function to send a warning to the 
user about truncation of data.  push_warning() takes a constant string and 
push_warning_printf() takes a format and variable arguments to fill it.

Since the string we were complaining about contains percent characters, the 
printf() code interprets the "%Y" et c. that the user sends.  That's wrong, and
often causes a crash, especially if the date mentions seconds, "%s".

A alternate fix would be to use  push_warning_printf(..., "%s", warn_buff) .

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-4.1

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-bug20847

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41

closing temp tables through end_thread
had a flaw in binlog-off branch of close_temporary_tables where
next table to close was reset via table->next
 for (table= thd->temporary_tables; table; table= table->next)
which was wrong since the current table instance got destoyed at
	close_temporary(table, 1);

The fix adapts binlog-on branch method to engage the loop's internal 'next' variable which holds table->next prior table's destoying.

into  chilla.local:/home/mydev/mysql-4.1-amerge

into  chilla.local:/home/mydev/mysql-4.1-amerge

into  chilla.local:/home/mydev/mysql-4.1-amerge

into  chilla.local:/home/mydev/mysql-4.1-amerge

have a better test (and so this should be null-merged there).

ALSO!  Make it so that it accepts NPTL as a valid _equivalent_ implementation.

into  mysql.com:/usr/home/bar/mysql-4.1.b17647

into  bodhi.netgear:/opt/local/work/mysql-4.1-19399

dropping/creating tables".

The bug could lead to a crash when multi-delete statements were
prepared and used with temporary tables.

The bug was caused by lack of clean-up of multi-delete tables before
re-execution of a prepared statement. In a statement like
DELETE t1 FROM t1, t2 WHERE ... the first table list (t1) is
moved to lex->auxilliary_table_list and excluded from lex->query_tables
or select_lex->tables. Thus it was unaccessible to reinit_stmt_before_use
and not cleaned up before re-execution of a prepared statement. 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main

- don't invalidate tables that are in state RETRIEVING

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1

into  mysql.com:/space_old/pekka/ndb/version/my41

  "temporary table with data directory option fails"
  myisam should not use user-specified table name when creating
  temporary tables and use generated connection specific real name.
  Test included.

into mysql.com:/M41/bug20216-4.1

into  clam.ndb.mysql.com:/space/pekka/ndb/version/my41