into deer.(none):/home/hf/work/mysql-4.1.12839


sql/field.cc:
  Auto merged

sql/field.cc:
  This code still could work for VERY out-of-dated databases
sql/spatial.cc:
  small syntax fixes

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

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

into  krsna.patg.net:/home/patg/mysql-build/mysql-4.1

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

into mysql.com:/home/psergey/mysql-4.1-bug14139

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

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

 ON UPDATE CASCADE


innobase/row/row0ins.c:
  Patch from Marko is applied

Procedure analyse() redefines select's fields_list. setup_copy_fields() assumes
that fields_list is a part of all_fields_list. Because select have only 
3 columns and analyse() redefines it to have 10 columns, int overrun in
setup_copy_fields() occurs and server goes to almost infinite loop.

Because fields_list used not only to send data ad fields types, it's wrong 
to allow procedure redefine it. This patch separates select's fileds_list 
and procedure's one. Now if procedure is present, copy of fields_list is 
created in procedure_fields_list and it is used for sending data and fields.


mysql-test/t/analyse.test:
  Test case for bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server
mysql-test/r/analyse.result:
  Test case for bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server
sql/sql_select.h:
  Fix bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server
  To JOIN  Added separate fields_list for procedure.
sql/sql_select.cc:
  Fix bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server
  SELECT's fields_list and procedure's fields_list made split. If procedure is defined
  then procedure's fields_list is used to send fields and data.

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


include/config-netware.h:
  Auto merged

kernel function to prevent CPU hogs.

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


sql/item_func.cc:
  Auto merged

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

  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

into  krsna.patg.net:/home/patg/mysql-build/mysql-4.1


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

 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

Made change to mysqlimport to set character_set_database to binary to 
make importing various charsets/columns work correctly.


client/mysqlimport.c:
  BUG# 12123
  
  Added 'set @@character_set_database=binary' to make loading of tables with
  mixed charset types and non-latin characters load.
mysql-test/mysql-test-run.pl:
  BUG #12123
  
  Added $MYSQL_IMPORT in order to test mysqlimport bug.
mysql-test/mysql-test-run.sh:
  BUG #12123
  
  Added $MYSQL_IMPORT in order to test mysqlimport bug.
mysql-test/r/mysqldump.result:
  BUG #12123
  
  Added dumping and reloading (using mysql, mysqldump, and mysqlimport) to
  show that this fix handles dumping and reloading of non-latin1 charsets
  in table with different charset columns (mixing of charsets, also can be a
  UTF table with latin1 tables). Note the select before and after dump and 
  restore - should be exact.
mysql-test/t/mysqldump.test:
  BUG #12123
  
  Added dumping and reloading (using mysql, mysqldump, and mysqlimport) to
  show that this fix handles dumping and reloading of non-latin1 charsets
  in table with different charset columns (mixing of charsets, also can be a
  UTF table with latin1 tables). Note the select before and after dump and 
  restore - should be exact. (results of this)

avoid multiplying length of field_X by charset->mbmaxlen twice when calculating space 
required for field_X in the new table.


mysql-test/r/create.result:
  Testcase for BUG#14139
mysql-test/t/create.test:
  Testcase for BUG#14139
sql/field.cc:
  BUG#14139: Make create_length_to_internal_length() save length-in-characters in 
  create_field::chars_length.
sql/field.h:
  BUG#14139: Add create_length::chars_length where we save length-in-characters, added comments.
sql/sql_table.cc:
  BUG#14139: When handling "CREATE TABLE(field_X type_spec,...) SELECT smth AS field_X, ...."
  we get two instances of create_field: (1) is occurence of field_X in create list, and (2) is
  in select list. If we figure they both refer to the same field, we "join" them according to
  some rule that is not explicitly specified anywhere.
  When we do this "join", create_field::length already contains length-in-bytes for both, so
  when we transfer field length (in characters) from (1) to (2), use length-in-characters that
  we have saved in create_length::chars_length.

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