• unknown's avatar
    Merge mysql.com:/home/kostja/mysql/tmp_merge · 02576c95
    unknown authored
    into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
    
    
    mysql-test/r/information_schema_db.result:
      Auto merged
    sql/ha_archive.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/table.h:
      Auto merged
    mysql-test/r/information_schema.result:
      SCCS merged
    02576c95
information_schema_db.result 551 Bytes