• unknown's avatar
    Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · d0f79424
    unknown authored
    into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
    
    
    mysql-test/r/alter_table.result:
      Auto merged
    mysql-test/r/create.result:
      Auto merged
    mysql-test/r/ctype_collate.result:
      Auto merged
    mysql-test/r/ctype_recoding.result:
      Auto merged
    mysql-test/r/default.result:
      Auto merged
    mysql-test/r/gis.result:
      Auto merged
    mysql-test/r/grant.result:
      Auto merged
    mysql-test/r/information_schema.result:
      Auto merged
    mysql-test/r/key.result:
      Auto merged
    mysql-test/r/mysql.result:
      Auto merged
    mysql-test/r/ps_1general.result:
      Auto merged
    mysql-test/r/sp.result:
      Auto merged
    mysql-test/r/type_enum.result:
      Auto merged
    mysql-test/r/type_ranges.result:
      Auto merged
    mysql-test/r/show_check.result:
      manual merge
    mysql-test/t/information_schema.test:
      manual merge
    sql/sql_show.cc:
      manual merge
    d0f79424
information_schema.result 57.6 KB