diff options
| author | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-05-21 10:21:08 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-05-21 10:21:08 +0200 |
| commit | 3ceec2f19cff22d7b6078b6a8d5788fa19264b8a (patch) | |
| tree | 43fd6afdae9f8879ad4cdbb000497fee7cba02f4 /sql/table.cc | |
| parent | 955cb796e7672d1186f44de84528b7b8fe47f0c9 (diff) | |
| parent | 12c42b980aa94105a9108d4f58c5dc75d96ec824 (diff) | |
| download | mariadb-git-3ceec2f19cff22d7b6078b6a8d5788fa19264b8a.tar.gz | |
Merge from 5.1.
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index 68e2566ffc1..1ac17d18d8d 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2422,7 +2422,7 @@ void open_table_error(TABLE_SHARE *share, int error, int db_errno, int errarg) default: /* Better wrong error than none */ case 4: strxmov(buff, share->normalized_path.str, reg_ext, NullS); - my_error(ER_NOT_FORM_FILE, errortype, buff, 0); + my_error(ER_NOT_FORM_FILE, errortype, buff); break; } DBUG_VOID_RETURN; @@ -3009,7 +3009,8 @@ Table_check_intact::check(TABLE *table, const TABLE_FIELD_DEF *table_def) report_error(ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE, ER(ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE), table->alias, table_def->count, table->s->fields, - table->s->mysql_version, MYSQL_VERSION_ID); + static_cast<int>(table->s->mysql_version), + MYSQL_VERSION_ID); DBUG_RETURN(TRUE); } else if (MYSQL_VERSION_ID == table->s->mysql_version) |