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

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

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

mysql-test/t/rpl_relayrotate.test:
  a comment
sql/log_event.cc:
  removed irrelevant comment, added another one.

Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.


mysql-test/r/rpl_relayrotate.result:
  remove timeout which was too short for Valgrind
mysql-test/r/rpl_until.result:
  updated error message
mysql-test/t/rpl_relayrotate.test:
  removed timeout which was too short for Valgrind
sql/log_event.cc:
  Fix for a rpl_relayrotate failure. The problem was that Rotate_log_event::exec_event()
  believed that the relay log was corrupted. Fixed it by moving the test for
  corruption to Start_log_event::exec_event(). 
  Changed Rotate_log_event::exec_event() to not increment positions when the
  event is seen in the middle of a transaction (that was an old bug found by
  chance :)

  Query cache now takes in account character_set_results and collation_connection


sql/mysql_priv.h:
  Query cache now takes in account character_set_results and collation_connection
sql/sql_cache.cc:
  Query cache now takes in account character_set_results and collation_connection

Portuguese and Swedish are not affected (they were already translated).


sql/share/czech/errmsg.txt:
  changed tense
sql/share/danish/errmsg.txt:
  changed tense
sql/share/dutch/errmsg.txt:
  changed tense
sql/share/english/errmsg.txt:
  changed tense
sql/share/estonian/errmsg.txt:
  changed tense
sql/share/french/errmsg.txt:
  changed tense
sql/share/german/errmsg.txt:
  changed tense
sql/share/greek/errmsg.txt:
  changed tense
sql/share/hungarian/errmsg.txt:
  changed tense
sql/share/italian/errmsg.txt:
  changed tense
sql/share/japanese/errmsg.txt:
  changed tense
sql/share/korean/errmsg.txt:
  changed tense
sql/share/norwegian-ny/errmsg.txt:
  changed tense
sql/share/norwegian/errmsg.txt:
  changed tense
sql/share/polish/errmsg.txt:
  changed tense
sql/share/romanian/errmsg.txt:
  changed tense
sql/share/russian/errmsg.txt:
  changed tense
sql/share/serbian/errmsg.txt:
  changed tense
sql/share/slovak/errmsg.txt:
  changed tense
sql/share/spanish/errmsg.txt:
  changed tense
sql/share/ukrainian/errmsg.txt:
  changed tense

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

correcting it now. Thanks Dmitri for spotting this.


mysql-test/r/user_var.result:
  result update
mysql-test/t/user_var.test:
  a simple test
sql/item_func.cc:
  Had mangled the order of if()s in a previous changeset (1.1596) (not pushed),
  correcting it now.

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


sql/mysql_priv.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

sql/mysql_priv.h:
  Structure for storing parameters of query in query cache
sql/sql_cache.cc:
  Structure for storing parameters of query in query cache
sql/sql_parse.cc:
  Structure for storing parameters of query in query cache

When an update query is to be written to the binlog, and it reads unset
user variables (example: INSERT INTO t VALUEs(@A) where @A does not exist),
we create the variable like if it had been set with SET before, and we loop
(i.e. we redo the steps of logging, now that the variable exists).


mysql-test/r/rpl_user_variables.result:
  result update.
mysql-test/t/rpl_user_variables.test:
  test to see if unset user variables are written to the binlog
sql/item_func.cc:
  When an update query is to be written to the binlog, and it reads unset
  user variables (example: INSERT INTO t VALUEs(@A) where @A does not exist),
  we create the variable like if it had been set with SET before, and we loop
  (i.e. we redo the steps of logging, now that the variable exists).

into teton.kitebird.com:/home/paul/mysql-4.1

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

there was an error about sendind prepared parameters to the server


libmysqld/lib_sql.cc:
  parameter's length added as a parameter
sql/ha_berkeley.cc:
  these lines sometimes crashes in embedded library
  so i #ifdef-ed it
sql/item.h:
  add the data_len parameter in the embedded case
sql/sql_prepare.cc:
  i added macroses to make headers of store_param_xxx functions
  they have different number of parameters in standalone an embedded servers
  also get_param_length now is implemented differently in embedded server

  Stupid typo. Led to compilation failure with non-gcc compilers.


strings/ctype-mb.c:
  Stupid typo. Led to compilation failure with non-gcc compilers.

handling of init-file option added to embedded library
main problem was killing of output (resulting recordsets etc)
i added checks for empty output in Protocol:: methods
better solution could be special Protocol_nul class to redirect
results to nowhere


libmysqld/lib_sql.cc:
  code was added to call read_init_file
  Protocol methods now can support output to nowhere
sql/mysqld.cc:
  bootstrap function extended to work in embedded library
sql/sql_parse.cc:
  handle_bootstrap modified to work in embedded library

I made libmysqld not to do freopen(stdout...)
I think we need better solution here so i added it as a worklog entry #1247


sql/mysqld.cc:
  freopen #ifdef-ed
  Not a perfect solution though

libmysqld/lib_sql.cc:
  some programs check mysql_error for empty string
sql/log.cc:
  in embedded library these members can be NULL

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

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

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

scripts/fill_help_tables.sh:
  added fine error messages

embedded library
some fixes - cleanup procedure changed for embedded library - deletion of
embedded mysql->thd


include/mysql.h:
  free_embedded_thd added to the list of virtual methods
libmysqld/embedded_priv.h:
  function deleted
libmysqld/lib_sql.cc:
  function moved upper in file
sql-common/client.c:
  call of free_embedded_thd added

WL604 Privilegies in embedded library
another bug fixed


sql/sql_parse.cc:
  flag selection fixed

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


sql/sql_db.cc:
  Auto merged

WL#604 Privileges in embedded library
bugs fixed


sql/mysql_priv.h:
  reload_acl_and_cache interface unifdefed
sql/sql_parse.cc:
  ifdefs added/removed

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

   if a variable is not defined (empty).

   (crc32.c is included by mysys/my_crc32.c)

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

Don't free the client's selected db (thd->db) when it has been DROPped,
if this is a slave thread; the x_free() was causing a lot
of various bugs in rpl_loaddata_rule_m (garbage characters, segfault, hangs in
other threads).
A small post-merge fix (rli->inside_transaction exists in 4.0 only).


sql/log_event.cc:
  Post-merge fix (rli->inside_transaction existed in 4.0 only)
sql/sql_db.cc:
  Don't free the client's selected db (thd->db) when it has been DROPped,
  if this is a slave thread; the x_free() was causing a lot
  of various bugs in rpl_loaddata_rule_m which does a DROP DATABASE 
  (garbage characters, segfault, hangs in other threads).

into mysql.com:/home/dlenev/src/mysql-4.1-rplunt

mysql-test/r/rpl_until.result:
  Fixed race then sometimes io slave thread stopped without managing to get any data from master and sometimes not.
mysql-test/t/rpl_until.test:
  Fixed race then sometimes io slave thread stopped without managing to get any data from master and sometimes not.

include/mysql.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
libmysqld/lib_sql.cc:
  SCCS merged
libmysqld/libmysqld.c:
  SCCS merged
sql/sql_parse.cc:
  SCCS merged

WL#604 Privileges in embedded library
code added to check privileges in embedded library
NO_EMBEDDED_ACCESS_CHECKS macros inserted in code so we can exclude
access-checking parts. Actually we now can exclude these parts from
standalone server as well. Do we need it?
Access checks are disabled in embedded server by default. One should
edit libmysqld/Makefile manually to get this working.
We definitely need the separate configure for embedded server


include/mysql.h:
  options added so user of embedded library can set the client host
  it will work as if the usual client connects from this host
libmysqld/Makefile.am:
  Usually one doesn't need access checking in embedded library
  we definitely should separate configure for embedded server
libmysqld/lib_sql.cc:
  necessary code for getting passwords and access checks added
libmysqld/libmysqld.c:
  code #ifdef-ed - we use this only when we check permissions
sql-common/client.c:
  one mysql_close left now
sql/item_strfunc.cc:
  #ifndef-s added
sql/log.cc:
  #ifndef-s added
sql/mysql_priv.h:
  #ifndef-s added
  also i removed default parameters from check_access and check_table_access
  definitions to set definitions working
sql/mysqld.cc:
  #ifndef-s added
  localhost renamed to my_localhost
sql/repl_failsafe.cc:
  parameters added
sql/set_var.cc:
  #ifndef-s added
sql/sql_acl.cc:
  #ifndef-s added
sql/sql_acl.h:
  #ifndef-s added
sql/sql_base.cc:
  #ifndef-s added
sql/sql_cache.cc:
  #ifndef-s added
sql/sql_class.cc:
  #ifndef-s added
sql/sql_db.cc:
  #ifndef-s added
sql/sql_derived.cc:
  #ifndef-s added
sql/sql_insert.cc:
  #ifndef-s added
sql/sql_parse.cc:
  a horde of #ifndef-s added
sql/sql_prepare.cc:
  #ifndef-s added
sql/sql_repl.cc:
  parameters added
sql/sql_show.cc:
  #ifndef-s added
sql/sql_update.cc:
  #ifndef-s added