"PRIMARY" has been replaced by primary_key_name.


sql/mysql_priv.h:
  "PRIMARY" replaced by primary_key_name.
sql/sql_help.cc:
  "PRIMARY" replaced by primary_key_name.
sql/sql_select.cc:
  "PRIMARY" replaced by primary_key_name.
sql/sql_show.cc:
  "PRIMARY" replaced by primary_key_name.
sql/sql_table.cc:
  fix for the 2361 bug: ALTER TABLE ... DROP PRIMARY KEY drops a non-primary key
  "PRIMARY" replaced by primary_key_name.
sql/table.cc:
  "PRIMARY" replaced by primary_key_name.

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

  Comment typo fix
  ,


sql/item_strfunc.cc:
  Comment typo fix
  ,

- Fixed Bug#2346
- Fixed Bug#2378
- Fixed bug in pager (no Bug#ID (?))
- Added support for new special situations option type, GET_DISABLED.
  See handling of --debug in mysql.cc. compiled wihtout debugging, as an
  example.


client/mysql.cc:
  - Added missing documentation to some options.
  - Fixed a bug in pager (no Bug#ID found (?)), but reported on internals list
    with subject "[PATCH] Fix pager problems in mysql client"
  - Fixed Bug#2346, "unique prefix is enough" option behaviour can be confusing with --debug
include/my_getopt.h:
  Added new option type, GET_DISABLED.
include/mysys_err.h:
  New exit code for my_getopt.
mysys/my_getopt.c:
  - Added handling for GET_DISABLED option type (Fix for Bug#2346)
  - Fixed Bug#2378, "Problem with option abbreviation"

   (BUG 2289)


support-files/mysql.spec.sh:
   - link the mysql client against libreadline instead of libedit (BUG 2289)

  If UNIV_SYNC_DEBUG was switched on, the error monitor thread could reserve a mutex BEFORE the sync debug system was initialized, and that caused a sync debug assertion in startup: move the 2 sec. sleep to a safer place; note that this is only heuristics, and in theory it can assert still


innobase/srv/srv0srv.c:
  If UNIV_SYNC_DEBUG was switched on, the error monitor thread could reserve a mutex BEFORE the sync debug system was initialized, and that caused a sync debug assertion in startup: move the 2 sec. sleep to a safer place; note that this is only heuristics, and in theory it can assert still
innobase/srv/srv0start.c:
  If UNIV_SYNC_DEBUG was switched on, the error monitor thread could reserve a mutex BEFORE the sync debug system was initialized, and that caused a sync debug assertion in startup: move the 2 sec. sleep to a safer place; note that this is only heuristics, and in theory it can assert still

  Unnesessary code was removed. Comment was added.


sql/item_strfunc.cc:
  Unnesessary code was removed. Comment was added.

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

netware/init_db.sql:
  Add new tables for 4.1
netware/libmysql.imp:
  Comment out simple_command

  Improve previous push: save 1000 bytes of thread stack in non-error cases


innobase/row/row0sel.c:
  Improve previous push: save 1000 bytes of thread stack in non-error cases

  If MySQL tries to do SELECT from an InnoDB table, but has set no table locks at all in ::external_lock(), print a descriptive error message and assert; some subquery bugs were of this type


innobase/row/row0sel.c:
  If MySQL tries to do SELECT from an InnoDB table, but has set no table locks at all in ::external_lock(), print a descriptive error message and assert; some subquery bugs were of this type

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

mysql_alter_db() now returns -1 in case of error, so that mysql_execute_command()
calls send_error().


sql/sql_db.cc:
  In case of error, return -1 so that mysql_execute_command()
  understands that it must send_error().
  The double (( at the left of 'error' in the 'if' are to avoid a compiler warning.

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