• unknown's avatar
    Merge embedded server testing changes from 4.1. · 10e2581f
    unknown authored
    mysql-test/r/innodb.result:
      Auto merged
    BitKeeper/deleted/.del-select.result.es~240635f6a3f1a079:
      Auto merged
    BitKeeper/deleted/.del-type_float.result.es~a5533e4118eadc04:
      Auto merged
    BitKeeper/deleted/.del-type_ranges.result.es~bb77517f4c9dc978:
      Auto merged
    mysql-test/r/type_float.result:
      Auto merged
    mysql-test/r/variables.result:
      Auto merged
    mysql-test/t/alter_table.test:
      Auto merged
    mysql-test/t/connect.test:
      Auto merged
    mysql-test/t/grant2.test:
      Auto merged
    mysql-test/t/grant_cache.test:
      Auto merged
    mysql-test/t/innodb.test:
      Auto merged
    mysql-test/t/mix_innodb_myisam_binlog.test:
      Auto merged
    mysql-test/t/mysqlbinlog.test:
      Auto merged
    mysql-test/t/mysqlbinlog2.test:
      Auto merged
    mysql-test/t/mysqldump.test:
      Auto merged
    mysql-test/t/ps_1general.test:
      Auto merged
    mysql-test/t/select.test:
      Auto merged
    mysql-test/t/show_check.test:
      Auto merged
    mysql-test/t/system_mysql_db_fix.test:
      Auto merged
    mysql-test/t/type_blob.test:
      Auto merged
    mysql-test/t/type_float.test:
      Auto merged
    mysql-test/t/variables.test:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    mysql-test/mysql-test-run.sh:
      Merge
    mysql-test/r/alter_table.result:
      Update results
    mysql-test/r/ctype_ucs.result:
      Update results
    mysql-test/r/grant.result:
      Update results
    mysql-test/r/insert_select.result:
      Update results
    mysql-test/r/ps_1general.result:
      Update results
    mysql-test/r/select.result:
      Update results
    mysql-test/r/timezone2.result:
      Update results
    mysql-test/r/type_blob.result:
      Update results
    mysql-test/r/type_ranges.result:
      Update results
    mysql-test/r/user_var.result:
      Update results
    mysql-test/t/ctype_ucs.test:
      Merge
    mysql-test/t/grant.test:
      Merge
    mysql-test/t/insert_select.test:
      Merge
    mysql-test/t/timezone2.test:
      Merge
    mysql-test/t/type_ranges.test:
      Merge
    mysql-test/t/user_var.test:
      Merge
    10e2581f
grant_cache.test 4.63 KB