This is to avoid a test failure, which is fixed in 4.0 in
ChangeSet@1.1455.34.1, 2003-06-10 23:29:49+02:00, guilhem@mysql.com
by making RESET SLAVE reset the error.


mysql-test/r/rpl_loaddata.result:
  temporary modification until 4.0 is merged in 4.1
mysql-test/t/rpl_loaddata.test:
  temporary modification until 4.0 is merged in 4.1

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

and other replicate-*-table options in SHOW SLAVE STATUS.
Seems like it had not been done, so I push it now:
there's 4 new columns to SHOW SLAVE STATUS.


mysql-test/r/rpl000015.result:
  Result update (more columns)
mysql-test/r/rpl_empty_master_crash.result:
  Result update (more columns)
mysql-test/r/rpl_flush_log_loop.result:
  Result update (more columns)
mysql-test/r/rpl_log.result:
  Result update (more columns)
mysql-test/r/rpl_log_pos.result:
  Result update (more columns)
mysql-test/r/rpl_redirect.result:
  Result update (more columns)
mysql-test/r/rpl_replicate_do.result:
  Result update (more columns)
mysql-test/r/rpl_rotate_logs.result:
  Result update (more columns)
mysql-test/t/rpl_replicate_do.test:
  Result update (more columns)
sql/slave.cc:
  Print replicate_*_table options in SHOW SLAVE STATUS
sql/slave.h:
  two functions to make a string of replicate_*_table lists.

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

error handling fixed
fetch_lengths made to work differently in embedded and client cases


include/mysql.h:
  removed 'embedded' error containers - they're unnecessary now
  added declarations for fetch_lengths to be 'virtual'
include/sql_common.h:
  fetch_lengths declaration removed
libmysql/libmysql.c:
  implementations for fetch_lengths to be 'virtual' added
libmysqld/lib_sql.cc:
  error informations now is moved from thd->net to mysql-net
libmysqld/libmysqld.c:
  error data is in mysql->net now
sql-common/client.c:
  we have to return old fetch_lengths implementation for 'client' case
sql/protocol.cc:
  handling of sqlstate for embedded library added

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


sql/field_conv.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged

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

  tweak


INSTALL-WIN-SOURCE:
  tweak

sql/sql_insert.cc:
  Undo warnings for single row inserts
mysql-test/t/warnings.test:
  undo one row warning instead use sql_warnings=1
mysql-test/r/warnings.result:
  Fix result file

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

include/mysql.h:
  mysql_close isn't virtual nown

tests/client_test.c:
  test for timestamp bug (BR #819)
sql/sql_insert.cc:
  Enable warnings by default for single value list
  protocol
mysql-test/t/warnings.test:
  Updated test for single value list insert warning
mysql-test/r/warnings.result:
  Updated warnings results

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


mysql-test/r/innodb.result:
  Auto merged

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

mysql-test/r/bdb.result:
  Fix test result affected by error message edit.
mysql-test/r/innodb.result:
  Fix test result affected by error message edit.
mysql-test/r/isam.result:
  Fix test result affected by error message edit.
mysql-test/r/repair_part1.result:
  Fix test result affected by error message edit.

mysql-test/r/bigint.result:
  test results updated
mysql-test/r/type_decimal.result:
  test results updated
mysql-test/t/bigint.test:
  new tests added
mysql-test/t/type_decimal.test:
  error numbers updated
sql/item.h:
  round(9999999999999999999) fixed
sql/sql_yacc.yy:
  bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0'   => syntax error
  unary '+' added

  fix typo


sql/share/english/errmsg.txt:
  fix typo

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


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

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

Including client code into embedded library
fixes


libmysql/libmysql.c:
  We should call this way
libmysqld/lib_sql.cc:
  Necessary initializations added
libmysqld/libmysqld.c:
  mysql_close can't be "virtual"
  mysqltest.c calls mysql_close before mysql_connect
sql-common/client.c:
  We have to redo fetch_lengths to count lengths looking at '\0' in string.
  It works slower, but is correct for both client and embedded libraries

and result types

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

into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC

Test suit was extended to conver various arguments mixes.

into ice.snake.net:/Users/paul/mysql-4.1

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

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

This allowed to reuse a lot of code. 

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

  Stupid bug fix


strings/ctype-utf8.c:
  Stupid bug fix

as [skipped], even when run explicitly.)


mysql-test/include/have_openssl_2.inc:
  There is no such variable as SSL_get_cipher.
mysql-test/r/have_openssl_2.require:
  Require file required garbage. Fix to require something sensible.
mysql-test/r/openssl_2.result:
  Add output of SHOW STATUS to test result.
mysql-test/t/openssl_2.test:
  Use actual lettercase of SSL status variables.
  (Test will work with uppercase, but there's no
  reason not to use the actual lettercase.)

mysql-test/r/innodb.result:
  Fix test result to correspond to error message edits.
mysql-test/r/repair_part2.result:
  Fix test result to correspond to error message edits.
mysql-test/r/type_blob.result:
  Fix test result to correspond to error message edits.
sql/share/czech/errmsg.txt:
  Error message consistency edits.
sql/share/dutch/errmsg.txt:
  Error message consistency edits.
sql/share/estonian/errmsg.txt:
  Error message consistency edits.
sql/share/french/errmsg.txt:
  Error message consistency edits.
sql/share/german/errmsg.txt:
  Error message consistency edits.
sql/share/greek/errmsg.txt:
  Error message consistency edits.
sql/share/hungarian/errmsg.txt:
  Error message consistency edits.
sql/share/italian/errmsg.txt:
  Error message consistency edits.
sql/share/norwegian-ny/errmsg.txt:
  Error message consistency edits.
sql/share/norwegian/errmsg.txt:
  Error message consistency edits.
sql/share/danish/errmsg.txt:
  Error message consistency edits.
sql/share/polish/errmsg.txt:
  Error message consistency edits.
sql/share/portuguese/errmsg.txt:
  Error message consistency edits.
sql/share/romanian/errmsg.txt:
  Error message consistency edits.
sql/share/serbian/errmsg.txt:
  Error message consistency edits.
sql/share/slovak/errmsg.txt:
  Error message consistency edits.
sql/share/spanish/errmsg.txt:
  Error message consistency edits.
sql/share/swedish/errmsg.txt:
  Error message consistency edits.
sql/share/ukrainian/errmsg.txt:
  Error message consistency edits.
sql/share/english/errmsg.txt:
  Error message consistency edits.