Better easier to call error message format.

sql/share/czech/errmsg.txt

@@ -314,4 +314,4 @@ character-set=latin2
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/danish/errmsg.txt

@@ -308,4 +308,4 @@ character-set=latin1
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/dutch/errmsg.txt

@@ -316,4 +316,4 @@ character-set=latin1
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/english/errmsg.txt

@@ -305,4 +305,4 @@ character-set=latin1
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/estonian/errmsg.txt

@@ -310,4 +310,4 @@ character-set=latin7
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/french/errmsg.txt

@@ -305,4 +305,4 @@ character-set=latin1
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/german/errmsg.txt

@@ -317,4 +317,4 @@ character-set=latin1
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/greek/errmsg.txt

@@ -305,4 +305,4 @@ character-set=greek
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/hungarian/errmsg.txt

@@ -307,4 +307,4 @@ character-set=latin2
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/italian/errmsg.txt

@@ -305,4 +305,4 @@ character-set=latin1
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/japanese/errmsg.txt

@@ -307,4 +307,4 @@ character-set=ujis
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/korean/errmsg.txt

@@ -305,4 +305,4 @@ character-set=euckr
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/norwegian-ny/errmsg.txt

@@ -307,4 +307,4 @@ character-set=latin1
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/norwegian/errmsg.txt

@@ -307,4 +307,4 @@ character-set=latin1
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/polish/errmsg.txt

@@ -309,4 +309,4 @@ character-set=latin2
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/portuguese/errmsg.txt

@@ -306,4 +306,4 @@ character-set=latin1
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/romanian/errmsg.txt

@@ -309,4 +309,4 @@ character-set=latin2
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/russian/errmsg.txt

@@ -307,4 +307,4 @@ character-set=koi8r
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/serbian/errmsg.txt

@@ -311,4 +311,4 @@ character-set=cp1250
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/slovak/errmsg.txt

@@ -313,4 +313,4 @@ character-set=latin2
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/spanish/errmsg.txt

@@ -307,4 +307,4 @@ character-set=latin1
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/swedish/errmsg.txt

@@ -305,4 +305,4 @@ character-set=latin1
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/ukrainian/errmsg.txt

@@ -310,4 +310,4 @@ character-set=koi8u
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
 "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
-"Conflicting declarations: '%s' and '%s'"
+"Conflicting declarations: '%s%s' and '%s%s'"

sql/sql_yacc.yy

@@ -1215,12 +1215,9 @@ default_charset:
                cinfo->default_table_charset && $4 &&
                !my_charset_same(cinfo->default_table_charset,$4))
           {
-            char cs1[32];
-            char cs2[32];
-            my_snprintf(cs1, sizeof(cs1), "CHARACTER SET %s", 
-                        cinfo->default_table_charset->csname);
-            my_snprintf(cs2, sizeof(cs2), "CHARACTER SET %s", $4->csname);
-            net_printf(YYTHD, ER_CONFLICTING_DECLARATIONS, cs1, cs2);
+            net_printf(YYTHD, ER_CONFLICTING_DECLARATIONS,
+                       "CHARACTER SET ", cinfo->default_table_charset->csname,
+                       "CHARACTER SET ", $4->csname);
             YYABORT;
           }
 	  Lex->create_info.default_table_charset= $4;