into mysql.com:/home/mysql_src/mysql-4.0

in a deadlock-free manner. This splits locking the global read lock in two steps.
This fixes a consequence of this bug, known as:
BUG#4953 'mysqldump --master-data may report incorrect binlog position if using InnoDB'
And a test.

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

  innobase_mysql_tmpfile(): call dup() and my_close() on the file
  returned by create_temp_file()
  in order to avoid memory leak caused by my_open() being paired with close()

Removed improper casts.
Thanks to Joerg Bruehe for the fix.

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

into mysql.com:/home/mysql_src/mysql-4.0

replacing the no_log argument of mysql_create_table() by some safer method
(temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
is opened by mysql_create_table().

SELECT ... UNION and INSERT ... SELECT ... UNION

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
mysqld.cc, ha_innodb.cc:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) 

bug#4925

into mysql.com:/home/mysql_src/mysql-4.0

that was a forgotten '~' probably.

into hundin.mysql.fi:/home/heikki/mysql-4.0

mysql outwits itself.

into hundin.mysql.fi:/home/heikki/mysql-4.0

into mysql.com:/home/mysql_src/mysql-4.0

The binlog files we use for some tests must be installed like other mysql-test/std_data/ files.

  Fix bug: if we RENAME a table, InnoDB forgot to load the foreign key constraints that reference the new table name, and forgot to check that they are compatible with the table

Adding a compilation define so that on recent Darwin mysqld does not react to SIGHUP and SIGQUIT:
this fixes a rpl000001 problem on our Powermac G5 machine (popping after an upgrade from 10.3.4 to
10.3.5) and is expected to fix 
BUG#2030 "relay bin log on slave resets multiple times a second"
(i.e. under some Mac OS X Panther versions, mysqld receives many SIGHUP and SIGQUIT).
So this fix is more a problem-hider than a real understanding of why mysqld receives so many signals.
Note that we saw other problems on this OS where mysqld reacts to Ctrl-Z but apparently only once,
where using SSL seems to make the problem more frequent...

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

into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_4973/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_4973/mysql-4.0

   - resorting to having to separate sections for darwin7 and darwin8

       from the select list and TEXT field 

make setup_copy_fields to insert Item_copy_string for blobs in 
the beginning of the copy_funcs (push_back instead of push_front)

the thing is that Item_copy_string::copy for function can call 
Item_copy_string::val_int for blob via Item_ref.
But if Item_copy_string::copy for blob isn't called before, 
it's value will be wrong.

So all the Item_copy_string::copy for blobs should be called before 
Item_copy_string::copy for functions.

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