into mysql.com:/home/mydev/mysql-4.1-4100


sql/sql_select.cc:
  Auto merged

  backported access to ndb_mgm from 5.0


mysql-test/mysql-test-run.sh:
  backported access to ndb_mgm from 5.0

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


mysql-test/r/select_found.result:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

  Added a test case for bug #7945.
sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.


sql/sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.
mysql-test/t/select_found.test:
  Added a test case for bug #7945.
mysql-test/r/select_found.result:
  Added a test case for bug #7945.

  Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free(), in DROP TABLE or in ALTER TABLE


innobase/fil/fil0fil.c:
  Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free()

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

corrected possible unalignment in NdbRecAttr access methods

into mysql.com:/home/timka/mysql/src/4.1-virgin

  Fix bug #8021 :Windows error number 87 with multiple tablespaces after mysqld restart; still has to be tested on Windows that this now works


innobase/fil/fil0fil.c:
  Fix bug #8021 :Windows error number 87 with multiple tablespaces after mysqld restart; still has to be tested on Windows that this now works

  Fix bug #7831: ALTER TABLE ... ADD CONSTRAINT PRIMARY KEY ... complained about bad foreign key definition


innobase/dict/dict0dict.c:
  Fix bug #7831: ALTER TABLE ... ADD CONSTRAINT PRIMARY KEY ... complained about bad foreign key definition

into mysql.com:/home/timka/mysql/src/4.1-dbg


sql/sql_show.cc:
  Auto merged

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

SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.

into mysql.com:/home/mydev/mysql-4.1-4100

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  typo

  Make sure to ship error code in system error signal

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

into mysql.com:/home/mydev/mysql-4.1-4100

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

Completely recoded the bugfix for 4.1.
This is just a merge changeset.


mysql-test/r/insert_select.result:
  BUG#6034 - Error code 124:  Wrong medium type
  Replaced TYPE= by ENGINE=
mysql-test/t/insert_select.test:
  BUG#6034 - Error code 124:  Wrong medium type
  Replaced TYPE= by ENGINE=
sql/sql_select.cc:
  BUG#6034 - Error code 124:  Wrong medium type
  Completely recoded the bugfix for 4.1.

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl

  Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.


sql/item_cmpfunc.cc:
  Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.

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

  release connections when last op was simple read


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  bug#8010
    release connections when last op was simple read

  environment (using "build" on SUSE Linux)


Build-tools/Do-rpm:
  - added functionality to perform RPM builds inside of a chrooted build
    environment (using "build" on SUSE Linux) - see "--help" for more details

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

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

  Minor fix after character set conversion.


sql/share/japanese-sjis/errmsg.txt:
  Minor fix after character set conversion.

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

  Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.


configure.in:
  Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.

  new file

Version for 4.1. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
mysql_execute_command() detects the match for other reasons and
adds the flag OPTION_BUFFER_RESULT to the 'select_options'. 
In this case the result is put into a temporary table first. 
Hence, we can defer the preparation of the insert
table until the result is to be used.


mysql-test/r/insert_select.result:
  BUG#6034 - Error code 124:  Wrong medium type.
  The test results.
mysql-test/t/insert_select.test:
  BUG#6034 - Error code 124:  Wrong medium type.
  The test case.
sql/sql_select.cc:
  BUG#6034 - Error code 124:  Wrong medium type.
  With OPTION_BUFFER_RESULT in the 'select_options',
  defer the preparation of the insert table until the 
  result is to be used.

Version for 4.0. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
mysql_execute_command() detects the match for other reasons and
adds the flag OPTION_BUFFER_RESULT to the 'select_options'. 
In this case the result is put into a temporary table first. 
Hence, we can defer the preparation of the insert
table until the result is to be used.


mysql-test/r/insert_select.result:
  BUG#6034 - Error code 124:  Wrong medium type.
  The test results.
mysql-test/t/insert_select.test:
  BUG#6034 - Error code 124:  Wrong medium type.
  The test case.
sql/sql_select.cc:
  BUG#6034 - Error code 124:  Wrong medium type.
  With OPTION_BUFFER_RESULT in the 'select_options',
  defer the preparation of the insert table until the 
  result is to be used. Unfortunately, this happens
  at several places.

into mysql.com:/dbdata/psergey/mysql-4.1-bug7885

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

(Simpler fix than last commit -- no need to mess with base_cxxflags.)


BUILD/compile-amd64-max:
  use $max_cflags
BUILD/compile-pentium-debug-max:
  use $max_cflags
BUILD/compile-pentium-debug-max-no-embedded:
  use $max_cflags
BUILD/compile-pentium-max:
  use $max_cflags
BUILD/compile-pentium-valgrind-max:
  use $max_cflags
BUILD/compile-ppc-debug-max:
  use $max_cflags
BUILD/compile-ppc-max:
  use $max_cflags
BUILD/compile-amd64-debug-max:
  use $max_cflags, remove unnecessary base_cxxflags stuff

ndb/src/ndbapi/NdbScanOperation.cpp:
  align pointers