diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2010-05-28 15:14:43 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2010-05-28 15:14:43 +0200 |
| commit | f90429ed99ae660675babb4bef1f7bdd1d7cee23 (patch) | |
| tree | 2095dade91fb13e52a36e81f8805f1931189cf82 /sql/share | |
| parent | eb830c3d3941ec2b5becd79e4c8d360e79402d03 (diff) | |
| parent | 9731b3852b0be5820fc795cf4f27d0f260ebe761 (diff) | |
| download | mariadb-git-f90429ed99ae660675babb4bef1f7bdd1d7cee23.tar.gz | |
Manual merge of bug#49161 into mysql-trunk-merge
(Added a real error message instead of ER_UNKNOWN_ERROR)
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 598f563ac87..e5ab2332e20 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6336,3 +6336,7 @@ ER_BINLOG_UNSAFE_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE ER_BINLOG_UNSAFE_MIXED_STATEMENT eng "Statements that read from both transactional (or a temporary table of any engine type) and non-transactional tables and write to any of them are unsafe." + +ER_FAILED_READ_FROM_PAR_FILE + eng "Failed to read from the .par file" + swe "Misslyckades läsa från .par filen" |