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

mysql-test/r/func_misc.result:
  added new test for inet_aton (short-forms addresses)
mysql-test/t/func_misc.test:
  added new test for inet_aton (short-forms addresses)
sql/item_func.cc:
  Change Item_func_inet_aton::val_int to parse short-forms addresses correctly

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


sql/item.h:
  Auto merged

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

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


client/mysqldump.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged

into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl1280-fix

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

(same as ChangeSet@1.1538.36.1, 2003-06-12 12:41:29+02:00, serg@serg.mylan, "FT2 bug in mi_delete fixed")
BUG#2417

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


sql/sql_derived.cc:
  Auto merged

test fixed

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

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


sql/sql_derived.cc:
  Auto merged

sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

check of memory allocation operation was added


mysql-test/r/subselect_innodb.result:
  switched to new syntax
mysql-test/t/subselect_innodb.test:
  switched to new syntax
sql/sql_select.cc:
  check of memory allocation operation

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

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


mysql-test/r/subselect_innodb.result:
  Auto merged
mysql-test/t/subselect_innodb.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_union.cc:
  Auto merged

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