diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-03-15 12:29:01 +0100 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-03-15 12:29:01 +0100 |
| commit | 7594a794b5a9cc2241d2720748f6da31771eff92 (patch) | |
| tree | 9d006192705111147c4882904b604f5b04504f8b /sql/share | |
| parent | 6044ff318582f44ab6491a47a712b6b1ee9aeb20 (diff) | |
| parent | 1f5051d9f2bc2353a1ec7363f2b50c5ba34b28e2 (diff) | |
| download | mariadb-git-7594a794b5a9cc2241d2720748f6da31771eff92.tar.gz | |
Merge from mysql-5.5 to mysql-5.5-security
Text conflict in sql/share/errmsg-utf8.txt
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 597bb12a137..3459c2041e3 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6497,3 +6497,6 @@ ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC ER_TABLE_IN_FK_CHECK eng "Table is being used in foreign key check." +# +# End of 5.5 error messages. +# |