• unknown's avatar
    Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 6a72267d
    unknown authored
    into  mysql.com:/misc/mysql/31177/50-31177
    
    
    client/mysql.cc:
      Auto merged
    mysql-test/r/subselect.result:
      Auto merged
    mysql-test/r/type_bit.result:
      Auto merged
    mysql-test/t/variables.test:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    6a72267d
mysqld.cc 282 KB