- Update patch for 5.0 
 - Added common function to be called when 'acl_users' has been modified


mysql-test/r/grant2.result:
  Use "create user" to avoid warnings about missing fields
mysql-test/t/grant2.test:
  Use "create user" to avoid warnings about missing fields
sql/sql_acl.cc:
  Add new function "rebuild_check_host" that is to be called when the 'acl_users'
  list has changed.
  Call function "rebuild_check_host" from mysql_drop_user, mysql_rename_user and acl_insert_user.
  Use "acl_user->host.hostname" as key when searching the acl_check_hosts in init_check_host.

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


mysql-test/r/grant2.result:
  Merge test results
mysql-test/t/grant2.test:
  Merge tests
sql/sql_acl.cc:
  Removing the 4.1 version patch

   - DROP USER command didn't reload the acl_check_hosts cache causing subsequent 
     connect's via TCP to fail randomly.
   - 4.1 version


mysql-test/r/grant2.result:
  Update test results
mysql-test/t/grant2.test:
  Add test for to check that connect via TCP work after "drop user"
sql/sql_acl.cc:
  Reload acl_check_hosts as its memory is mapped to acl_user
  Use acl_user->host.hostname when searching the acl_check_hosts list

  Script "my_print_defaults" is to be searched for as executable


mysql-test/mysql-test-run.pl:
  Script "my_print_defaults" is to be searched for as executable

mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_multi.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_multi.test:
  Auto merged
sql/sql_class.cc:
  Auto merged

  Added 5.0 specific build scripts


BUILD/Makefile.am:
  Added 5.0 specific build scripts

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


BUILD/Makefile.am:
  Auto merged

  Adjusted listing of files to put into source TAR

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

into  regul.home.lan:/mnt/md/bk/mysql-5.0

mysql-test/t/disabled.def:
  Disabled test type_time; fails in --ps-protocol mode.

with 20 test loops in case when any limit parameter was specified



mysql-test/lib/mtr_stress.pl:
  Limit stress testing with 20 test loops in case when any limit parameter was specified
mysql-test/mysql-test-run.pl:
  Limit stress testing with 20 test loops in case when any limit parameter was specified
mysql-test/mysql-test-run.sh:
  Limit stress testing with 20 test loops in case when any limit parameter was specified

into  mysql.com:/home/alexi/dev/mysql-5.0-12440


mysql-test/r/type_time.result:
  Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql-common/my_time.c:
  Auto merged
zlib/Makefile.am:
  Auto merged

 long fraction and/or large exponent part".


mysql-test/r/type_time.result:
  Fixed testcases results (bug #12440)
mysql-test/t/type_time.test:
  Added testcases for bug #12440
sql-common/my_time.c:
  Fixed bug #12440: "Incorrect processing of time values containing
   long fraction and/or large exponent part".
   Modified str_to_time(). Process properly fraction part containing
   more than 6 digits. Check for existence of exponent part which
   may result from %g formatting applied to time value specified as
   large real number.

  - libtool wants spaces on parameters for its command line options


zlib/Makefile.am:
  - libtool wants spaces on parameters for its command line options

  - libtool wants spaces on parameters for its command line options


zlib/Makefile.am:
  - libtool wants spaces on parameters for its command line options

  - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0


zlib/Makefile.am:
  - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0

into  mysql.com:/home/novo/MySQL/mysql-5.0

  - modified zlib/Makefile.am so we now generate libz.so.1.2.3 instead of libz.so.0.0.0


zlib/Makefile.am:
  - modified zlib/Makefile.am so we now generate libz.so.1.2.3 instead of libz.so.0.0.0

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

into  production.mysql.com:/usersnfs/knielsen/mysql-5.0

and bug #15668: Test 'sp-error' crashes server on Mac OS X.


mysql-test/r/rpl000001.result:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
mysql-test/t/flush_read_lock_kill.test:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
mysql-test/t/rpl000001.test:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
mysql-test/t/rpl_error_ignored_table.test:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - accept 2013 error as well.
sql/sql_class.cc:
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.
  - don't call the close_active_vio() in case of KILL_QUERY.

into  mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

into  mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0

  incorrect handling of varchar in position/rnd_pos

  Commit for 5.0.17 release clone


mysql-test/r/ndb_basic.result:
  bug#15682
mysql-test/t/ndb_basic.test:
  bug#15682
sql/ha_ndbcluster.cc:
  bug#15682

into  mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0

into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

mysql-test/r/ndb_multi.result:
  Fix to make ndb_multi.test (Bug #15401  NDB lock problems) more preditable
mysql-test/t/ndb_multi.test:
  Fix to make ndb_multi.test (Bug #15401  NDB lock problems) more preditable

into  production.mysql.com:/usersnfs/knielsen/mysql-5.0

sql/sql_class.h:
  Remove unused class member.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/r/skip_name_resolve.result:
  Auto merged
mysql-test/t/skip_name_resolve.test:
  Auto merged
sql/sp_head.cc:
  Auto merged

into  mysql.com:/usr/local/mysql/mysql-5.0

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


sql/mysqld.cc:
  Auto merged

bdb/dist/gen_rec.awk:
  Fix undefined behaviour.