• unknown's avatar
    Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583 · 426b0f45
    unknown authored
    into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
    
    
    BitKeeper/deleted/.del-collapsed~fbec3523369aae99:
      Delete: BitKeeper/etc/collapsed
    BitKeeper/etc/collapsed:
      'Auto converge'
    client/mysql.cc:
      Auto merged
    BitKeeper/deleted/.del-mysql_client.result:
      File is gone.
    BitKeeper/deleted/.del-mysql_client.test:
      File is gone.
    426b0f45
mysql.cc 106 KB