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

checking 2nd level of FT index destroyed info->lastkey and CHECK TABLE erroneously treated table as corrupted
bug#2190

  Fixed: client crashed when there are no Index.xml file.


mysys/charset.c:
  Fixed: client crashed when there are no Index.xml file.

This way, a crash of mysqltest will be visible in the test logs
(output of mysql-test-run).


mysql-test/mysql-test-run.sh:
  by design mysqltest returns 0 or 1 or 2 (see the exit()s and the return()
  of main()). So any greater code is a crash, I guess.
  On build and on my machine, 139 is segfault and 134 is assertion failure.

  Fix typo


innobase/row/row0mysql.c:
  Fix typo

Now we return user@host for USER() in embedded library
CURRENT_USER returns empty string if library compiled with
NO_EMBEDDED_ACCESS_CHECKS


libmysqld/embedded_priv.h:
  function's declarations trimmed
libmysqld/lib_sql.cc:
  user/host names handling added
libmysqld/libmysqld.c:
  user/host names handling added
sql/sql_class.cc:
  we shouldn't free user/host names in embedded library

WL#1246 (Query cache in embedded library)
Some fixes after testing


libmysqld/emb_qcache.cc:
  code added to check if the recordset has no rows
sql/sql_cache.cc:
  this code should not work if the query isn't cacheable

WL#1246 (Query cache in embedded library)
Small fix - code removed that prevents using query cache in embedded library


include/mysql_embed.h:
  Now we have the query_cache in embedded library

libmysqld/lib_sql.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_parse.cc:
  SCCS merged

  More instructions about a downgrade 4.1.1 -> 4.0.18


innobase/srv/srv0start.c:
  More instructions about a downgrade 4.1.1 -> 4.0.18

  Add comment that the insert buffer format changed between 4.0 and 4.1.1, but the undo log format did not


innobase/srv/srv0start.c:
  Add comment that the insert buffer format changed between 4.0 and 4.1.1, but the undo log format did not

  Merge a log replay change required by ibbackup


innobase/log/log0recv.c:
  Merge a log replay change required by ibbackup
innobase/include/log0recv.h:
  Merge a log replay change required by ibbackup

  Fix bug: if purge of a table was not possible because its .ibd file was missing, trx->dict_operation_lock_mode was left to a wrong value, causing an assertion failure


innobase/row/row0purge.c:
  Fix bug: if purge of a table was not possible because its .ibd file was missing, trx->dict_operation_lock_mode was left to a wrong value, causing an assertion failure

  Modern Spanish collation


sql/share/charsets/Index.xml:
  Modern Spanish collation
sql/share/charsets/latin1.xml:
  Modern Spanish collation

  Logging to logging@openlogging.org accepted
item_strfunc.cc:
  Bug wich appeared in ctype_tis620 is fixed


sql/item_strfunc.cc:
  Bug wich appeared in ctype_tis620 is fixed
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

TIS620 to Unicode and Unicode to TIS620 conversion check.

  new file

  new file

  Fix for the bug 1175: Usernames will not converted to utf8 during connect


sql/sql_parse.cc:
  Fix for the bug 1175: Usernames will not converted to utf8 during connect

  he mysqld server crashes if issued a command select convert(...)
  with a
  non-compiled character set:


mysys/charset.c:
  he mysqld server crashes if issued a command select convert(...)
  with a
  non-compiled character set:

  install-test-db did not substiture the path to charsets file, so tests failed with non-default collation incompiled, for example --with-collation=latin1_german1_ci
mysqld.cc:
  better error messaging


sql/mysqld.cc:
  better error messaging
mysql-test/install_test_db.sh:
  install-test-db did not substiture the path to charsets file, so tests failed with non-default collation incompiled, for example --with-collation=latin1_german1_ci

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


libmysqld/libmysqld.c:
  Auto merged

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


libmysql/libmysql.c:
  Auto merged

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

server)
We didn't perform the check for the error for embedded server


libmysql/libmysql.c:
  error checking moved to the mysql_execute level

into mysql.com:/home/kostja/mysql/mysql-4.1-prep

There was an error with same function/class member names


sql/sql_prepare.cc:
  Name scope specified

broken with recent changes' (attempt 2).
Adding Statement_core is better because:
- set_statement() code is shorter and you don't need to modify it when adding
new members to Statement_core
- a bit faster (you don't have virtual call and don't free_root() twice)
Do that short patch instead in hope that set_statement() will be sooner or
later removed entirely


sql/sql_class.cc:
  short patch for bug #2184 'Prepared statements in embedded library was 
  broken with recent changes'
sql/sql_class.h:
  short patch for bug #2184 'Prepared statements in embedded library 
  was broken with recent changes'

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

into mysql.com:/home/kostja/mysql/mysql-4.1-root

uniform: cli_ + member name.

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

into mysql.com:/home/kostja/mysql/mysql-4.1-root


sql/sql_class.h:
  Auto merged