into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix

into mysql.com:/home/mysql_src/mysql-4.1-1717


client/mysqltest.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

Final push. Printing some warnings at startup, as --innodb-safe-binlog requires
some other options, to work as expected.
Adding 6 new tests (3 pairs). If they fail on some platforms (so far they have been run only on my Linux),
they should be ignored for the 4.1.3 build (you can just
rm mysql-test/*/rpl_crash_*).
Now going to update doc.


mysql-test/misc/kill_master.sh:
  If the mysqld process has already gone away, 'kill' will fail, so we need to explicitely
  exit 0, so that the non-zero return code of kill does not make mysqltest stop.
sql/log.cc:
  VC++ does not know (ulonglong)(-1)
sql/mysqld.cc:
  When using --innodb-safe-binlog, some options need to automatically be turned on.

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix


sql/tztime.cc:
  Auto merged

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

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix


sql/tztime.cc:
  Auto merged

sql/tztime.cc:
  Fixed compilation on Windows.
  Added casts to avoid warnings.
  2nd argument of hash_search should be of type const byte *.

into here.mwagner.org:/Volumes/BK/mysql-4.1

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


client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
sql/handler.cc:
  Auto merged

mysql-test/r/bdb.result:
  bug#4000
mysql-test/t/bdb.test:
  bug#4000
sql/sql_select.cc:
  cleanup

  Fixed vim to expandtab's, retab'd code
  Fixed CWD bug in trim_the_fat()


Build-tools/mysql-copyright:
  Fixed vim to expandtab's, retab'd code
  Fixed CWD bug in trim_the_fat()

  Fix typo.


client/mysqldump.c:
  Fix typo.

  Cleaned-up trim_the_fat()


Build-tools/mysql-copyright:
  Cleaned-up trim_the_fat()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Correct the help text for mysqldump --set-charset option.


client/mysqldump.c:
  Correct the help text for mysqldump --set-charset option.

   weird compile errors)


Build-tools/Do-compile:
   - using "--with-libedit" is sufficient

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

  --with-charset=binary didn't really work after my previous change.


configure.in:
  --with-charset=binary didn't really work after my previous change.

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

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


sql/ha_myisam.cc:
  Auto merged

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

sql/handler.cc:
  Cleaned up comments

  rpl_charset failed on  Linux/AMD64.


sql/log.cc:
  rpl_charset failed on  Linux/AMD64.

configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

  more logical table/index_flags
  return  HA_ERR_WRONG_COMMAND instead of abstract methods where appropriate
  max_keys and other limits renamed to max_supported_keys/etc
  max_keys/etc are now wrappers to max_supported_keys/etc 
  ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to real {index,rnd}_{init,end} to enforce strict pairing


include/myisam.h:
  increasing myisam_max_temp_file_length
include/my_base.h:
  handler interface cleanup
myisam/mi_static.c:
  warning removed
mysql-test/Makefile.am:
  followup
mysql-test/r/fulltext.result:
  fulltext indexes are not ordered
mysql-test/r/rpl_user_variables.result:
  followup
sql/field.cc:
  index_flags
sql/filesort.cc:
  rnd_init -> ha_rnd_init
  rnd_end -> ha_rnd_end
sql/ha_berkeley.cc:
  cleanup
sql/ha_berkeley.h:
  table/index_flags revamped
sql/ha_heap.cc:
  ensure index is accessed only after index_init (esp. important for temp tables)
sql/ha_heap.h:
  table/index_flags revamped
sql/ha_innodb.cc:
  don't workaround MySQL sloppiness
sql/ha_innodb.h:
  table/index_flags revamped
sql/ha_isam.h:
  table/index_flags revamped
sql/ha_isammrg.h:
  table/index_flags revamped
sql/ha_myisam.cc:
  ensure index is accessed only after index_init (esp. important for temp tables)
sql/ha_myisam.h:
  table/index_flags revamped
sql/ha_myisammrg.h:
  table/index_flags revamped
sql/handler.cc:
  handler interface cleanups
sql/handler.h:
  handler interface cleanups:
    more logical table/index_flags
    return  HA_ERR_WRONG_COMMAND instead of abstract methods
    max_keys and other limits renamed to max_supported_keys/etc
    max_keys/etc are now wrappers to max_supported_keys/etc 
    ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to enforce strict pairing
sql/item_subselect.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/lex.h:
  renamed to avoid conflicts
sql/opt_range.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
  table/index_flags cleanup
sql/opt_range.h:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/opt_sum.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
  table/index_flags cleanup
sql/records.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/sql_acl.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/sql_cache.cc:
  cleanup
sql/sql_delete.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/sql_handler.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/sql_help.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/sql_insert.cc:
  table/index_flags cleanup
sql/sql_select.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
  table/index_flags cleanup
sql/sql_table.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
  table/index_flags cleanup
sql/sql_update.cc:
  index_init/index_end/rnd_init/rnd_end strict pairing fixed
sql/sql_yacc.yy:
  INDEX -> INDEX_SYM
sql/table.cc:
  table/index_flags cleanup

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-am

sql/Makefile.am:
  Final solution to mysql_tzinfo_to_sql problem:
  We can't put it in extra/ directory since it depends on sql/sql_yacc.h and
  sql/ directory depends on extra/comp_err. So this utility have to stay in
  sql/ for a while.
BitKeeper/etc/ignore:
  Added sql/mysql_tzinfo_to_sql_tztime.cc to the ignore list

into mysql.com:/home/pem/work/mysql-4.1

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-am

mysql_tzinfo_to_sql converter was moved to extra/ directory and its build was made 
compatible with older automake versions.


extra/Makefile.am:
  mysql_tzinfo_to_sql converter was moved to extra/ directory and its build was made 
  compatible with older automake versions.
sql/Makefile.am:
  mysql_tzinfo_to_sql converter was moved to extra/ directory and its build was made
  compatible with older automake versions.
BitKeeper/etc/ignore:
  Added extra/tztime.cc extra/mysql_tzinfo_to_sql to the ignore list

test suite fixed.


libmysql/libmysql.c:
  - fixed a bug in protocol -> host integer conversions in send_data_str
tests/client_test.c:
  Fixes to make client_test run on 64 bit Sun:
  - strlen() doesn't accept NULL input
  - Sun is high byte first, so we can't store bind 32-bit variables to 16-bit
  to MYSQL_TYPE_SHORT/TINY

mysql-test/r/ps.result:
  New test case for BUG#3486.
mysql-test/t/ps.test:
  New test case for BUG#3486.
sql/item_create.cc:
  Create an Item_func_found_rows() at parse time, not an Item_int.
sql/item_func.cc:
  Added val_int() method for new Item_func_found_rows class.
sql/item_func.h:
  New class Item_func_found_rows for FOUND_ROWS() function.
sql/sql_select.cc:
  Don't reset thd->limit_found_rows too early, or FOUND_ROWS() wont work.

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4200


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Now ESCAPE in LIKE will accept not only string literal but constant 
delimited expression.


mysql-test/r/func_like.result:
  Added test for bug# 4200 "Parse error on LIKE ESCAPE with parameter binding"
mysql-test/t/func_like.test:
  Added test for bug# 4200 "Parse error on LIKE ESCAPE with parameter binding"
sql/item_cmpfunc.cc:
  Added support for accepting of constant delimited expression as ESCAPE argument to
  Item_func_like.
sql/item_cmpfunc.h:
  Now ESCAPE clause in LIKE will accept not only string literal but constant delimited 
  expression. Thus added member to Item_func_like for storing Item corresponding to this
  expression and changed third argument of cons to be Item* instead of char*.
sql/sql_help.cc:
  Item_func_like now accepts Item* as third argument.
sql/sql_yacc.yy:
  Now ESCAPE clause of LIKE accepts not only string literal but constant delimited expression
  (the most important case is prepared statement parameter of course).

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


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged