into mysql.com:/data0/mysqldev/lenz/mysql-4.1


netware/BUILD/compile-linux-tools:
  Auto merged

 - cleanup: removed obsolete support-files/MacOSX/make_mysql_pkg.pl
   script (we now use Do-pkg for building OS X packages)


BitKeeper/deleted/.del-.cvsignore~4c7a1f88a5a62a24:
  Delete: NEW-RPMS/.cvsignore
BitKeeper/deleted/.del-make_mysql_pkg.pl~caac82eb901cc206:
  Delete: support-files/MacOSX/make_mysql_pkg.pl
netware/BUILD/compile-linux-tools:
   - removed reference to the NEW-RPMS directory
netware/BUILD/compile-netware-END:
   - removed reference to the NEW-RPMS directory
netware/BUILD/compile-netware-src:
   - removed reference to the NEW-RPMS directory

configure.in:
  Auto merged
support-files/mysql.spec.sh:
   - after-merge fix

into moonbone.local:/work/13855-bug-4.1-mysql

  After merge fix


mysql-test/r/select.result:
  After merge fix

include/config-netware.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/select.result:
  Manually merged fix for bug#13855
mysql-test/t/select.test:
  Manuall merged fix for bug#13855

into  mysql.com:/home/alexi/dev/mysql-4.1-innobase

   directory - these files are now maintained in the mysqldoc
   repository and included in the source distribution during the
   release build. Updated the configure.in script and Makefiles to
   create the man page file list at build time
 - Updated the file list in the RPM spec file to include all currently
   available man pages (this can not be done with wildcards, as
   the man pages are spread across several subpackages. However, RPM
   warns about unpackaged files, so newly added man pages can be 
   spotted)


BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
  Delete: man/isamchk.1.in
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
  Delete: man/isamlog.1.in
BitKeeper/deleted/.del-mysql.1.in~3f4dbf65d31fea3a:
  Delete: man/mysql.1.in
BitKeeper/deleted/.del-mysqlaccess.1.in~2adf98feb44a0dbf:
  Delete: man/mysqlaccess.1.in
BitKeeper/deleted/.del-mysqladmin.1.in~81703c6092a1f769:
  Delete: man/mysqladmin.1.in
BitKeeper/deleted/.del-mysqld.1.in~42371a82eb27d87c:
  Delete: man/mysqld.1.in
BitKeeper/deleted/.del-mysqld_multi.1.in~b3f1c5343b8481e6:
  Delete: man/mysqld_multi.1.in
BitKeeper/deleted/.del-mysqld_safe.1.in~6f34e14acc0c5e0b:
  Delete: man/mysqld_safe.1.in
BitKeeper/deleted/.del-mysqldump.1.in~9520980bfec710d5:
  Delete: man/mysqldump.1.in
BitKeeper/deleted/.del-mysql_fix_privilege_tables.1.in~7422405bb0e64325:
  Delete: man/mysql_fix_privilege_tables.1.in
BitKeeper/deleted/.del-mysql_zap.1.in~df5cf8089b50c624:
  Delete: man/mysql_zap.1.in
BitKeeper/deleted/.del-mysqlshow.1.in~81ce953dcc1a282f:
  Delete: man/mysqlshow.1.in
BitKeeper/deleted/.del-perror.1.in~60d1efcbe71bdd9c:
  Delete: man/perror.1.in
BitKeeper/deleted/.del-replace.1.in~e92dc1aea682608c:
  Delete: man/replace.1.in
configure.in:
   - dynamically add man pages included in the man directory
     (the BK tree only contains one dummy file, the directory is
     populated by the Bootstrap script by copying current man pages
     from the documentation server)
man/Makefile.am:
   - removed hard-coded list of man pages, the list is populated
     during the configure stage. When building from BK, only one
     placeholder file exists. For the release builds, this directory
     is populated by the Bootstrap script, which takes man page files
     from the documentation server.
man/mysqlman.1:
   - removed version number
support-files/mysql.spec.sh:
   - adjusted file list: added man pages that are now part of the
     official source distribution (taken from the documentation
     server)

  Dump MY_CS_CSSORT when it's necessary.


strings/conf_to_src.c:
  Dump MY_CS_CSSORT when it's necessary.

  Updating to conform the current CHARSET_INFO structure.


strings/conf_to_src.c:
  Updating to conform the current structure.

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

 and innobase/*/makefilewin (which are unused now).


BitKeeper/deleted/.del-makefilewin.i~5c8479dcb8a455b2:
  Delete: innobase/include/makefilewin.i
BitKeeper/deleted/.del-makefilewin~78000390c783b1c5:
  Delete: innobase/btr/makefilewin
BitKeeper/deleted/.del-makefilewin~2fc379bd4065c995:
  Delete: innobase/buf/makefilewin
BitKeeper/deleted/.del-makefilewin~d37b6b303348c871:
  Delete: innobase/data/makefilewin
BitKeeper/deleted/.del-makefilewin~5104767c73775697:
  Delete: innobase/dict/makefilewin
BitKeeper/deleted/.del-makefilewin~d90f35fdc3f2ee5f:
  Delete: innobase/dyn/makefilewin
BitKeeper/deleted/.del-makefilewin~c7b621c745e5de95:
  Delete: innobase/eval/makefilewin
BitKeeper/deleted/.del-makefilewin~4d139e182457e553:
  Delete: innobase/fil/makefilewin
BitKeeper/deleted/.del-makefilewin~d1a9d1f7d33fcb73:
  Delete: innobase/fsp/makefilewin
BitKeeper/deleted/.del-makefilewin~ef3a208fa0e9b0db:
  Delete: innobase/fut/makefilewin
BitKeeper/deleted/.del-makefilewin~f1e3b890aa1c9ea3:
  Delete: innobase/ha/makefilewin
BitKeeper/deleted/.del-makefilewin~1c53f31b88dd36e:
  Delete: innobase/ibuf/makefilewin
BitKeeper/deleted/.del-makefilewin~7a9d7d5a42bbfaf5:
  Delete: innobase/lock/makefilewin
BitKeeper/deleted/.del-makefilewin~b643e38d8da389ac:
  Delete: innobase/log/makefilewin
BitKeeper/deleted/.del-makefilewin~a40ea12eebdd6ef0:
  Delete: innobase/mach/makefilewin
BitKeeper/deleted/.del-makefilewin~1dbc058d76ebf1db:
  Delete: innobase/mem/makefilewin
BitKeeper/deleted/.del-makefilewin~6ba64863bce3d0b8:
  Delete: innobase/mtr/makefilewin
BitKeeper/deleted/.del-makefilewin~15e9e5c9e8fa870b:
  Delete: innobase/os/makefilewin
BitKeeper/deleted/.del-makefilewin~aeea7c82f21f7cf5:
  Delete: innobase/page/makefilewin
BitKeeper/deleted/.del-makefilewin~dea10ec1c94f7be:
  Delete: innobase/pars/makefilewin
BitKeeper/deleted/.del-makefilewin~608ed49dcd88e0f7:
  Delete: innobase/que/makefilewin
BitKeeper/deleted/.del-makefilewin~2e0407fe123f8365:
  Delete: innobase/read/makefilewin
BitKeeper/deleted/.del-makefilewin~fdda94ad32fa9e34:
  Delete: innobase/rem/makefilewin
BitKeeper/deleted/.del-makefilewin~dc4b8ad5ea53bd:
  Delete: innobase/row/makefilewin
BitKeeper/deleted/.del-makefilewin~63acd666293282a:
  Delete: innobase/srv/makefilewin
BitKeeper/deleted/.del-makefilewin~13888739357b3025:
  Delete: innobase/sync/makefilewin
BitKeeper/deleted/.del-makefilewin~c8273a47b90f52bb:
  Delete: innobase/thr/makefilewin
BitKeeper/deleted/.del-makefilewin~f4b7b99a887b7de:
  Delete: innobase/trx/makefilewin
BitKeeper/deleted/.del-makefilewin~72a64128bacce71b:
  Delete: innobase/usr/makefilewin
BitKeeper/deleted/.del-makefilewin~389ee2dcf79afb79:
  Delete: innobase/ut/makefilewin
BitKeeper/deleted/.del-makefilewin~14f24a4a173e2fcd:
  Delete: innobase/makefilewin
BitKeeper/deleted/.del-my_cnf~977f69858affc57b:
  Delete: innobase/my_cnf
innobase/include/Makefile.am:
  Removed ref to Makefilewin.i (it is unused now).

  Added MTR_BUILD_THREAD to control the port range


mysql-test/mysql-test-run.pl:
  Added MTR_BUILD_THREAD to control the port range

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

into mysql.com:/Users/kent/mysql/bk/mysql-4.0

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


tests/mysql_client_test.c:
  Auto merged

options to the wrong value. (Bug #12925)


mysql-test/t/mysql_client_test.test:
  Add parameter for testing getopt bug
mysys/my_getopt.c:
  Remove incorrect and unnecessary casts
tests/mysql_client_test.c:
  Add test case for Bug #12925 (my_getopt bug)

into moonbone.local:/work/14016-bug-4.1-mysql

collation

By default constant strings in second parameter of date_time() have case
insensitive collation. Because of this expressions date_format(f,'%m') and 
date_format(f,'%M') wrongly becomes equal, which results in choosing wrong 
column to sort by.

Now if second parameter of date_format() is constant then it's collation is 
changed to case sensitive.


sql/item_timefunc.cc:
  Fix bug #14016 date_format() 2nd parameter was compared using case insensitive collation.
  If second parameter of date_format() is constant then it's collation is changed to case sensitive.
mysql-test/r/date_formats.result:
  Test case for bug#14016 2nd parameter was compared using case insensitive collation
mysql-test/t/date_formats.test:
  Test case for bug#14016 2nd parameter was compared using case insensitive collation

into moonbone.local:/work/13392-bug-4.1-mysql

VALUES() can only refer to table insert going to. 
But Item_insert_value::fix_fields() were passing to it's arg full table list,
This results in finding second column which shouldn't be found, and
failing with error about ambiguous field.

Item_insert_value::fix_fields() now passes only first table of full table
list.


sql/item.cc:
  Fix bug #14016 date_format() 2nd parameter was compared using case insensitive collation.
  If second parameter of date_format() is constant then it's collation is changed to case sensitive.
mysql-test/r/insert_select.result:
  Test case for bug#14016 2nd parameter was compared using case insensitive collation
mysql-test/t/insert_select.test:
  Test case for bug#14016 2nd parameter was compared using case insensitive collation

into mysql.com:/M41/mysql-4.1

ctype-win1250ch.c:
  Like range prefix tables were wrong.
ctype_cp1250_ch.result, ctype_cp1250_ch.test:
  Adding test case.


strings/ctype-win1250ch.c:
  Bug#13347: empty result from query with like and cp1250 charset
  Like range prefix tables were wrong.
mysql-test/t/ctype_cp1250_ch.test:
  Adding test case.
mysql-test/r/ctype_cp1250_ch.result:
  Adding test case.

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


myisam/mi_check.c:
  Auto merged

myisam/mi_check.c:
  Changed print style for keyoffset.
myisam/mi_delete.c:
  Changed print style for keypos.

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

into mysql.com:/Users/kent/mysql/bk/mysql-4.0

  Option to set environment variable MTR_BUILD_THREAD to a small
  number, from what mysql-test-run calculate port numbers that
  will not conflict with other runs with different thread num


Makefile.am:
  Option to set environment variable MTR_BUILD_THREAD to a small
  number, from what mysql-test-run calculate port numbers that
  will not conflict with other runs with different thread num

heap/_check.c:
  Change arguments to ha_key_cmp
heap/hp_create.c:
  Change arguments to ha_key_cmp
include/my_base.h:
  Remove SEARCH_RETURN_B_POS and instead always send an array to ha_key_cmp() as last argument
myisam/mi_check.c:
  Change arguments to ha_key_cmp
myisam/mi_rnext_same.c:
  Change arguments to ha_key_cmp
myisam/mi_search.c:
  Change arguments to ha_key_cmp
myisam/mi_write.c:
  Change arguments to ha_key_cmp
myisammrg/myrg_queue.c:
  Change arguments to ha_key_cmp
mysys/my_handler.c:
  Remove SEARCH_RETURN_B_POS and instead always send an array to ha_key_cmp() as last argument
  (This removes an if in a loop at the expensive of an int on the stack)
sql/records.cc:
  Simplify new rr_index() code
  Create common error handling function for rr_() functions.
  Remove loop from rr_index() as handler::index_next() can never return HA_ERR_RECORD_DELETED
sql/sql_load.cc:
  Simplify
sql/sql_update.cc:
  Simplify code
  Fixed bug when one is updating an index column that could be used with ORDER BY
sql/structs.h:
  Removed not needed structure element

into mysql.com:/home/psergey/mysql-4.1-nulls-stats-r2


sql/mysqld.cc:
  Auto merged

mysql-test/r/loaddata.result:
  Update esults
mysql-test/t/loaddata.test:
  Add missing drop table

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


sql/sql_load.cc:
  Auto merged
mysql-test/r/loaddata.result:
  Resolve conflict
mysql-test/t/loaddata.test:
  Resolve conflict

  select distinct char(column) fails with utf8
ctype_utf8.result, ctype_utf8.test:
  Adding test case
sql_yacc.yy:
  Adding new syntax.
item_strfunc.h:
  Fixing wrong max_length calculation.
  Also, adding CHAR(x USING charset),
  for easier migrating from 4.1 to 5.0,
  according to Monty's suggestion.


sql/item_strfunc.h:
  Bug#13233
  select distinct char(column) fails with utf8
  Also, adding CHAR(x USING charset),
  for easier migrating from 4.1 to 5.0.
sql/sql_yacc.yy:
  Adding new syntax.
mysql-test/t/ctype_utf8.test:
  Adding test case
mysql-test/r/ctype_utf8.result:
  Adding test case

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

ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  New dump for index operation count
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  New dump for index operation count
  Fix leak on index ops

added "nulls_ignored" index statistics collection method for MyISAM tables.
(notification trigger: this is about BUG#9622).


include/my_base.h:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method:
  Added SEARCH_RETURN_B_POS flag for ha_key_cmp()
include/my_handler.h:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method: added ha_find_null()
include/myisam.h:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
myisam/mi_check.c:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method, added 
   mi_collect_stats_*(), updated update_key_parts() to deal with all 3 methods.
myisam/myisamchk.c:
  BUG#9622: Added nulls_ignored index statistics collection method for MyISAM
myisam/myisamdef.h:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
myisam/sort.c:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
mysql-test/r/myisam.result:
  Testcase for BUG9622
mysql-test/t/myisam.test:
  Testcase for BUG9622
mysys/my_handler.c:
  BUG#9622: ha_key_cmp() now supports new SEARCH_RETURN_B_POS flag, added ha_find_null()
sql/ha_myisam.cc:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.
sql/mysqld.cc:
  BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.