diff options
| author | unknown <acurtis/antony@xiphis.org/ltantony.xiphis.org> | 2006-07-21 10:14:25 -0700 |
|---|---|---|
| committer | unknown <acurtis/antony@xiphis.org/ltantony.xiphis.org> | 2006-07-21 10:14:25 -0700 |
| commit | a7ba5b75a604ca7955fba507b5e457fb40a086a8 (patch) | |
| tree | ab27bbc9961f4691505892a79e0b2b1b39a5cfe7 /sql/handler.cc | |
| parent | 93eef69dd517557255c4947b3d99f9fb0967fb5e (diff) | |
| parent | 9378fc627ecaf22d47bfd0de1c192953c96d5159 (diff) | |
| download | mariadb-git-a7ba5b75a604ca7955fba507b5e457fb40a086a8.tar.gz | |
Merge bk://anubis/mysql-5.0-engines
into xiphis.org:/home/antony/work2/merge/mysql-5.0
sql/handler.cc:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 448cfc6e1fa..b0051b02d91 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -428,6 +428,7 @@ static int ha_init_errors(void) SETMSG(HA_ERR_NO_CONNECTION, "Could not connect to storage engine"); SETMSG(HA_ERR_TABLE_DEF_CHANGED, ER(ER_TABLE_DEF_CHANGED)); SETMSG(HA_ERR_TABLE_NEEDS_UPGRADE, ER(ER_TABLE_NEEDS_UPGRADE)); + SETMSG(HA_ERR_TABLE_READONLY, ER(ER_OPEN_AS_READONLY)); /* Register the error messages for use with my_error(). */ return my_error_register(errmsgs, HA_ERR_FIRST, HA_ERR_LAST); @@ -1860,6 +1861,9 @@ void handler::print_error(int error, myf errflag) case HA_ERR_TABLE_NEEDS_UPGRADE: textno=ER_TABLE_NEEDS_UPGRADE; break; + case HA_ERR_TABLE_READONLY: + textno= ER_OPEN_AS_READONLY; + break; default: { /* The error was "unknown" to this function. |