summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-07-22 12:38:14 -0700
committerjimw@mysql.com <>2005-07-22 12:38:14 -0700
commit421f267b7fbb304da36c7b989a4974564a5e0f33 (patch)
tree47392ca5314b9a4448b63447d2ce4fe201d162ba /sql/share
parent6e955625f656f89b65e2d781d96a6ecc84433765 (diff)
parentfa353b8f488ee2151355f704f0bc36f3ba63edfd (diff)
downloadmariadb-git-421f267b7fbb304da36c7b989a4974564a5e0f33.tar.gz
Merge mysql.com:/home/jimw/my/mysql-5.0-11213
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index c2485daf0fa..459560ccac8 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5384,3 +5384,5 @@ ER_CANT_CREATE_FEDERATED_TABLE
eng "Can't create federated table. Foreign data src error : '%-.64s'"
ER_TRG_IN_WRONG_SCHEMA
eng "Trigger in wrong schema"
+ER_STACK_OVERRUN_NEED_MORE
+ eng "Thread stack overrun: %ld bytes used of a %ld byte stack, and %ld bytes needed. Use 'mysqld -O thread_stack=#' to specify a bigger stack."