cmp_charset was not initialized
  valgrind fix
  LIKE now works according to coercibility rules


sql/item_cmpfunc.cc:
  cmp_charset was not initialized
  valgrind fix
  LIKE now works according to coercibility rules

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


sql/field.cc:
  Auto merged

myisam/rt_index.c:
  Should call find_first() instead of find_next() after key deletion.
  Fixed type cast.
myisam/sp_key.c:
  Fixed spatial key creation.
sql/field.cc:
  To get rid of warning.

NATIONAL CHAR VARYING(n)
NCHAR VARYING(n)

are now aliases for

VARCHAR(n) CHARACTER SET utf8

is now synonim for
CHARACTER(n) CHARACTER SET utf8

SELECT _latin1 0x345678;
SELECT _latin x'345678';

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

into narttu.mysql.fi:/my/mysql-4.1


configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Docs/internals.texi:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_vio.c:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
BitKeeper/deleted/.del-password.c~76f30876e68eddb4:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
strings/strto.c:
  Auto merged

into narttu.mysql.fi:/my/mysql-4.0

Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists


Docs/internals.texi:
  Updated description for how DATE, TIME and TIMESTAMP are stored
mysql-test/r/create.result:
  New tests
mysql-test/t/create.test:
  New tests
sql/handler.cc:
  Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists.
sql/sql_parse.cc:
  Fix that we return hostname instead of IP in SHOW PROCESSLIST
sql/sql_show.cc:
  Print right hostname or IP in SHOW PROCESSLIST

Fixed non fatal memory leak in slave code.


mysql-test/r/func_test.result:
  Added test for DIV
mysql-test/t/func_test.test:
  Added test for DIV
mysys/my_alloc.c:
  More DBUG statements
sql/item_func.cc:
  Added support for ULONG division with DIV
sql/log_event.cc:
  Fixed memory leak (Wrong call to init_sql_alloc)
sql/slave.cc:
  Fixed memory leak (Wrong call to init_sql_alloc)
sql/sql_base.cc:
  More DBUG statements
sql/sql_class.cc:
  Added init_for_queries() to fix memory leak in slave code
sql/sql_class.h:
  Added init_for_queries() to fix memory leak in slave code
sql/sql_error.cc:
  More DBUG statements
sql/sql_parse.cc:
  Added init_for_queries() to fix memory leak in slave code
sql/unireg.h:
  Moved memory defaults to include file

  Always compile utf8


configure.in:
  Always compile utf8

comparison" table, "SQL Complete, Really", page 162

into mysql.com:/space/my/mysql-4.0-build

mysql-test/r/ctype_collate.result:
  NO COLLATION has less coercibility than IMPLICIT and COERCIBLE
sql/item.cc:
  Function to choose collation for dyadic operations
sql/item.h:
  NO COLLATION has less coercibility than IMPLICIT and COERCIBLE
sql/item_func.cc:
  Function to choose collation for dyadic operations
sql/item_strfunc.cc:
  Function to choose collation for dyadic operations
sql/item_strfunc.h:
  Use arg's attributes

into narttu.mysql.fi:/my/mysql-4.0


configure.in:
  Auto merged

MEMORY is alias for HEAP for CREATE TABLE ... TYPE=HEAP
Fixed bug in multi-table-update where a row could be updated several times


mysql-test/r/heap.result:
  Test of CREATE TABLE ... type=MEMORY
mysql-test/r/innodb.result:
  Added multi-update-test
mysql-test/r/multi_update.result:
  Added multi-update-test
mysql-test/t/heap.test:
  Test of CREATE TABLE ... type=MEMORY
mysql-test/t/innodb.test:
  Added multi-update-test
mysql-test/t/multi_update.test:
  Added multi-update-test
sql/ha_innodb.h:
  Allow optimzation of multi-table-update also for InnoDB tables
sql/handler.h:
  Allow optimzation of multi-update also for InnoDB tables
sql/key.cc:
  After merge fix
sql/lex.h:
  MEMORY is alias for HEAP
sql/sql_test.cc:
  Fixed wrong printf
sql/sql_update.cc:
  Fixed bug in multi-table-update where a row could be updated several times
sql/sql_yacc.yy:
  MEMORY is alias for HEAP

   symbol in libmysqlclient) (thanks to Dennis Haney for the initial patch)
 - cleanup: removed client/password.c (not used at all) and
   libmysql/password.c (should rather be a symlink to sql/password.c instead)
 - applied HPUX11 portability fix for char_val declaration to sql/password.c
   (taken from libmysql/password.c)


BitKeeper/deleted/.del-password.c~c036d4f8b3280843:
  Delete: client/password.c
BitKeeper/deleted/.del-password.c~76f30876e68eddb4:
  Delete: libmysql/password.c
include/mysql_com.h:
   - replaced "rnd" with "my_rnd"
libmysql/Makefile.am:
   - removed dead piece of code ($qs was not defined)
   - symlink password.c from the sql directory
libmysqld/Makefile.am:
   - use password.c from the sql directory instead
sql/item_func.cc:
   - replaced "rnd" with "my_rnd"
sql/mysqld.cc:
   - replaced "rnd" with "my_rnd"
sql/password.c:
   - replaced "rnd" with "my_rnd"
sql/sql_class.cc:
   - replaced "rnd" with "my_rnd"
sql/sql_crypt.cc:
   - replaced "rnd" with "my_rnd"

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

GeomertyFromWKB() function.
SRID() function.
::store() methods for Field_geom.
Code cleanup.


myisam/sp_key.c:
  SRID support.
mysql-test/r/gis.result:
  We should use GeometryFromWKB().
mysql-test/t/gis.test:
  We should use GeometryFromWKB().
sql/field.cc:
  SRID support.
  ::store() methods for Field_geom.
  Code cleanup.
sql/field.h:
  SRID support.
  ::store() methods for Field_geom.
  Code cleanup.
sql/item_cmpfunc.cc:
  SRID support.
  Code cleanup.
sql/item_create.cc:
  Code cleanup.
sql/item_create.h:
  Code cleanup.
sql/item_func.cc:
  SRID support.
  Code cleanup.
sql/item_func.h:
  SRID support.
sql/item_strfunc.cc:
  SRID support.
  GeometryFromWKB() function.
  Code cleanup.
sql/item_strfunc.h:
  SRID support.
  GeometryFromWKB() function.
  Code cleanup.
sql/lex.h:
  GeometryFromWKB() function.
  SRID() function.
sql/spatial.cc:
  Code cleanup.
sql/spatial.h:
  Code cleanup.
sql/sql_yacc.yy:
  Fix for xxxFromText() functions.
  GeometryFromWKB() function.

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

mysys/charset.c:
  Clear all fields at the end of previous charset

Fixed problem with 'wrong packet number' in union


include/my_global.h:
  Fix for valgrind
mysql-test/t/rpl_rotate_logs.test:
  Fix to avoid timeing problem
sql/item.h:
  Indentation change
sql/set_var.cc:
  Fix to avoid reference to uninitialized memory
sql/sql_select.cc:
  More DBUG_PRINT messages
  Fixed problem with 'wrong packet number' in union (tmp_join.error was not correctly reset)
sql/sql_union.cc:
  Simple code cleanup
strings/ctype-simple.c:
  Fix for valgrind

 - tagged ChangeSet 1.1671 as mysql-4.0.12


configure.in:
   - updated version number (4.0.12 -> 4.0.13)

As a fix, my_charset_bin is now used in master-slave packets instead
of system_charset_info.

  SET NAMES BINARY now works


sql/sql_yacc.yy:
  SET NAMES BINARY now works

innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
sql/key.cc:
  Auto merged
configure.in:
  Merge with 3.23
mysql-test/r/innodb.result:
  Merge with 3.23
mysql-test/t/innodb.test:
  Merge with 3.23
strings/strto.c:
  Merge with 3.23

sql/ha_myisam.cc:
  Added function comment

mysql-test/r/innodb.result:
  Test of 'halloween bug'
mysql-test/t/innodb.test:
  Test of 'halloween bug'
strings/strto.c:
  Portability fix

a deadlock between I/O and SQL threads in replication
when relay_log_space is too small. This fixes bug #79.


sql/log.cc:
  New variable rli->ignore_log_space_limit to resolve
  a deadlock between I/O and SQL threads in replication
  when relay_log_space is too small.
sql/slave.cc:
  New variable rli->ignore_log_space_limit to resolve
  a deadlock between I/O and SQL threads in replication
  when relay_log_space is too small.
sql/slave.h:
  New variable rli->ignore_log_space_limit to resolve
  a deadlock between I/O and SQL threads in replication
  when relay_log_space is too small.
sql/sql_repl.cc:
  New variable rli->ignore_log_space_limit to resolve
  a deadlock between I/O and SQL threads in replication
  when relay_log_space is too small.

  new file

  As far as bk could not apply delta,
  I removed it.  Now I'm adding the
  new version into the tree again.

  Delete: mysql-test/r/ctype_many.result

  I could not commit it, bk told it can't apply binary delta
  for textual file.


BitKeeper/deleted/.del-ctype_many.result~9b541c4def2b5afb:
  Delete: mysql-test/r/ctype_many.result