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

Two things changed:
1. Repeated queries are only stored once in the history.
2. Multiline queries are stored in a concated format in the history, 
   in addition to pieces. 
(Push approved by serg)


client/mysql.cc:
  Fix up history in readline implementation.
  1. Repeated queries are only stored once in the history.
  2. Multiline queries are stored in a concated format in the history.
  (Push approved by serg)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

SHOW SLAVE STATUS.

BUG#2826 "Seconds behind master weirdness"
(sometimes this column of SHOW SLAVE STATUS shows a very big value,
in fact a small negative number casted to ulonglong).
This problem was reported by only one user, but which uses
synchronized time between his servers.
As suggested by the user, to hide this I display max(0, the value)
so that it will be less confusing. For a user, seeing 0 is probably
better than seeing -1 (both tell you that the slave is very close
to the master).


sql/slave.cc:
  Don't display a negative Seconds_Behind_Master in SHOW SLAVE STATUS.

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


include/my_sys.h:
  Auto merged

reviewed in Saint-Petersbourg (including post-review fixes).


include/my_sys.h:
  Added clear_alloc_root (reset alloc root without freeing its memory)
sql/item.h:
  - rename setup_param -> set_parap (function assigns parameter value to item)
sql/mysql_priv.h:
  - all return values are void, because return value is never checked in
      dispatch_command
  - removed unused declaration of setup_param_functions
sql/protocol.h:
  - unused declarations of setup_params_data* removed
sql/sql_class.cc:
  Cleanup:
    - bzero(mem_root) replaced with clear_alloc_root
    - query_id and command members moved back to THD from Statement
  Assignment of mem_root, free_list, query_id and command optimized
  away from set_statement().
sql/sql_class.h:
  - query_id and command moved back to THD from Statement
sql/sql_lex.h:
  - better type for param_list
  - param_count is the same thing as param_list.elements
sql/sql_parse.cc:
  - comments for dispatch_command
sql/sql_prepare.cc:
  Cleanup:
  - added comments to many functions and removed trailing spaces in many 
    lines, some stale comments removed.
  - it's faster to iterate using pointers, than classes
  - Renames: error_in_prepare renamed to get_longdata_error (because it is set
    when there is an error in mysql_send_longdata, rather than in
    mysql_prepare), embedded versions of placeholder assignement functions
    now have prefix emb_, setup_ functions renamed to set_, because they
    perform assignment, not installation, setup_params_data now doesn't
    call insert_params and was renamed to setup_set_param_functions,
  - find_prepared_statement should not send error if called from no-reply
    calls, like mysql_stmt_reset
  - error reporting is checked up, to always report errors and not report
    errors twice. send_prep_stmt can be done mostly in send_prepare_result, 
    rather than in test_* functions.
  - now we don't need to reinit THD->mem_root/free_list in mysql_stmt_execute,
    because it's not reset there.
tests/client_test.c:
  - removed second call to test_subqueries

libmysqld/lib_sql.cc:
  Removing *_skip variables
sql/ha_berkeley.cc:
  Removing *_skip variables
sql/ha_berkeley.h:
  Removing *_skip variables
sql/ha_innodb.cc:
  Removing *_skip variables
sql/ha_innodb.h:
  Removing *_skip variables
sql/ha_isam.cc:
  Removing *_skip variables
sql/ha_isam.h:
  Removing *_skip variables
sql/handler.cc:
  Removing *_skip variables
  Cleanup ha_checktype()
sql/mysqld.cc:
  Removing *_skip variables
sql/sql_show.cc:
  Removing *_skip variables

When password was granted with a global grant, then granting 
privileges on database level, without password being specified, 
will temporary (in memory) set password to ''.

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

myisam/ft_nlq_search.c:
  bug#3011 - multi-byte charset in fulltext
  cleanup

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

include/mysqld_error.h:
  more generic error code
mysql-test/r/func_compress.result:
  update after message change
mysql-test/r/loaddata.result:
  update after message change
mysql-test/r/warnings.result:
  update after message change
sql/share/czech/errmsg.txt:
  message change
sql/share/danish/errmsg.txt:
  message change
sql/share/dutch/errmsg.txt:
  message change
sql/share/english/errmsg.txt:
  message change
sql/share/estonian/errmsg.txt:
  message change
sql/share/french/errmsg.txt:
  message change
sql/share/german/errmsg.txt:
  message change
sql/share/greek/errmsg.txt:
  message change
sql/share/hungarian/errmsg.txt:
  message change
sql/share/italian/errmsg.txt:
  message change
sql/share/japanese/errmsg.txt:
  message change
sql/share/korean/errmsg.txt:
  message change
sql/share/norwegian-ny/errmsg.txt:
  message change
sql/share/norwegian/errmsg.txt:
  message change
sql/share/polish/errmsg.txt:
  message change
sql/share/portuguese/errmsg.txt:
  message change
sql/share/romanian/errmsg.txt:
  message change
sql/share/russian/errmsg.txt:
  message change
sql/share/slovak/errmsg.txt:
  message change
sql/share/spanish/errmsg.txt:
  message change
sql/share/swedish/errmsg.txt:
  message change
sql/share/ukrainian/errmsg.txt:
  message change

sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
include/mysqld_error.h:
  for merge
mysql-test/r/loaddata.result:
  for merge
mysql-test/r/warnings.result:
  for merge
sql/share/czech/errmsg.txt:
  for merge
sql/share/danish/errmsg.txt:
  for merge
sql/share/dutch/errmsg.txt:
  for merge
sql/share/english/errmsg.txt:
  for merge
sql/share/estonian/errmsg.txt:
  for merge
sql/share/french/errmsg.txt:
  for merge
sql/share/german/errmsg.txt:
  for merge
sql/share/greek/errmsg.txt:
  for merge
sql/share/hungarian/errmsg.txt:
  for merge
sql/share/italian/errmsg.txt:
  for merge
sql/share/japanese/errmsg.txt:
  for merge
sql/share/korean/errmsg.txt:
  for merge
sql/share/norwegian-ny/errmsg.txt:
  for merge
sql/share/norwegian/errmsg.txt:
  for merge
sql/share/polish/errmsg.txt:
  for merge
sql/share/portuguese/errmsg.txt:
  for merge
sql/share/romanian/errmsg.txt:
  for merge
sql/share/russian/errmsg.txt:
  for merge
sql/share/slovak/errmsg.txt:
  for merge
sql/share/spanish/errmsg.txt:
  for merge
sql/share/swedish/errmsg.txt:
  for merge
sql/share/ukrainian/errmsg.txt:
  for merge

"replicate-wild-*-table=db.% does not apply to ALTER DATABASE"
apply replicate-* rules to ALTER DATABASE like we already do
for CREATE DATABASE/ DROP DATABASE.


sql/sql_parse.cc:
  apply replicate-* rules to ALTER DATABASE like we already do
  for CREATE DATABASE/ DROP DATABASE.

mysql-test/r/loaddata.result:
  update after typo fixed
mysql-test/r/warnings.result:
  update after typo fixed

sql/item_strfunc.cc:
  typo fixed
sql/share/english/errmsg.txt:
  wording

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

update max_used_connections *after* thread_count was increased to take into account the current connection

   in class Statement")

on different systems sprintf("%.3", 1.555499999999999) behaves differently

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


sql/item_strfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

UUID() function


BitKeeper/etc/ignore:
  Added mysys/test_gethwaddr to the ignore list
include/my_sys.h:
  my_gethwaddr()
mysys/Makefile.am:
  my_gethwaddr
sql/item_create.cc:
  UUID() function
sql/item_create.h:
  UUID() function
sql/item_strfunc.cc:
  UUID() function
sql/item_strfunc.h:
  UUID() function
sql/lex.h:
  UUID() function
sql/mysql_priv.h:
  UUID() function
sql/mysqld.cc:
  UUID() function
sql/sql_class.cc:
  cleanup

  Remove unused function btr_cur_update_sec_rec_in_place; besides, it was faulty, because even if strings are alphabetically identified, they can have different lengths


innobase/btr/btr0cur.c:
  Remove unused function btr_cur_update_sec_rec_in_place; besides, it was faulty, because even if strings are alphabetically identified, they can have different lengths

VC++Files/libmysql/libmysql.dsp:
  strtod.c is needed to build the library.
VC++Files/libmysqld/libmysqld.dsp:
  Add include directory to resolve problem with including emb_qcache.h,
  remove opt_ft.cc (no longer in tree).
VC++Files/mysqldemb/mysqldemb.dsp:
  Add include directory to resolve problem with including emb_qcache.h,
  remove opt_ft.cc (no longer in tree).
VC++Files/mysqlserver/mysqlserver.dsp:
  Add include directory to resolve problem with including emb_qcache.h.
VC++Files/strings/MASM6x/strings.dsp:
  Remove atof.c (no longer in tree) and add strtod.c, 
  needed for the library.
VC++Files/strings/noMASM/strings.dsp:
  Remove atof.c (no longer in tree) and add strtod.c, 
  needed for the library.
VC++Files/strings/strings.dsp:
  Remove atof.c (no longer in tree) and add strtod.c, 
  needed for the library.
sql/mysqld.cc:
  A cast is required to resolve the compile error on Windows (char * is 
  not equivalent to byte *).
sql/set_var.cc:
  A cast is required to resolve the compile error on Windows (char * is 
  not equivalent to byte *).
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

(that is, these numbers are converted to doubles by a local OS strtod,
and on different systems they get different values)


sql/item_strfunc.cc:
  no need to check for HAVE_ISNAN here, it is taken care of in my_global.h
strings/strtod.c:
  do not use static array of pastpoints - it is not portable
  (that is, these numbers are converted to doubles by a local OS strtod,
  and on different systems they get different values)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


sql/mysqld.cc:
  Auto merged