Commit bb546f76 authored by unknown's avatar unknown

Fix a bad merge of mine.

parent 731044d8
...@@ -5813,7 +5813,5 @@ ER_CANT_CHANGE_TX_ISOLATION 25001 ...@@ -5813,7 +5813,5 @@ ER_CANT_CHANGE_TX_ISOLATION 25001
ER_WARN_DEPRECATED_STATEMENT ER_WARN_DEPRECATED_STATEMENT
eng "The '%s' statement is deprecated and will be removed in MySQL %s. Please use client programs (e.g. %s) instead." eng "The '%s' statement is deprecated and will be removed in MySQL %s. Please use client programs (e.g. %s) instead."
ER_TABLE_NEEDS_UPGRADE
eng "Table upgrade required. Please do \"REPAIR TABLE `%-.32s`\" to fix it!"
ER_SP_NO_AGGREGATE 42000 ER_SP_NO_AGGREGATE 42000
eng "AGGREGATE is not supported for stored functions" eng "AGGREGATE is not supported for stored functions"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment