into  mysql.com:/data2/mysql-5.1-new-ndb

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

    merge to 5.1 - yet another merge fix

  merge to 5.1

into  perch.ndb.mysql.com:/home/jonas/src/51-work

into  perch.ndb.mysql.com:/home/jonas/src/50-work

  fix deadlock if master switches log file in parallell with "show master logs"
  

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

  fix ndb-violations of strict aliasing found by gcc4.1
  (crashes in ndb_dd_*)

  gcc-4.1.1 work-around for bug in strict-aliasing

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb

into  mysql.com:/data2/mysql-5.1-new-ndb

into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

into  moonbone.local:/work/tmp_merge-5.1-mysql

into  dator5.(none):/home/pappa/push_clone

into  dator5.(none):/home/pappa/push_clone

The problem was in dummy grep on AIX and HPUX.

The fix is to use more portable patterns.

The patch is only for test suite
(i.e. does not touch server codebase).

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1

into  dator5.(none):/home/pappa/push_clone

into  dator5.(none):/home/pappa/push_clone

fixed error message

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1

into  dator5.(none):/home/pappa/bug21388

into  dator5.(none):/home/pappa/bug21388

Review fixes