into sanja.is.com.ua:/home/bell/mysql/bk/work-drop-4.1


mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/sql_db.cc:
  Auto merged

into mysql.com:/space/my/mysql-4.1-build

   call to /usr/bin/awk - replaced this with the proper autoconf variable
   instead (makelist is now generated out of makelist.sh during the compile
   phase)


cmd-line-utils/libedit/Makefile.am:
   - replace @AWK@ with the correct path to the awk binary determined by
     configure instead of using a hard-coded path (BUG#2297)
cmd-line-utils/libedit/makelist.sh:
   - replace @AWK@ with the correct path to the awk binary determined by
     configure instead of using a hard-coded path (BUG#2297)

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_parse.cc:
  Auto merged

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

  http://bugs.mysql.com/bug.php?id=2386
  Index.xml file larger than 1024*16
  Fix for the above bug.


mysys/charset.c:
  http://bugs.mysql.com/bug.php?id=2386
  Index.xml file larger than 1024*16
  Fix for the above bug.

Blame me!

  http://bugs.mysql.com/bug.php?id=2218
  updating utf-8 text field generate nonsense chars
  Fix for the above bug.


sql/field.cc:
  http://bugs.mysql.com/bug.php?id=2218
  updating utf-8 text field generate nonsense chars
  Fix for the above bug.

  Unnesessary copying was fixed


sql/item_strfunc.cc:
  Unnesessary copying was fixed

open a file that already existed. The problem was that end_io_cache()
was called even if init_io_cache() was not. This affected both
OUTFILE and DUMPFILE (both fixed). Sometimes wrongly aligned pointer was freed,
sometimes mysqld core dumped.

Other problem was that select_dump::send_error removed the dumpfile,
even if it was created by an earlier run, or by some other program, if
the file permissions just permitted it. Fixed it so that the file will
only be deleted, if an error occurred, but the file was created by mysqld
just a moment ago, in that thread.

On the other hand, select_export did not handle the corresponding garbage
file at all. Both fixed.

After these fixes, a big part of the select_export::prepare and select_dump::prepare
code became identical. Merged the code into a new function called create_file(),
which is now called by the two latter functions.

Regards,
Jani


mysys/mf_iocache.c:
  Fixed a bug in comment.

with --disable-quote

Added --compatible=ansi mode.

Fixed a non-reported bug in compatible mode; there was a check for
/*!41000 */ at this part of the code, while it obviously should have been
/*!40100 */. So the mysqldump compatiple mode made for 4.0.1 will not work
until 4.10 or later server is released :P Fixed into 4.0.2.


client/mysqldump.c:
  Fixed Bug#2281, --quote is now enabled by default. Can be disabled
  with --disable-quote
  
  Added --compatible=ansi mode.
  
  Changed sapdb into maxdb, as this change has been made to server too.
  
  Fixed a non-reported bug in compatible mode; there was a check for
  /*!41000 */ at this part of the code, while it obviously should have been
  /*!40100 */. So the mysqldump compatiple mode made for 4.1.0 will not work
  until 4.10.0 or later server is released :P Fixed into 4.1.2.

Bug#2080

into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1


client/mysql.cc:
  Auto merged

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

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

  We don't need to copy if start is 0, we can return the original value.


sql/item_strfunc.cc:
  We don't need to copy if start is 0, we can return the original value.

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


sql/sql_show.cc:
  Auto merged

"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 serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug

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