diff options
| author | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-13 22:41:48 -0400 |
|---|---|---|
| committer | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-13 22:41:48 -0400 |
| commit | 2ecd916de6f0daebb22f79cd6f0ad09f581c2aec (patch) | |
| tree | 454f08d5b72a20c64d94ea32579cca58eb4a33c8 /sql/share/errmsg.txt | |
| parent | 4b639b6c58c2dacb449118e29fc480aca9a6fe48 (diff) | |
| parent | 6e53baebcbb501329f42b4c3db4212f40775ff31 (diff) | |
| download | mariadb-git-2ecd916de6f0daebb22f79cd6f0ad09f581c2aec.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19307
Diffstat (limited to 'sql/share/errmsg.txt')
| -rw-r--r-- | sql/share/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index ae5ddd31475..1de2e893555 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5830,5 +5830,5 @@ ER_EVENT_MODIFY_QUEUE_ERROR ER_EVENT_SET_VAR_ERROR eng "Error during starting/stopping of the scheduler. Error code %u" ER_PARTITION_MERGE_ERROR - eng "MyISAM Merge handler cannot be used in partitioned tables" - swe "MyISAM Merge kan inte anändas i en partitionerad tabell" + eng "%s handler cannot be used in partitioned tables" + swe "%s kan inte användas i en partitionerad tabell" |