(based on the fact that packet is ALWAYS \0 terminated, see my_net_read)

(reported by Stefano Di Paola)

into  mysql.com:/home/mydev/mysql-4.0-bug5390

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

into  mysql.com:/usr/home/ram/work/mysql-4.0

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

code. (Bug #13621)


configure.in:
  Test whether atomic_add() and atomic_sub() are available in C++
  code, since that is primarily where we will be using them.

acinclude.m4:
  Check tinfo library presence and use it.

mysql-test/mysql-test-run.sh:
  Provide info about the options used for this run to any evaluation tool.

mysql-test/mysql-test-run.sh:
  Make "mysql-test-run.sh" accept (and ignore) the options "--with-ndbcluster" 
  and "--with-ndbcluster-only".
  This is necessary because newer build tools will issue them, and the test 
  script should tolerate that.
  Backport from 5.1 (Tomas Ulin, 2006-01-17)

  Changed web address order.mysql.com to shop.mysql.com


netware/mysql_install_db.c:
  Changed web address order.mysql.com to shop.mysql.com
Docs/MySQLEULA.txt:
  Changed web address order.mysql.com to shop.mysql.com
scripts/mysql_install_db.sh:
  Changed web address order.mysql.com to shop.mysql.com

  Typo (bug#17167)


README:
  Typo (bug#17167)

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173

  revise README.


mysql-test/README:
  revise README.

  Revise README.gcov.


mysql-test/README.gcov:
  Revise README.gcov.

  Revise mysql-test README.


mysql-test/README:
  Revise mysql-test README.

into mysql.com:/M40/comment-4.0

mysql-test/mysql-test-run.sh  :  Add a "--comment=<string>" option, to get it logged when the test is run.


mysql-test/mysql-test-run.sh:
  Add a "--comment=<string>" option, to get it logged when the test is run.
  The purpose is to allow a better analysis when generating the status page 
  ("gen-build-status-page").
  See "Do-compile" for how it is used.

This fix is necessary because thr_multi_lock()
reorderes the lock data references array.

  print => echo in shell script


scripts/make_binary_distribution.sh:
  print => echo in shell script

  Bug#16780: Extend port range to make space for 5.1 NDBCLUSTER_PORT_SLAVE


mysql-test/mysql-test-run.sh:
  Bug#16780: Extend port range to make space for 5.1 NDBCLUSTER_PORT_SLAVE

When setup_fields() function finds field named '*' it expands it to the list
of all table fields. It does so by checking that the first char of
field_name is '*', but it doesn't checks that the '* is the only char.
Due to this, when updating table with a field named like '*name', such field
is wrongly treated as '*' and expanded. This leads to making list of fields
to update being longer than list of the new values. Later, the fill_record() 
function crashes by dereferencing null when there is left fields to update,
but no more values.

Added check in the setup_fields() function which ensures that the field
expanding will be done only when '*' is the only char in the field name.


mysql-test/t/update.test:
  Added test case for bug#16510: Updating field named like '*name' caused server crash
mysql-test/r/update.result:
  Added test case for bug#16510: Updating field named like '*name' caused server crash
sql/sql_base.cc:
  Fixed bug #16510: Updating field named like '*name' caused server crash.
  Added check in the setup_fields() function which ensures that the field
  expanding will be done only when '*' is the only char in the field name.

After-fix optimizations proposed and finally
implemented by Monty.


mysql-test/r/lock.result:
  BUG#5390 - problems with merge tables
  After-fix optimizations proposed and finally
  implemented by Monty.
  Additional test results.
mysql-test/t/lock.test:
  BUG#5390 - problems with merge tables
  After-fix optimizations proposed and finally
  implemented by Monty.
  Additional tests.
sql/lock.cc:
  BUG#5390 - problems with merge tables
  After-fix optimizations proposed and finally
  implemented by Monty.
  get_lock_data() gets a flag for storing the lock
  positions in the new TABLE elements.
  mysql_lock_remove() can now remove a lock faster
  and more precisely as it has needed info in TABLE now.
  mysql_unlock_read_tables() and mysql_lock_merge() must 
  now adjust the new elements of TABLE when modifying locks.
  mysql_lock_have_duplicate() can now work faster on
  the existing lock as the positions in the lock
  arrays are known for each table.
  get_lock_data() assigns the new TABLE elements 
  on request of the new flag.
sql/table.h:
  BUG#5390 - problems with merge tables
  After-fix optimizations proposed and finally
  implemented by Monty.
  Additional elements of TABLE.

into mysql.com:/M40/mysql-4.0

into  neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554

   - Remove the local static var


sql/ha_berkeley.cc:
  Remove local static var, make it local in file instead.

Copyright string fixes (bug#16106)


extra/comp_err.c:
  Ensure that the license spelling is as expected by the "mysql_copyright" tool.
  (bug#16106)
scripts/mysqld_multi.sh:
  The "mysql_copyright" tool will not change non-C files, so do not mention the license.
  (bug#16106)

Changes to Netware specific mysqld_safe.c


include/config-netware.h:
  NetWare specific change to increase thread stack size.
innobase/os/os0thread.c:
  NetWare specific change to increase thread stack size.
netware/mysqld_safe.c:
  NetWare specific change to make multiple mysqld_safe instances
  work when called through a NCF file.
sql/mysqld.cc:
  NetWare specific change to increase thread stack size.

Remove wrong fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
Safety fix for bug #13855 "select distinct with group by caused server crash"


client/mysqlimport.c:
  Remove not used variable
myisam/myisam_ftdump.c:
  Fixed compiler warning
sql/item_cmpfunc.cc:
  Removed compiler warning
sql/sql_handler.cc:
  Remove wrong fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash.
  It's better to let mysql_lock_tables reopen the TABLE object in case of OPTIMIZE TABLE and fix items AFTER mysql_lock_table() instead of before
sql/sql_select.cc:
  Safety fix for bug #13855 "select distinct with group by caused server crash"
  The previous patch only removed the symptomps, this fix removed the cause of the problem
  (Which was that not all hidden_fields was stored in the temporary table)

into  mysql.com:/home/mydev/mysql-4.0-bug5390

  Adjusted listing of files to put into source TAR

New libc suggests doing this.

into  mysql.com:/home/mydev/mysql-4.0-bug5390


sql/sql_parse.cc:
  Auto merged

   internals@lists.mysql.com to reduce the noise on the internals list.

client/mysql.cc:
  Fixed option name.
client/mysqladmin.c:
  Fixed option name.
client/mysqlbinlog.cc:
  Fixed option name.
client/mysqlcheck.c:
  Fixed option name.
client/mysqldump.c:
  Fixed option name.
client/mysqlimport.c:
  Fixed option name.
client/mysqlshow.c:
  Fixed option name.
isam/isamchk.c:
  Fixed option name.
myisam/myisamchk.c:
  Fixed option name.
myisam/myisampack.c:
  Fixed option name.
sql/sql_parse.cc:
  Fix problem with kill connection on NetWare.

Problem #1: INSERT...SELECT
INSERT ... SELECT with the same table on both sides (hidden
below a MERGE table) does now work by buffering the select result.
The duplicate detection works now after open_and_lock_tables() 
on the locks.
I did not find a test case that failed without the change in
sql_update.cc. I made the change anyway as it should in theory
fix a possible MERGE table problem with multi-table update.


mysql-test/r/create.result:
  BUG#5390 - problems with merge tables
  Removed a duplicate test.
mysql-test/r/merge.result:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT
  Added test results.
mysql-test/t/create.test:
  BUG#5390 - problems with merge tables
  Removed a duplicate test.
mysql-test/t/merge.test:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT
  Added tests.
sql/lock.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT
  Added a new function to find a duplicate lock in a list of tables.
sql/mysql_priv.h:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT
  Added a declaration for the new function.
sql/sql_parse.cc:
  BUG#5390 - problems with merge tables
  Problem #1: INSERT...SELECT
  Changed the duplicate tables detection for INSERT ... SELECT
  to use the new function, which does also work for MERGE tables.
sql/sql_update.cc:
  BUG#5390 - problems with merge tables
  Changed the duplicate tables detection for UPDATE
  to use the new function, which does also work for MERGE tables.

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0

into  sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0


sql/mysql_priv.h:
  Auto merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0

into  mysql.com:/home/mydev/mysql-4.0-4000