into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.0-maint

	event' from master"

Since there is no repeatable test case, and this is obviously wrong, this is
the most conservative change that might possibly work.  

The syscall  read()  wasn't checked for a negative return value for an
interrupted read.  The kernel  sys_read()  returns -EINTR, and the "library" 
layer maps that to return value of -1 and sets  errno  to EINTR.  It's 
impossible (on Linux) for  read()  to set errno EINTR without the return 
value being -1 .

So, if we're checking for EINTR behavior, we should not require that the
return value be zero.


mysys/my_read.c:
  The read() syscall should check for negative one, since that (usually) signals
  errors (like being interrupted) and zero (usually) signals end-of-file .

scripts/mysqlhotcopy.sh:
  Defined new raid directory regular expression variable that allows a mix of two alphanumeric characters.  Replaced hardcode raid directory regular expressions with new variable.

into  chilla.local:/home/mydev/mysql-4.0-bug14400

into  maint1.mysql.com:/data/localhome/cmiller/mysql-4.0__bug19006

have a better test (and so this should be null-merged there).

ALSO!  Make it so that it accepts NPTL as a valid _equivalent_ implementation.

On exactly-sized Strings, the String::c_ptr() function peeked beyond the
end of the buffer, possibly into unititialized space to see whether the 
buffer was NUL-terminated.

In a place that did peek improperly, we now use a c_ptr_safe() function, 
which doesn't peek where it shouldn't.


client/sql_string.h:
  Back-port String::c_ptr_safe().
sql/item_func.h:
  Describe side-effect behavior.
sql/item_strfunc.cc:
  Use the "_safe" version of c_ptr to avoid looking for a terminating 
  NUL character outside the initialized memory area.  Valgrind hates it 
  when one does that, and it theoretically could lead to a SEGV.
sql/sql_string.h:
  Back-port String::c_ptr_safe().

It was possible that fetching a record by an exact key value 
(including the record pointer) could return a record with a 
different key value. This happened only if a concurrent insert 
added a record with the searched key value after the fetching 
statement locked the table for read.

The search succeded on the key value, but the record was
rejected as it was past the file length that was remembered
at start of the fetching statement. With other words it was 
rejected as being a concurrently inserted record.

The action to recover from this problem was to fetch the 
record that is pointed at by the next key of the index. 
This was repeated until a record below the file length was 
found.

I do now avoid this loop if an exact match was searched. 
If this match is beyond the file length, it is now treated 
as "key not found". There cannot be another key with the 
same record pointer.


myisam/mi_rkey.c:
  Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
  Added a check for exact key match before searching for
  the next key that was not concurrently inserted. If an
  exact key match finds a concurrently inserted row, this
  must be treated as "key not found".
sql/sql_class.cc:
  Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
  Fixed some DBUG_ENTER strings.

  For compatibility, don't use {..,..} in pattern matching
make_binary_distribution.sh:
  Added .dylib and .sl as shared library extensions


scripts/make_binary_distribution.sh:
  Added .dylib and .sl as shared library extensions
scripts/make_sharedlib_distribution.sh:
  For compatibility, don't use {..,..} in pattern matching

mysql-test/r/func_str.result:
  Fix for bug #12728: Very strange behaviour of ELT
    - test case
mysql-test/t/func_str.test:
  Fix for bug #12728: Very strange behaviour of ELT
    - test result
sql/item_strfunc.cc:
  Fix for bug #12728: Very strange behaviour of ELT
    - Item_func_elt::eq() introduced: check 'item' member as well
      (to distinguish for instance elt(1, 'a', 'b') and elt(2, 'a', 'b')
sql/item_strfunc.h:
  Fix for bug #12728: Very strange behaviour of ELT
    - Item_func_elt::eq() introduced: check 'item' member as well
      (to distinguish for instance elt(1, 'a', 'b') and elt(2, 'a', 'b')

  Always compile position independent


support-files/mysql.spec.sh:
  Always compile position independent

  Change mode to -rw-rw-r--
dbug_add_tags.pl:
  Change mode to -rwxrwxr--


dbug/dbug_add_tags.pl:
  Change mode to -rwxrwxr--
myisammrg/myrg_range.c:
  Change mode to -rw-rw-r--
mysql-test/r/innodb_handler.result:
  Change mode to -rw-rw-r--
mysql-test/r/repair.result:
  Change mode to -rw-rw-r--
mysql-test/std_data/master-bin.001:
  Change mode to -rw-rw-r--
mysql-test/std_data/trunc_binlog.001:
  Change mode to -rw-rw-r--
mysql-test/t/bulk_replace.test:
  Change mode to -rw-rw-r--
mysql-test/t/create_select_tmp.test:
  Change mode to -rw-rw-r--
mysql-test/t/ctype_tis620.test:
  Change mode to -rw-rw-r--
mysql-test/t/handler.test:
  Change mode to -rw-rw-r--
mysql-test/t/innodb_handler.test:
  Change mode to -rw-rw-r--
mysql-test/t/mix_innodb_myisam_binlog-master.opt:
  Change mode to -rw-rw-r--
mysql-test/t/repair.test:
  Change mode to -rw-rw-r--
mysql-test/t/rpl_commit_after_flush.test:
  Change mode to -rw-rw-r--
mysql-test/t/rpl_free_items-slave.opt:
  Change mode to -rw-rw-r--
mysql-test/t/rpl_free_items.test:
  Change mode to -rw-rw-r--
scripts/mysql_secure_installation.sh:
  Change mode to -rw-rw-r--
sql/sql_handler.cc:
  Change mode to -rw-rw-r--
support-files/mysql-multi.server.sh:
  Change mode to -rw-rw-r--

  Stepped up to 4.0.28


configure.in:
  Stepped up to 4.0.28

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

  Delete: Docs/changelog-4.0.xml


BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Delete: Docs/changelog-4.0.xml

(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.

Whenever 'myisamchk' needed to recreate a table,
the auto increment information was lost.

Now the forgotten element of the table creation
information is set correctly.


myisam/mi_check.c:
  Bug#10405 - myisamchk damages auto_increment columns when changing character set
  Added some DBUG statements.
  Enabled 'with_auto_increment' in 'create_info'
  when recreating a table.

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.