summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2004-06-29 19:55:13 +0500
committerunknown <hf@deer.(none)>2004-06-29 19:55:13 +0500
commit58bdba5785313f89398231f796ba989a4de81a69 (patch)
tree59be5629c3d654d6e28ff306d4e15ffad39fb346 /sql/share
parent0a1381e05b09aa4d99cd4cbd1e0a0985a02c175a (diff)
downloadmariadb-git-58bdba5785313f89398231f796ba989a4de81a69.tar.gz
WL#1600 (Warn if result is truncatet due to max_allowed_packet)
include/mysqld_error.h: Warning added mysql-test/r/func_str.result: test result fixed mysql-test/r/packet.result: test resut fixed sql/item_geofunc.cc: warning issued sql/item_strfunc.cc: warning issued sql/share/czech/errmsg.txt: Warning added sql/share/danish/errmsg.txt: Warning added sql/share/dutch/errmsg.txt: Warning added sql/share/english/errmsg.txt: Warning added sql/share/estonian/errmsg.txt: Warning added sql/share/french/errmsg.txt: Warning added sql/share/german/errmsg.txt: Warning added sql/share/greek/errmsg.txt: Warning added sql/share/hungarian/errmsg.txt: Warning added sql/share/italian/errmsg.txt: Warning added sql/share/japanese/errmsg.txt: Warning added sql/share/korean/errmsg.txt: Warning added sql/share/norwegian-ny/errmsg.txt: Warning added sql/share/norwegian/errmsg.txt: Warning added sql/share/polish/errmsg.txt: Warning added sql/share/portuguese/errmsg.txt: Warning added sql/share/romanian/errmsg.txt: Warning added sql/share/russian/errmsg.txt: Warning added sql/share/serbian/errmsg.txt: Warning added sql/share/slovak/errmsg.txt: Warning added sql/share/spanish/errmsg.txt: Warning added sql/share/swedish/errmsg.txt: Warning added sql/share/ukrainian/errmsg.txt: Warning added
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/czech/errmsg.txt1
-rw-r--r--sql/share/danish/errmsg.txt1
-rw-r--r--sql/share/dutch/errmsg.txt1
-rw-r--r--sql/share/english/errmsg.txt1
-rw-r--r--sql/share/estonian/errmsg.txt1
-rw-r--r--sql/share/french/errmsg.txt1
-rw-r--r--sql/share/german/errmsg.txt1
-rw-r--r--sql/share/greek/errmsg.txt1
-rw-r--r--sql/share/hungarian/errmsg.txt1
-rw-r--r--sql/share/italian/errmsg.txt1
-rw-r--r--sql/share/japanese/errmsg.txt1
-rw-r--r--sql/share/korean/errmsg.txt1
-rw-r--r--sql/share/norwegian-ny/errmsg.txt1
-rw-r--r--sql/share/norwegian/errmsg.txt1
-rw-r--r--sql/share/polish/errmsg.txt1
-rw-r--r--sql/share/portuguese/errmsg.txt1
-rw-r--r--sql/share/romanian/errmsg.txt1
-rw-r--r--sql/share/russian/errmsg.txt1
-rw-r--r--sql/share/serbian/errmsg.txt1
-rw-r--r--sql/share/slovak/errmsg.txt1
-rw-r--r--sql/share/spanish/errmsg.txt1
-rw-r--r--sql/share/swedish/errmsg.txt1
-rw-r--r--sql/share/ukrainian/errmsg.txt1
23 files changed, 23 insertions, 0 deletions
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 2d377929229..2ab55e7dece 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -312,3 +312,4 @@ character-set=latin2
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index af7b8263e6b..c27fe536180 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -306,3 +306,4 @@ character-set=latin1
"Modtog temporary fejl %d '%-.100s' fra %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index aa20996680e..66f0202b8f2 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -314,3 +314,4 @@ character-set=latin1
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index b5a7f7962cf..97554ec54a3 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -303,3 +303,4 @@ character-set=latin1
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 0cc6e06ab26..971cf9e90bf 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -308,3 +308,4 @@ character-set=latin7
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 2e23db62ddb..f090bde40ad 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -303,3 +303,4 @@ character-set=latin1
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index c63162c84f6..5a3307248d1 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -315,3 +315,4 @@ character-set=latin1
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index fa94b0f5107..61e7beedfe1 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -303,3 +303,4 @@ character-set=greek
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 56fae82c438..dfd6c50c8d1 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -305,3 +305,4 @@ character-set=latin2
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 31768f172b4..2629df66fbc 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -303,3 +303,4 @@ character-set=latin1
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 4385f25c991..fdcbc784c93 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -305,3 +305,4 @@ character-set=ujis
"Got temporary NDB error %d '%-.100s'",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index a6e84fad01e..b9bd73d444a 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -303,3 +303,4 @@ character-set=euckr
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index eaf7b3482ee..bf15a6c8176 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -305,3 +305,4 @@ character-set=latin1
"Mottok temporary feil %d '%-.100s' fra %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 692c10db58f..4ab2ed7c707 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -305,3 +305,4 @@ character-set=latin1
"Mottok temporary feil %d '%-.100s' fra %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 19f2c1c6983..7c50a154d70 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -307,3 +307,4 @@ character-set=latin2
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index c77d10d83de..713bd0ef06b 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -304,3 +304,4 @@ character-set=latin1
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 5ee4efd0063..377af99b1d9 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -307,3 +307,4 @@ character-set=latin2
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 20188723f6d..23c315eade6 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -305,3 +305,4 @@ character-set=koi8r
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index cc822431464..3360a98fab6 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -309,3 +309,4 @@ character-set=cp1250
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index ee6aac5081b..04db04cd15e 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -311,3 +311,4 @@ character-set=latin2
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 483ec7068a2..8dd85f7f661 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -305,3 +305,4 @@ character-set=latin1
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index d9f3adf92d4..3c571169887 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -303,3 +303,4 @@ character-set=latin1
"Fick tilfällig felkod %d '%-.100s' från %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index acf6f5121e8..a36f07ef96c 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -308,3 +308,4 @@ character-set=koi8u
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
+"Data truncated by function '%s' do to max_allowed_packet"