into mysql.com:/M50/mysql-5.0

Replace the full socket path name, not just a directory component. bug#14720


mysql-test/r/connect.result:
  In cases where "--tmpdir=" is given to the test run, the socket file is not created below
  "$MYSQL_TEST_DIR" but rather within this directory. So the "--replace_result" should not 
  be done to a directory in the path but rather to the complete path name of the socket file. 
  bug#14720
mysql-test/t/connect.test:
  In cases where "--tmpdir=" is given to the test run, the socket file is not created below
  "$MYSQL_TEST_DIR" but rather within this directory. So the "--replace_result" should not
  be done to a directory in the path but rather to the complete path name of the socket file.
  bug#14720

test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).
I wrote to the Valgrind authors in case this is something fixable in Valgrind (normally the
decision to issue a warning is based on the simulated CPU condition code, which should not be undefined here).


BUILD/compile-pentium64-valgrind-max:
  putting this script in sync with compile-pentium-valgrind-max, otherwise we didn't have the federated engine compiled in.
mysql-test/r/read_only.result:
  result update
sql/field.cc:
  To avoid a Valgrind warning running the type_bit test: test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).

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

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.

into mysql.com:/home/psergey/mysql-5.0-oct03-push


sql/mysql_priv.h:
  Auto merged

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


sql/handler.h:
  Auto merged
sql/sql_table.cc:
  Auto merged

into  mysql.com:/my/mysql-5.0

into  mysql.com:/home/cps/mysql/trees/mysql-5.0


sql/spatial.h:
  Auto merged

into  mysql.com:/my/mysql-5.0

(Main reason for reordering was to get rid of compiler warnings for order of element initialization)


sql/log.cc:
  Remove compiler warning
sql/sql_class.h:
  Reorder MYSQL_LOG struct elements to be more optimal for 64 bit computers
  (Main reason for reordering was to get rid of compiler warnings for order of element initialization)

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

  SCCS merged


sql/sql_parse.cc:
  SCCS merged

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

into  mysql.com:/my/mysql-5.0

into  mysql.com:/home/my/mysql-5.0


sql/mysqld.cc:
  Auto merged

(Caused sp-security to fail)

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into  mysql.com:/my/mysql-5.0

Destroy LOCK_uuid_generator


sql/ha_berkeley.h:
  Fix portability problem (warnings from gcc on 32 bit linux)
sql/ha_ndbcluster.cc:
  Fixed portability problem
sql/mysqld.cc:
  Destroy LOCK_uuid_generator

into mysql.com:/home/psergey/mysql-5.0-oct03-push


sql/sql_select.cc:
  Auto merged

into  hasky.mysql.fi:/home/jani/mysql-5.0

into  fedora.(none):/home/reggie/bk/mysql-5.0-new

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

into mysql.com:/home/hf/work/mysql-5.0.9551


BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged

into mysql.com:/home/hf/work/mysql-5.0.9551


sql/sql_select.cc:
  Auto merged

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

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

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_view.h:
  Auto merged
sql/table.cc:
  Auto merged

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp

  Additional fix for bug#14093


sql/opt_range.cc:
  Additional fix for bug#14093

that in mysql_rm_table_part2_with_lock() previously we needed to open
same file twice. Now once is enough.


sql/mysql_priv.h:
  Merged functions get_table_type() and mysql_frm_type() into one,
  using the name from latter one.
sql/sql_base.cc:
  Changed get_table_type() to mysql_frm_type()
sql/sql_delete.cc:
  Changed get_table_type() to mysql_frm_type()
sql/sql_rename.cc:
  Changed get_table_type() to mysql_frm_type()
sql/sql_show.cc:
  Changed get_table_type() to mysql_frm_type()
sql/sql_table.cc:
  Changed get_table_type() to mysql_frm_type()
sql/sql_view.cc:
  Merged code from get_table_type() and mysql_frm_type() into the latter one.
sql/sql_view.h:
  Function prototype changes.
sql/table.cc:
  No longer needed.

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

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp