sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysys/my_error.c:
  Hand merged

mysql-test/r/ps.result:
  Better error message
mysys/my_error.c:
  Comments added
sql/item.cc:
  Moved a chunk of code from sql_prepare.cc to Item_param::set_from_user_var
sql/item.h:
  Moved a chunk of code from sql_prepare.cc to Item_param::set_from_user_var
sql/item_func.cc:
  Code cleanup
sql/mysql_priv.h:
  Code cleanup
sql/sql_class.cc:
  Code cleanup
sql/sql_parse.cc:
  use user_var_entry::val_str in PREPARE stmt FROM @var.
sql/sql_prepare.cc:
  Post-review fixes and code cleanup.
sql/sql_yacc.yy:
  Coding style fixes

include/mysql.h:
  mysql_stmt_field_count() declaration
libmysql/libmysql.c:
  added mysql_stmt_field_count(): 
  we need this function to ease use of mysql_stmt_result_metadata:
  if mysql_stmt_field_count() != 0 mysql_stmt_result_metadata fails
  only if OOM.
libmysql/libmysql.def:
  declaration for mysql_stmt_field_count()

libmysql/libmysql.c:
  Extended comments for mysql_stmt_init, mysql_stmt_prepare, 
  mysql_stmt_result_metadata.
  Few bits of code moved around and cleaned up.
sql/sql_prepare.cc:
  Commented case with ulonglong length in get_param_length

No need for mysql_commit, especially after DDL statements.


tests/client_test.c:
  No need for mysql_commit, especially after DDL statements.

Is there a way to sefely use MYSQL_BIND structure without bzero?

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1


sql/sql_yacc.yy:
  Auto merged

include/mysql.h:
  Removed obsolete define.
tests/client_test.c:
  Rewritten to use new API.
  Few cleanups.
  A lot of valgrind warnings/errors removed.

innobase/os/os0file.c:
  Fixed typo
sql/sql_class.h:
  Portability fix

  Typo fix.
  Thanks Vladimir Kolpakov who noticed it.


mysys/charset.c:
  Typo fix.
  Thanks Vladimir Kolpakov who noticed it.

into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge


sql/lex.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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


sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill. 
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput  if query uses
 variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
 properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.


mysql-test/r/rpl_server_id1.result:
  it's normal to not run as I have added a test to compare server ids of master and slave
  at startup and stop if equal (unless --replicate-same-server-id)
mysql-test/r/rpl_user_variables.result:
  result update (as we now print charset of user var).
mysql-test/r/user_var.result:
  result update
mysql-test/t/rpl_server_id1.test:
  no need to select as slave is not running
mysql-test/t/user_var.test:
  testing if the content of user vars is escaped when mysqlbinlog prints them,
  and if the name is backquoted.
sql/lex.h:
  new keyword ONE_SHOT
sql/log.cc:
  when writing to the binlog, before writing the actual statement, write some SET ONE_SHOT CHARACTER_SET_CLIENT etc
  for the slave to know the charset variables (which are important as they affect the inserted data).
sql/log_event.cc:
  print charset and collation of user var in mysqlbinlog and SHOW BINLOG EVENTS.
  escape the content of the var. Backquote its name.
  Will ask Bar to check that using my_charset_bin for escaping is ok.
sql/set_var.cc:
  understand SET CHARACTER_SET_CLIENT=10 (don't require a string, accept a number).
  Refuse changing of GLOBAL CHARACTER_SET_SERVER/COLLATION_SERVER if binlog or slave,
  as it will make the master or slave make wrong assumptions.
  A function to catch SET ONE_SHOT on non-charset variables (which is forbidden)
sql/set_var.h:
  no_support_one_shot to know if the var supports ONE_SHOT (only charset vars do, soon timezones).
  Accept int arg in SET CHARACTER_SET_etc
sql/slave.cc:
  when I/O slave thread starts, verify that master's and slave charsets match.
  And by the way verify that server ids are different.
  Don't fail if UNIX_TIMESTAMP() can't be done on master (very old master), that's
  not fatal.
sql/sql_class.cc:
  one_shot
sql/sql_class.h:
  one_shot
sql/sql_lex.h:
  one_shot
sql/sql_parse.cc:
  when SET ONE_SHOT is used, verify that it's only used for charset/collation vars;
  otherwise refuse.
sql/sql_yacc.yy:
  ONE_SHOT keyword in SET

into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged

(Note: This affects only comments, not variable names.)


extra/perror.c:
  Fix skipp -> skip once and for all.
heap/hp_hash.c:
  Fix skipp -> skip once and for all.
isam/_dynrec.c:
  Fix skipp -> skip once and for all.
isam/isamchk.c:
  Fix skipp -> skip once and for all.
isam/isamlog.c:
  Fix skipp -> skip once and for all.
isam/pack_isam.c:
  Fix skipp -> skip once and for all.
isam/test1.c:
  Fix skipp -> skip once and for all.
merge/mrg_open.c:
  Fix skipp -> skip once and for all.
myisam/mi_check.c:
  Fix skipp -> skip once and for all.
myisam/mi_delete.c:
  Fix skipp -> skip once and for all.
myisam/mi_key.c:
  Fix skipp -> skip once and for all.
myisam/mi_search.c:
  Fix skipp -> skip once and for all.
myisam/myisamlog.c:
  Fix skipp -> skip once and for all.
mysys/ChangeLog:
  Fix skipp -> skip once and for all.
mysys/default.c:
  Fix skipp -> skip once and for all.
mysys/mf_iocache.c:
  Fix skipp -> skip once and for all.
mysys/mf_iocache2.c:
  Fix skipp -> skip once and for all.
mysys/mf_pack.c:
  Fix skipp -> skip once and for all.
mysys/mf_soundex.c:
  Fix skipp -> skip once and for all.
mysys/mf_wfile.c:
  Fix skipp -> skip once and for all.
mysys/my_error.c:
  Fix skipp -> skip once and for all.
mysys/my_getwd.c:
  Fix skipp -> skip once and for all.
scripts/mysql_find_rows.sh:
  Fix skipp -> skip once and for all.
sql/sql_yacc.yy:
  Fix skipp -> skip once and for all.
sql/time.cc:
  Fix skipp -> skip once and for all.
strings/ctype-big5.c:
  Fix skipp -> skip once and for all.
strings/ctype-gbk.c:
  Fix skipp -> skip once and for all.
strings/ctype-tis620.c:
  Fix skipp -> skip once and for all.

into mc05.(none):/space2/tomas/mm

  Make allocation for file path more uniform: always use mem_alloc(), not ut_malloc()


innobase/fil/fil0fil.c:
  Make allocation for file path more uniform: always use mem_alloc(), not ut_malloc()

  Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup


innobase/fil/fil0fil.c:
  Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup
innobase/os/os0file.c:
  Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test

XML and "collation customization" language parsers.

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test

into mysql.com:/home/jonas/src/mysql-4.1-ndb

into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


configure.in:
  Auto merged

  local flag in ndbapi to set -O2 since problems occur with -O3
pc.hpp, Emulator.hpp, Emulator.cpp, ErrorReporter.cpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ErrorReporter.hpp:
  removed NDEBUG and removed THREAD_ASSERT
Dbdict.cpp:
  NDB_DEBUG -> VM_TRACE
configure.in:
  cleaned up ndb CXX flags and added optional flag possibility


configure.in:
  cleaned up ndb CXX flags and added optional flag possibility
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  NDB_DEBUG -> VM_TRACE
ndb/src/kernel/error/ErrorReporter.cpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/error/ErrorReporter.hpp:
  removed NDEBUG and removed THREAD_ASSERT
ndb/src/kernel/vm/Emulator.cpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/vm/Emulator.hpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/vm/pc.hpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/ndbapi/Makefile.am:
  local flag in ndbapi to set -O2 since problems occur with -O3

ndb/test/run-test/main.cpp:
  More warnings

into mysql.com:/home/jonas/src/mysql-4.1-ndb

Still don't know reason, but this works

into mc01.ndb.mysql.com:/space/mysql-4.1-ndb

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

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

Added new windows configuration


VC++Files/client/mysqlclient.dsp:
  Added new configuration
VC++Files/zlib/zlib.dsp:
  Added new configuration
libmysql/libmysql.c:
  Moved check function from libmysql.c to client.c
sql-common/client.c:
  Moved check function from libmysql.c to client.c

  Fix typo spotted by Paul DuBois: 'no continue' -> 'not continue'


innobase/fil/fil0fil.c:
  Fix typo spotted by Paul DuBois: 'no continue' -> 'not continue'

myisam/rt_index.c:
  Auto merged
myisam/rt_index.h:
  Auto merged
myisam/rt_mbr.c:
  Auto merged
myisam/rt_mbr.h:
  Auto merged
myisam/rt_split.c:
  Auto merged
myisam/rt_test.c:
  Auto merged
sql/spatial.cc:
  Auto merged

some changes to make code nicer


include/myisampack.h:
  mi_sint1korr and similar things added to do conversion in an
  uniform way
myisam/rt_index.c:
  'if' simplified
myisam/rt_mbr.c:
  some fixes to make code nicer and smaller
myisam/rt_test.c:
  some modifications to extend test
mysql-test/r/gis-rtree.result:
  result became slightly different because of changes made

ndb/test/run-test/main.cpp:
  1) Updated names of binaries
  2) Use NDB_CONNECTSTRING