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) 


sql/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)
sql/mysqld.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)
innobase/include/srv0start.h:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/include/ut0dbg.h:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/ut/ut0dbg.c:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/ut/ut0mem.c:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/srv/srv0start.c:
  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.


libmysql/libmysql.c:
  When we read "disable-local-infile" from the option file specified by mysql_options(MYSQL_READ_DEFAULT_FILE),
  we must take CLIENT_LOCAL_FILES down (it was probably a forgotten '~').

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.


mysql-test/Makefile.am:
  The binlog files we use for some tests must be installed like other mysql-test/std_data/ files.
  Putting a * before 001 so that it works for 6-digit extensions of 4.1.

  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


innobase/row/row0mysql.c:
  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...


configure.in:
  Escaping [] so that darwin[7-8] gets into 'configure' and not darwin7-8
  Adding a compilation define so that on recent Darwin mysqld does not react to SIGHUP and SIGQUIT.
sql/mysqld.cc:
  optionally ignore SIGHUP and SIGQUIT, for some Mac OS X Panther versions which send too many of those.

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


sql/sql_select.cc:
  Auto merged

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

support-files/MySQL-shared-compat.spec.sh:
   - fixed using the correct version number
   - bumped up the 3.23 version number to current

   - resorting to having to separate sections for darwin7 and darwin8


configure.in:
   - giving a range does not work here - 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.


mysql-test/r/having.result:
  added test case for
  Bug #4358 Problem with HAVING clause that uses
              alias from the select list and TEXT field
mysql-test/t/having.test:
  added test case for
  Bug #4358 Problem with HAVING clause that uses
              alias from the select list and TEXT field
sql/sql_select.cc:
  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.
  
  fixed 
  Bug #4358 Problem with HAVING clause that
             uses alias from the select list and TEXT field

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

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

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b4898

into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug4411


BitKeeper/etc/logging_ok:
  auto-union

  Fix for server hang bug


mysql-test/r/heap.result:
  Bug#4411
    Test for server hang bug
mysql-test/t/heap.test:
  Bug#4411
    Test for server hang bug
sql/opt_sum.cc:
  Bug#4411
    Allow code to exit the loop.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

include/my_global.h:
  uint_max constants moved from sql_analyse.cc
sql/sql_analyse.cc:
  cleanup

Build-tools/Bootstrap:
   - fixed Log file naming

 - Changed the default log file name to Bootstrap-<repository>.log
   (e.g. Bootstrap-mysql-4.0.log) (thanks to Joerg for the hint)
 - added option "--archive-log" to automatically move the log file
   into the Log directory of the exported tree


Build-tools/Bootstrap:
   - Changed the default log file name to Bootstrap-<repository>.log
     (e.g. Bootstrap-mysql-4.0.log) (thanks to Joerg for the hint)
   - added option "--archive-log" to automatically move the log file
     into the Log directory of the exported tree

sql/ha_heap.cc:
  added calling fn_format(name,..) for name before heap_delete_table
  as it's done before heap_create
  
  fixed Bug #4973 Memory is not released when HEAP table is dropped

   format() around them (as suggested by serg)

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