• unknown's avatar
    Bug #29245: Bad Merge Caused Error Codes Conflict between 5.0/5.1 · 8f9547ca
    unknown authored
    Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    
    
    mysql-test/r/backup.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/events_bugs.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/events_trans.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/ndb_dd_basic.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/ndb_dd_ddl.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/ndb_gis.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/ndb_row_format.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/rpl_extraCol_innodb.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/rpl_extraCol_myisam.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/rpl_incident.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/rpl_ndb_extraCol.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/rpl_row_tabledefs_2myisam.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/rpl_row_tabledefs_3innodb.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/rpl_sp.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/select.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/show_check.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/sp.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/sp_gis.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/sp_trans.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/type_timestamp.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/warnings.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/r/xml.result:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/t/grant.test:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    mysql-test/t/partition_grant.test:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    sql/mysql_priv.h:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    sql/share/errmsg.txt:
      Fix some error messages so that all error codes are equivalent in 5.0 and 5.1
    8f9547ca
ndb_dd_basic.result 15.7 KB