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

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


sql/sql_class.cc:
  Auto merged

DROP DATABASE now assumes RAID directories are in hex. (Bug #2627)
Don't increment 'select_full_range' and similar statistics for EXPLAIN queries. (Bug #2506)
Test in configure if pthread_key_delete() exists (to fix compile problem on SCO) (Bug #2461)


BUILD/compile-pentium-max:
  Added --with-raid
configure.in:
  Added testing of pthread_key_delete (to fix compile problem on SCO)  (Bug #2461)
include/my_pthread.h:
  Added testing of pthread_key_delete (to fix compile problem on SCO)  (Bug #2461)
innobase/include/data0data.ic:
  Added missing newline
mysql-test/r/raid.result:
  Test of DROP DATABASE with RAID directories in hex
mysql-test/t/raid.test:
  Test of DROP DATABASE with RAID directories in hex
sql/sql_db.cc:
  DROP DATABASE could not drop databases with RAID tables that had
  more than 9 RAID_CHUNKS because DROP DATABASE assumed raid tables where in decimal while the RAID CREATE code assumed directories was in hex.(Bug #2627)
sql/sql_select.cc:
  Don't increment 'select_full_range' and similar statistics for EXPLAIN queries. (Bug #2506)
sql/sql_udf.cc:
  mysqld crashed if mysql.func table didn't exists (Bug #2577)

   (reduce the noise)


Build-tools/Bootstrap:
   - don't add merge ChangeSets to the Changelog (reduce the noise)

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

"CC: ERROR File = item.h, Line = 401 The identifier strtoll is undefined"
(compilation failure on SGI IRIX + MIPSPro 7.41)
Compilation script implemented.
Tested in 32 and 64 bit mode


configure.in:
  Fix for bug #2214: we should not reset CXXFLAGS on IRIX for build 
  script to work

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

into hegel.local:/home/miguel/dev/mysql-4.0

into hegel.local:/home/miguel/dev/mysql-4.0

(fixed bug #2526 "--init-file crashes MySQL if contains large select")
Such checking usually works in send_ok, send_eof, but in this case large 
result causes interim flushing.


sql/sql_class.cc:
  added checking for bootstrap in select_send::send_data

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

 - more flexible removal of old cruft before creating the new binary
   distribution
 - more flexible globbing for the binary tarball (required for QNX, where
   the file name ends on *.tgz instead of .tar.gz due to file name lenght
   restrictions


Build-tools/Do-compile:
  Some small enhancements:
  
   - more flexible removal of old cruft before creating the new binary
     distribution
   - more flexible globbing for the binary tarball (required for QNX, where
     the file name ends on *.tgz instead of .tar.gz due to file name lenght
     restrictions

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

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


sql/mysqld.cc:
  Auto merged

mysql-test/r/ctype_tis620.result:
  Cleanup test
mysql-test/r/range.result:
  Test problem with range optimization over overlapping ranges (#2448)
mysql-test/t/ctype_tis620.test:
  Cleanup test
mysql-test/t/range.test:
  Test problem with range optimization over overlapping ranges (#2448)
sql/mysqld.cc:
  Remove debug statement
strings/ctype-tis620.c:
  est problem with range optimization over overlapping ranges (#2448)

from command line did not work.

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


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

   binary distribution and Server RPM


myisam/myisam_ftdump.c:
  Rename: myisam/ft_dump.c -> myisam/myisam_ftdump.c
BitKeeper/etc/ignore:
  Added myisam/myisam_ftdump to the ignore list
myisam/Makefile.am:
   - renamed ft_dump to myisam_ftdump and added it to bin_PROGRAMS
scripts/make_binary_distribution.sh:
   - added myisam_ftdump to the binary distribution
support-files/mysql.spec.sh:
   - added myisam_ftdump to the Server package

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


sql/mysqld.cc:
  Auto merged

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

Now one need only SELECT privilege for tables that are only read in
UPDATE statements with many tables. (Bug #2377).


sql/sql_acl.cc:
  Comment cleanup
sql/sql_parse.cc:
  Merged duplicate code.
  Removed some outdated 'tables->db' tests.
  Check privileges for multi-updates properly (Bug #2377)
sql/sql_show.cc:
  Remove disabled code
sql/sql_update.cc:
  Ensure that privileges are tested properly for multi-table-updates
tests/grant.pl:
  Added more tests
tests/grant.res:
  updated results

Marked --bdb-no-sync as deprecated
Added --sync-bdb-logs / --disable-sync-bdb-logs as a synonym / alternative.


mysys/my_getopt.c:
  Changed my_getopt so that disabled_my_option can be used for
  GET_BOOL type options too.
sql/mysql_priv.h:
  Added opt_sync_frm
sql/mysqld.cc:
  Added sync-frm / disable-sync-frm to mysqld, to be able to disable
  use of my_sync() (fsync()). This defaults to behavior in 4.0.16
  and before, where creating of new tables is quicker than currently.
  This option is enabled by default.
  
  Marked --bdb-no-sync as deprecated option and added another one,
  --sync-bdb-logs besides. --bdb-no-sync and --disabled-sync-bdb-logs
  are now synonyms.
sql/unireg.cc:
  One can disable my_sync() by using --disable-sync-frm
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Give error if locked table is used twice in query. This fixes strange error message when doing LOCK TABLES t1 WRITE; INSERT TABLE t1 SELECT * from t1 (Bug #2296)


client/mysqldump.c:
  Better help for flush-logs
mysql-test/r/lock.result:
  Test for LOCK TABLES ; INSERT ... SELECT
mysql-test/t/lock.test:
  Test for LOCK TABLES ; INSERT ... SELECT

"system variable query_prealloc_size can be only global"


include/my_sys.h:
  Fix for bug #1948:
  - added reset_root_defaults function declaration
mysys/my_alloc.c:
  Fix for bug #1948:
  - implementation and description of reset_root_defaults
sql/set_var.cc:
  Fix for bug #1948:
  - fix_thd_mem_root and fix_trans_mem_root after update triggers
    implemented for variables query_prealloc_size, query_alloc_block_size,
    trans_prealloc_size, trans_alloc_block_size

increase the size of a signal thread's stack (the old one was too small for the thread to be created on some systems)
bug#2599

thnx Paul.                                             
              
<monty> can you get the above into configure and make Makefile.am patch         
mysql.server.sh with the right values for mysql.server ?                        
<monty> or do you think we should just put the above in mysql.server.sh directly
<ramil> as you want                                                             
<monty> the last is kind of hard to do with variables, so lets put the          
above in mysql.server.sh directly                                               
                                                                  


support-files/mysql.server.sh:
  #2185: mysql.server script echo bug

s/expection/exception


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Change tests so that tables are dropped in an order respecting the FOREIGN KEY constraints


mysql-test/r/rpl_insert_id.result:
  Change tests so that tables are dropped in an order respecting the FOREIGN KEY constraints
mysql-test/t/rpl_insert_id.test:
  Change tests so that tables are dropped in an order respecting the FOREIGN KEY constraints

  Change tests so that tables are dropped in an order respecting the FOREIGN KEY constraints


mysql-test/t/innodb.test:
  Change tests so that tables are dropped in an order respecting the FOREIGN KEY constraints
mysql-test/r/innodb.result:
  Change tests so that tables are dropped in an order respecting the FOREIGN KEY constraints

  Change print format of FOREIGN KEY constraints spanning multiple databases to <backquote>databasename<backquote>.<backquote>tablename<backquote>; but when parsing them we must also accept <backquote>databasename.tablename<backquote>, because that was the output format in < 4.0.18


innobase/dict/dict0dict.c:
  Change print format of FOREIGN KEY constraints spanning multiple databases to <backquote>databasename<backquote>.<backquote>tablename<backquote>; but when parsing them we must also accept <backquote>databasename.tablename<backquote>, because that was the output format in < 4.0.18