ChangeSet
  1.2471 06/05/24 14:12:19 serg@mysql.com +2 -0
  Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release
  into  mysql.com:/data0/mysqldev/my/mysql-4.1.20-release

  configure.in
    1.407 06/05/24 14:11:36 mysqldev@mysql.com +1 -2
    merged

  tests/mysql_client_test.c
    1.167 06/05/24 14:09:06 mysqldev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2447.103.2 06/05/24 01:05:20 kent@mysql.com +1 -0
  configure.in:
    Updated release number 4.1.16a

  configure.in
    1.399.1.1 06/05/24 01:04:58 kent@mysql.com +1 -1
    Updated release number 4.1.16a

ChangeSet
  1.2447.103.1 06/05/24 00:55:53 kent@mysql.com +4 -0
  don't let bugfix for bug#8303 break the bugfix for bug#8378
  revert the fix for bug#8303
  correct the test for bug#8378

  tests/mysql_client_test.c
    1.161.1.1 06/05/24 00:54:56 kent@mysql.com +14 -7
    correct the test for bug#8378

  sql/sql_lex.cc
    1.152 06/05/24 00:54:56 kent@mysql.com +5 -25
    revert the fix for bug#8303

  mysql-test/t/ctype_sjis.test
    1.10 06/05/24 00:54:56 kent@mysql.com +1 -1
    updated

  mysql-test/r/ctype_sjis.result
    1.9 06/05/24 00:54:56 kent@mysql.com +2 -2
    updated

ChangeSet
  1.2470 06/04/29 01:28:04 kent@mysql.com +1 -0
  mysql.spec.sh:
    Backport of changes in 5.0 (bug#18294)

  support-files/mysql.spec.sh
    1.115 06/04/29 01:26:46 kent@mysql.com +57 -15
    Backport of changes in 5.0 (bug#18294)

