into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1

server': the bug occurs when arguments of LIKE function are in 
differentcharacter sets. If these character sets are compatible, 
we create an item-converter. In prepared mode, this item
needs to be created in memory of current prepared statement.


mysql-test/r/ps.result:
  Test for Bug#4368 added.
mysql-test/t/ps.test:
  A test case for bug#4368 '"like" fails in PreparedStatement, 
  crashes server'.

configure.in:
  define macro "DEFINE_ALL_CHARACTER_SETS" completely

mysql_create_system_tables, just in case


scripts/mysql_create_system_tables.sh:
  add engine=MyISAM to all create table statements, just in case

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1


configure.in:
  Auto merged

2. changed key_* to el_ley_* in the libedit key.h
   (because it's in the conflict with the aix definitions)
3. use libedit_term.h instead of term.h in the cmd-line-utils/libedit/el.h
4. added definition of MIN in the cmd-line-utils/libedit/read.c 
   (if it wasn't defined yet)
5. discarded definition of SUNOS macro from configure.in 
   (now we don't include term.h in the el.h at all)


BitKeeper/deleted/.del-term.h~23716a5310508e0:
  Delete: cmd-line-utils/libedit/term.h
cmd-line-utils/libedit/Makefile.am:
  discarded term.h from the distribution
cmd-line-utils/libedit/el.c:
  changed 
  key_init -> el_key_init
  key_end -> el_key_end
cmd-line-utils/libedit/el.h:
  change 
    #include "term.h" 
  to 
    #include "libedit_term.h"
cmd-line-utils/libedit/key.c:
  changed functions key_... to el_key_... 
  because it's in conflict with the aix definitions
cmd-line-utils/libedit/key.h:
  changed functions key_... to el_key_... 
  because it's in conflict with the aix definitions
cmd-line-utils/libedit/map.c:
  changed functions key_... to el_key_... 
  because it's in conflict with the aix definitions
cmd-line-utils/libedit/read.c:
  1. added definition of MIN
  2. fixed problems with undefined uint
  3. changed key_get to el_key_get
cmd-line-utils/libedit/term.c:
  1. discarded #include "term.h" at all
  2. changed functions key_* to el_key_*
  3. add declaration of el_key__decode_str
cmd-line-utils/libedit/tty.c:
  changed functions key_... to el_key_... 
  because it's in conflict with the aix definitions
configure.in:
  discarded definition of SUNOS macro
  (libedit doesn't require it anymore)

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


sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Auto merged

Add missing parameter to strxnmov() that caused some INTO OUTFILE commands to core dump


mysql-test/mysql-test-run.sh:
  Ensure that clients used the supplied --socket argument
mysql-test/r/lowercase_table.result:
  Remove tables used in other tests that may affect this one
mysql-test/r/rename.result:
  Remove tables used in other tests that may affect this one
mysql-test/t/lowercase_table.test:
  Remove tables used in other tests that may affect this one
mysql-test/t/rename.test:
  Remove tables used in other tests that may affect this one
sql/item_cmpfunc.cc:
  Remove not relevant comment
sql/sql_class.cc:
  Add missing parameter to strxnmov() that caused some INTO OUTFILE commands to core dump
sql/sql_load.cc:
  Remove extra '/' after mysql_real_data_home
sql/sql_table.cc:
  Remove extra '/' after mysql_real_data_home

into mysql.com:/Users/mikron/mysql-4.1

  Change a reference to ibman.php to a reference in the MySQL manual; someone should change the 20 other places in the source code where we still refer to ibman.php


innobase/srv/srv0start.c:
  Change a reference to ibman.php to a reference in the MySQL manual; someone should change the 20 other places in the source code where we still refer to ibman.php

parameters": when unpacking binary time recieved from client, handle
the case when length is 0: it means all MYSQL_TIME members are zero.


include/my_time.h:
  Declaration for set_zero_time: a tiny piece of code, which I
  see no reason to not reuse.
libmysql/libmysql.c:
  set_zero_time implementation is now shared between client and
  server.
sql-common/my_time.c:
  set_zero_time implementation added.
sql/sql_prepare.cc:
  A fix for Bug#4231 "Wrong result with MYSQL_TIME parameters": 
  when unpacking binary time recieved from client, handle the
  case when length is 0: it means all MYSQL_TIME members are zero.
tests/client_test.c:
  Test case for bug#4231 "Wrong result with MYSQL_TIME parameters"

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


sql/sql_select.cc:
  Auto merged
tests/client_test.c:
  Auto merged

mysql-test/mysql-test-run.sh:
  Export MASTER_MYSOCK (used in some tests)
mysql-test/t/alter_table.test:
  Use MASTER_MYSOCK instead of master.sock

than 32 bytes. getWords interpreted length as number of words and
got number of bytes.

into mysql.com:/Users/mikron/mysql-4.1

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

into hundin.mysql.fi:/home/marko/k/mysql-4.1

into hundin.mysql.fi:/home/marko/k/mysql-4.1

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


sql/sql_class.cc:
  Auto merged

sql/sql_class.cc:
  Code simplified with strxnmov

mysql-test/r/func_gconcat.result:
  fixed typo
sql/item_sum.cc:
  fixed typo

  row_drop_table_for_mysql(): Removed duplicated block of code.


innobase/row/row0mysql.c:
  row_drop_table_for_mysql(): Removed duplicated block of code.

from Item_bool_func2 into DTCollation to make it reusable
for other types of items.

replace all (mis)uses of it with int32.

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
  Auto merged
BitKeeper/deleted/.del-convert.cc~437689acaffb7446:
  Auto merged
BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796:
  Auto merged
BitKeeper/deleted/.del-message.mc:
  Delete: VC++Files/sql/message.mc
BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92:
  Auto merged
BitKeeper/deleted/.del-win1251.conf~b6bb6681f02917b6:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqladmin.c:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlmanager-pwgen.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/m_string.h:
  Auto merged
include/my_getopt.h:
  Auto merged
isam/isamchk.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
strings/strto.c:
  Auto merged
strings/strtol.c:
  Auto merged
strings/strtoll.c:
  Auto merged
strings/strtoull.c:
  Auto merged
support-files/Makefile.am:
  Auto merged
tools/mysqlmanager.c:
  Auto merged

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


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged

  Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.


Build-tools/Do-compile:
  Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.

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


sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

mysql-test/r/negation_elimination.result:
  new tests of negation elimination
mysql-test/t/negation_elimination.test:
  new tests of negation elimination
sql/item.h:
  test of boolean functions added
sql/item_cmpfunc.cc:
  NOT subtree is already checked, so wee need to return just argument
sql/item_cmpfunc.h:
  test of boolean functions added
sql/mysql_priv.h:
  'place' to detect WHERE clause
sql/sql_parse.cc:
  function for creation negated expression
sql/sql_select.cc:
  removed unused function
sql/sql_select.h:
  removed unused function
sql/sql_yacc.yy:
  'place' to detect WHERE clause

used in the handle_options() function (instead of using additional 
handle_option() parameter). The default value of the 
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.


client/mysql.cc:
  Removed extra handle_optins()'s parameter.
client/mysqladmin.c:
  Removed extra handle_optins()'s parameter.
client/mysqlbinlog.cc:
  Removed extra handle_optins()'s parameter.
client/mysqlcheck.c:
  Removed extra handle_optins()'s parameter.
client/mysqldump.c:
  Removed extra handle_optins()'s parameter.
client/mysqlimport.c:
  Removed extra handle_optins()'s parameter.
client/mysqlmanager-pwgen.c:
  Removed extra handle_optins()'s parameter.
client/mysqlmanagerc.c:
  Removed extra handle_optins()'s parameter.
client/mysqlshow.c:
  Removed extra handle_optins()'s parameter.
client/mysqltest.c:
  Removed extra handle_optins()'s parameter.
extra/my_print_defaults.c:
  Removed extra handle_optins()'s parameter.
extra/mysql_install.c:
  Removed extra handle_optins()'s parameter.
extra/mysql_waitpid.c:
  Removed extra handle_optins()'s parameter.
extra/perror.c:
  Removed extra handle_optins()'s parameter.
extra/resolve_stack_dump.c:
  Removed extra handle_optins()'s parameter.
extra/resolveip.c:
  Removed extra handle_optins()'s parameter.
include/my_getopt.h:
  Removed extra handle_optins()'s parameter.
isam/isamchk.c:
  Removed extra handle_optins()'s parameter.
isam/pack_isam.c:
  Removed extra handle_optins()'s parameter.
myisam/mi_test1.c:
  Removed extra handle_optins()'s parameter.
myisam/myisam_ftdump.c:
  Removed extra handle_optins()'s parameter.
myisam/myisamchk.c:
  Removed extra handle_optins()'s parameter.
myisam/myisampack.c:
  Removed extra handle_optins()'s parameter.
sql/gen_lex_hash.cc:
  Removed extra handle_optins()'s parameter.
sql/mysqld.cc:
  Removed extra handle_optins()'s parameter.
tools/mysqlmanager.c:
  Removed extra handle_optins()'s parameter.

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1

 - tagged ChangeSet@1.2013 as "mysql-4.1.4"


configure.in:
   - bumped up version number in configure.in to "4.1.5-gamma"

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


sql/sql_base.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1


cmd-line-utils/libedit/Makefile.am:
  Auto merged
configure.in:
  Auto merged