Commit c330dc83 authored by unknown's avatar unknown
Browse files

Fix a bad merge of mine.

parent 436b4985
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -5813,7 +5813,5 @@ ER_CANT_CHANGE_TX_ISOLATION 25001
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."

ER_TABLE_NEEDS_UPGRADE
         eng "Table upgrade required. Please do \"REPAIR TABLE `%-.32s`\" to fix it!"
ER_SP_NO_AGGREGATE 42000
	eng "AGGREGATE is not supported for stored functions"