mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Better easier to call error message format.

Browse source
This commit is contained in:
unknown 2004-08-31 18:53:27 +05:00
commit e9c594e6d4
24 changed files with 26 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/share/czech/errmsg.txt
View file

@ -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'"

2
sql/share/danish/errmsg.txt
View file

@ -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'"

2
sql/share/dutch/errmsg.txt
View file

@ -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'"

2
sql/share/english/errmsg.txt
View file

@ -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'"

2
sql/share/estonian/errmsg.txt
View file

@ -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'"

2
sql/share/french/errmsg.txt
View file

@ -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'"

2
sql/share/german/errmsg.txt
View file

@ -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'"

2
sql/share/greek/errmsg.txt
View file

@ -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'"

2
sql/share/hungarian/errmsg.txt
View file

@ -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'"

2
sql/share/italian/errmsg.txt
View file

@ -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'"

2
sql/share/japanese/errmsg.txt
View file

@ -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'"

2
sql/share/korean/errmsg.txt
View file

@ -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'"

2
sql/share/norwegian-ny/errmsg.txt
View file

@ -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'"

2
sql/share/norwegian/errmsg.txt
View file

@ -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'"

2
sql/share/polish/errmsg.txt
View file

@ -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'"

2
sql/share/portuguese/errmsg.txt
View file

@ -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'"

2
sql/share/romanian/errmsg.txt
View file

@ -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'"

2
sql/share/russian/errmsg.txt
View file

@ -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'"

2
sql/share/serbian/errmsg.txt
View file

@ -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'"

2
sql/share/slovak/errmsg.txt
View file

@ -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'"

2
sql/share/spanish/errmsg.txt
View file

@ -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'"

2
sql/share/swedish/errmsg.txt
View file

@ -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'"

2
sql/share/ukrainian/errmsg.txt
View file

@ -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'"

9
sql/sql_yacc.yy
View file

@ -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;