• unknown's avatar
    Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · bfe58b71
    unknown authored
    into  mysql.com:/misc/mysql/31177/50-31177
    
    
    mysql-test/r/ps_2myisam.result:
      Auto merged
    mysql-test/r/ps_3innodb.result:
      Auto merged
    mysql-test/r/ps_4heap.result:
      Auto merged
    mysql-test/r/ps_5merge.result:
      Auto merged
    mysql-test/r/ps_6bdb.result:
      Auto merged
    mysql-test/r/ps_7ndb.result:
      Auto merged
    mysql-test/t/variables.test:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    bfe58b71
mysqld.cc 282 KB