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.

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

args[0] is used instead. This allowed to resuse a lot of code.

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

mysql-test/r/merge.result:
  Sync to modified error message.
sql/share/danish/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/dutch/errmsg.txt:
  Remove extraneous periods.
sql/share/english/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/estonian/errmsg.txt:
  Remove extraneous periods.
sql/share/french/errmsg.txt:
  Remove extraneous periods.
sql/share/german/errmsg.txt:
  Remove extraneous periods.
sql/share/greek/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/hungarian/errmsg.txt:
  Remove extraneous periods.
sql/share/italian/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/japanese/errmsg.txt:
  Remove extraneous periods.
sql/share/korean/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/norwegian-ny/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/norwegian/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/polish/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/romanian/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/russian/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/serbian/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/slovak/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/spanish/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/swedish/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.

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

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

It's now passed as args[0]. This fix allowed to resuse a lot of code.

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

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

into myvenu.com:/home/venu/work/sql/dev-4.1

if some of the arguments is STRING_RESULT the STRING_RESULT
else if some of the arguments is REAL_RESULT then REAL_RESULT
else INT_RESULT 

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

into myvenu.com:/home/venu/work/sql/dev-4.1


sql/item_strfunc.cc:
  Auto merged

Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
Removed PURGE LOGS (now PURGE MASTER LOGS).
Added SHOW BDB LOGS as synonym for SHOW LOGS.
Note: tests key_cache.test hanged, rpl_log_pos.test, rpl_rotate_logs.test failed for me.
For the second and third one I guess this will disappear after merging 4.0.


mysql-test/r/rpl_rotate_logs.result:
  result update
mysql-test/t/rpl_rotate_logs.test:
  added test for synonym PURGE BINARY LOGS, changed PURGE LOGS to
  PURGE MASTER LOGS.
sql/sql_yacc.yy:
  Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS.
  Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
  Removed PURGE LOGS (now PURGE MASTER LOGS).
  Added SHOW BDB LOGS as synonym for SHOW LOGS.

sql/lex.h:
  Add SUBSTR aliased to SUBSTRING
sql/item_strfunc.cc:
  Implement SUBSTR negative offset
mysql-test/t/func_str.test:
  New tests for SUBSTR
mysql-test/r/func_str.result:
  Updated SUBSTR results