into  mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release


tests/mysql_client_test.c:
  Auto merged
configure.in:
  merged
sql/sql_lex.cc:
  merged

  Updated release number 4.1.16a


configure.in:
  Updated release number 4.1.16a

revert the fix for bug#8303
correct the test for bug#8378


mysql-test/r/ctype_sjis.result:
  updated
mysql-test/t/ctype_sjis.test:
  updated
sql/sql_lex.cc:
  revert the fix for bug#8303
tests/mysql_client_test.c:
  correct the test for bug#8378

  Changed version to 5.0.17c


configure.in:
  Changed version to 5.0.17c

  buffer overflow and information exposure bugs fixed
  (reported by Stefano Di Paola)
configure.in:
  Changed version to 5.0.17b


configure.in:
  Changed version to 5.0.17b
sql/sql_parse.cc:
  buffer overflow and information exposure bugs fixed
  (reported by Stefano Di Paola)

configure.in:
  Change the version identification for the "certified" builds.
extra/comp_err.c:
  Ensure that the license spelling is as expected by the "mysql_copyright" tool.
scripts/mysqld_multi.sh:
  The "mysql_copyright" tool will not change non-C files, so do not mention the license.

client/mysqladmin.cc:
  don't use the handler after it's closed
client/mysqlbinlog.cc:
  memory leak
client/mysqldump.c:
  many "ignore return value" warnings, one "NULL dereference"
cmd-line-utils/libedit/history.c:
  memory leak
include/my_base.h:
  cleanup
libmysql/libmysql.c:
  "return value ignored" warning
myisam/mi_delete.c:
  "return value ignored" warning
myisam/myisampack.c:
  "out-of-bound access" warning
myisam/sort.c:
  "double free" warning
mysys/default_modify.c:
  "double free" warning
mysys/mf_iocache2.c:
  "return value ignored" warnings
mysys/my_bitmap.c:
  s/return/DBUG_RETURN/
mysys/my_error.c:
  memory leak
server-tools/instance-manager/parse.cc:
  "NULL dereference" warning
sql-common/client.c:
  "NULL dereference" warning
sql/field.cc:
  deadcode, "NULL dereference", "uninitialized" warnings
sql/field.h:
  unused parameters removed from constructor
sql/ha_myisam.cc:
  "return value ignored" warnings
sql/item.cc:
  "return value ignored" warnings
  changed constructor
sql/item_func.cc:
  "return value ignored" warnings
sql/log_event.cc:
  uninitialized warning
sql/opt_range.cc:
  "double free" and uninitialized warnings
sql/opt_range.h:
  "return value ignored" warning
sql/repl_failsafe.cc:
  "return value ignored" warning
sql/set_var.cc:
  "return value ignored" warning
sql/slave.cc:
  "return value ignored" warnings
sql/slave.h:
  new prototype
sql/sql_acl.cc:
  deadcode and "NULL dereference" warnings
sql/sql_db.cc:
  "return value ignored" warning
sql/sql_handler.cc:
  "NULL dereference" warning
sql/sql_help.cc:
  "NULL dereference" warning
sql/sql_insert.cc:
  "return value ignored" warning
sql/sql_parse.cc:
  "return value ignored" warning
  one more DBUG_ASSERT
sql/sql_repl.cc:
  "return value ignored" and memory leak warnings
sql/sql_show.cc:
  "return value ignored" and "NULL dereference"  warnings
sql/sql_test.cc:
  "return value ignored" warning
sql/table.cc:
  memory leak
sql/uniques.cc:
  "return value ignored" warning
  endspaces deleted

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.

  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:/usr/home/ram/work/mysql-5.0-release

mysql-test/t/rpl_deadlock.test:
  BUG#15624: Use --real_sleep to avoid breaking when run with --sleep.

include/config-win.h:
  Fix for bug#15209: MySQL installation problem on Windows ME.
  - set FILE_SHARE_DELETE to 0 as it's not implemented on Win98/ME (my_sopen() fails)

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

  Bug#15629: Increased thread stack for all 64 bit platforms,
  else test case 'sp' and 'call fib(20)' gives stack overrun


include/my_pthread.h:
  Bug#15629: Increased thread stack for all 64 bit platforms,
  else test case 'sp' and 'call fib(20)' gives stack overrun

into mysql.com:/M50/clone-5.0

into mysql.com:/M50/clone-5.0

Manual merge from 4.1,
extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.


mysql-test/t/rpl_until.test:
  Auto merged
mysql-test/r/rpl_until.result:
  Manual merge from 4.1,
  extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.

Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
The value is not important, and it depends on timing. Mask it.

Backport and extension of a fix made by Matthias in 5.0, originally it was
1.1976 05/12/05 17:57:48 mleich@mysql.com


mysql-test/r/rpl_until.result:
  Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
  The value is not important, and it depends on timing. Mask it.
  
  Backport and extension of a fix made by Matthias in 5.0, originally it was
  1.1976 05/12/05 17:57:48 mleich@mysql.com
mysql-test/t/rpl_until.test:
  Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
  The value is not important, and it depends on timing. Mask it.
  
  Backport and extension of a fix made by Matthias in 5.0, originally it was
  1.1976 05/12/05 17:57:48 mleich@mysql.com

  Ignore columns with unpredictable values.
rpl_relayrotate.result:
  Changed result file to match change in test


mysql-test/r/rpl_relayrotate.result:
  Changed result file to match change in test
mysql-test/t/skip_name_resolve.test:
  Ignore columns with unpredictable values.
mysql-test/r/skip_name_resolve.result:
  Ignore columns with unpredictable values.

sql/sp_head.cc:
  Fix for bug #15630: Test case failure in sp-dynamic, sp-error, and sp.
  - should pass a *char to the my_error() instead of the structure.

into  mysql.com:/usr/home/ram/work/mysql-5.0-release

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


scripts/make_win_src_distribution.sh:
  Auto merged

  Removed Visual Studio 6 project files, as they are not maintained


scripts/make_win_src_distribution.sh:
  Removed Visual Studio 6 project files, as they are not maintained

mysql-test/t/mysqltest.test:
  Fix for bug #15605: 5.0.17 test case 'mysqltest' failure.
  - use 'test -s' instead of 'cat' to get assured 1 (cat returns >0 in case of errors)

sql/table.cc:
  Fix for bug #15602: 5.0.17 test case 'create' failure.
  - always test create_info->max_rows/min_rows as they are of ulonglong type.

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

  Removed --text from grep, not portable


mysql-test/t/trigger-compat.test:
  Removed --text from grep, not portable
mysql-test/t/trigger-grant.test:
  Removed --text from grep, not portable

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

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


mysql-test/t/symlink.test:
  Auto merged
sql/mysqld.cc:
  Auto merged

  Bug#14960, reverted code to make symdir work on Windows
symlink.test:
  Disabled test case on Windows


mysql-test/t/symlink.test:
  Disabled test case on Windows
sql/mysqld.cc:
  Bug#14960, reverted code to make symdir work on Windows

extra/innochecksum.c:
  Fix _XOPEN_SOURCE define to not break compile on QNX and IRIX

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

current SP tables locking make impossible view security" with main tree.


mysql-test/r/sp-error.result:
  Fixed test result after merging fix for bug #11555 "Stored procedures: current
  SP tables locking make impossible view security" with main tree.

into  mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2


mysql-test/r/view.result:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
mysql-test/r/sp-error.result:
  SCCS merged

into  mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2


mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/sp.cc:
  Manual merge.
sql/sp.h:
  Manual merge.
sql/sql_base.cc:
  Manual merge.