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

 - Workaround

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

 - Common error handling regardless of --ps-protocol or not.

  after merge fix

into  mysql.com:/usr/home/bar/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

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

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

 - Update test cases

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

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

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

into  mysql.com:/usr/home/bar/mysql-4.1.b9948

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

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

  bug#9948
  changed client-charset behavior in 4.1.x libmysql, which issue BC prob
  after review fixes

into dl145b.mysql.com:/home/ndbdev/mysql-4.1

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

added parseable printout in ndb_restore

  Test case for bug #12859 group_concat in subquery cause incorrect not null.

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

into  mysql.com:/usr/home/ram/work/4.1.b4214

TRASH macro confliciting with TRASH in my_sys.h

+ added option to dumpe rest of page after exnd of data

into  hundin.mysql.fi:/home/jan/new/mysql-5.0

  Fix bug #12308 : do not roll back the whhole transaction in a lock wait timeout error, just roll back the latest SQL statement; note that the locks set in the latest SQL statements remain, as InnoDB does not know what locks were set in which SQL statement

  Better comments about auto-inc and SHOW TABLE STATUS