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

merged

Browse source 
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown 2004-07-21 23:32:11 +02:00
commit a9856042bc
42 changed files with 262 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -313,6 +313,7 @@ character-set=latin2
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -307,6 +307,7 @@ character-set=latin1
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -315,6 +315,7 @@ character-set=latin1
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -304,6 +304,7 @@ character-set=latin1
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -307,8 +307,8 @@ character-set=latin7
"Got error %d '%-.100s' from %s",
"Got temporary error %d '%-.100s' from %s",
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -304,6 +304,7 @@ character-set=latin1
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -316,6 +316,7 @@ character-set=latin1
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -304,6 +304,7 @@ character-set=greek
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -306,6 +306,7 @@ character-set=latin2
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -304,6 +304,7 @@ character-set=latin1
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -306,6 +306,7 @@ character-set=ujis
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -304,6 +304,7 @@ character-set=euckr
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -306,6 +306,7 @@ character-set=latin1
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -306,6 +306,7 @@ character-set=latin1
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -308,6 +308,7 @@ character-set=latin2
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -305,6 +305,7 @@ character-set=latin1
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -308,6 +308,7 @@ character-set=latin2
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -306,6 +306,7 @@ character-set=koi8r
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -310,6 +310,7 @@ character-set=cp1250
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -312,6 +312,7 @@ character-set=latin2
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -306,6 +306,7 @@ character-set=latin1
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -304,6 +304,7 @@ character-set=latin1
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"

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

@ -309,6 +309,7 @@ character-set=koi8u
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"