• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · bc1fb7e1
    unknown authored
    into  mysql.com:/home/dlenev/src/mysql-5.0-tn
    
    
    mysql-test/r/information_schema.result:
      Auto merged
    mysql-test/t/information_schema.test:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/share/errmsg.txt:
      Manual merge.
    bc1fb7e1
information_schema.test 18.6 KB