into mysql.com:/home/pz/mysql/mysql-4.1


libmysql/Makefile.shared:
  Auto merged

BitKeeper/deleted/.del-mf_casecnv.c~c269ed3dcafea441:
  Delete: mysys/mf_casecnv.c

into mysql.com:/home/pz/mysql/mysql-4.1

into mysql.com:/home/pz/mysql/mysql-4.1


sql/mysql_priv.h:
  Auto merged

fixed error handling in subselect fix_field


mysql-test/r/subselect.result:
  test of name resolution
mysql-test/t/subselect.test:
  test of name resolution
sql/item.cc:
  fixed couple of bugs in field/reference name resolution.
sql/item_subselect.cc:
  fixed error handling
sql/mysql_priv.h:
  fixed couple of bugs in field/reference name resolution.
sql/sql_base.cc:
  fixed couple of bugs in field/reference name resolution.
sql/sql_select.cc:
  new find_item_in_list interface

into sanja.is.com.ua:/home/bell/mysql/work-4.1

mysql-test/r/subselect.result:
  test for error handling bug
mysql-test/t/subselect.test:
  test for error handling bug

into sanja.is.com.ua:/home/bell/mysql/work-full-4.1

into mysql.r18.ru:/usr/home/ram/mysql-4.1


mysql-test/r/create.result:
  Auto merged

test case


heap/hp_create.c:
  auto_increment for heap tables
heap/hp_hash.c:
  auto_increment for heap tables
heap/hp_info.c:
  auto_increment for heap tables
heap/hp_test1.c:
  auto_increment for heap tables
heap/hp_test2.c:
  auto_increment for heap tables
heap/hp_update.c:
  auto_increment for heap tables
heap/hp_write.c:
  auto_increment for heap tables
include/heap.h:
  auto_increment for heap tables
mysql-test/r/create.result:
  auto_increment for heap tables
mysql-test/t/create.test:
  auto_increment for heap tables
sql/ha_heap.cc:
  auto_increment for heap tables
sql/ha_heap.h:
  auto_increment for heap tables

into mysql.com:/home/pz/mysql/mysql-4.1

into mysql.com:/home/pz/mysql/mysql-4.1


include/mysql_com.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

client/mysqladmin.c:
  Handle new password.c prototypes
include/mysql_com.h:
  New prototypes
libmysql/Makefile.shared:
  Client need sha1 compiled in now
libmysql/password.c:
  Replace copy with symlink
mysql-test/r/func_crypt.result:
  Fix test results to handle new password function
mysql-test/t/func_crypt.test:
  New tests for new password function
sql/item_create.cc:
  add old_password() function
sql/item_create.h:
  add old_password() function
sql/item_strfunc.cc:
  add old_password() function
  changes to new password.c functions prototypes
sql/item_strfunc.h:
  add old_password function
  handle new prototypes
sql/lex.h:
  add OLD_PASSWORD function
sql/password.c:
  Continue to work on new password handling
sql/sql_acl.cc:
  Handle new passwords
sql/sql_yacc.yy:
  Changes for new prototypes

into sanja.is.com.ua:/home/bell/mysql/work-explain_union-4.1

include/mysql_com.h:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/key_primary.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/odbc.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/r/varbinary.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.h:
  Auto merged

into mysql.com:/home/pz/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

sql/item_strfunc.cc:
  Remove some debug
sql/mysql_priv.h:
  New password has larger length
sql/mysqld.cc:
  New option name to be consistent
sql/password.c:
  Clean up hash generation

Now MySQL 4.1 is up to date with all patches from 4.0.4 and passes the test suite.


mysql-test/r/rpl_log_pos.result:
  Fix results
sql/sql_select.cc:
  Fixed bug that causes select test to fail

BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

libmysql/libmysql.c:
  Removed obsolete function (now in strings library)
mysql-test/r/rpl_log.result:
  Updated results for 4.1
mysql-test/r/rpl_log_pos.result:
  Updated results for 4.1
sql/item_strfunc.cc:
  Added missing system_charset_info
sql/log_event.cc:
  Portability fixes. More debugging.
sql/net_pkg.cc:
  Added back setting of query_error as slave code is depeneding on this.
sql/sql_acl.cc:
  Update after last merge
sql/sql_lex.cc:
  Update after last merge
sql/sql_parse.cc:
  Update after last merge
sql/sql_prepare.cc:
  Update after last merge
sql/time.cc:
  Update after last merge.
  More comments

into sanja.is.com.ua:/home/bell/mysql/work-merge_lex-4.1

into mysql.r18.ru:/usr/home/ram/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_heap.cc:
  Auto merged

into mysql.com:/home/pz/mysql/mysql-4.1

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

no ulong type, one should use unsigned long instead


include/mysql.h:
  Failed to compile on FreeBSD

BitKeeper/etc/logging_ok:
  auto-union
include/mysql_com.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysqld.cc:
  Trying to merge :(

include/mysql_com.h:
  Partial changes for new secure connection handing required to 
  pull 4.0 -> 4.1 merge
sql/item_strfunc.cc:
  Handling of dynamic possible length for password
sql/item_strfunc.h:
  Larger buffer for password
sql/mysqld.cc:
  Added option to force old password format
sql/password.c:
  Begin implementing new hashing
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted