mirror of
https://github.com/MariaDB/server.git
synced 2025-11-02 02:53:04 +03:00
merging
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/*
|
||||
v/*
|
||||
Modifikoval Petr -B<>najdr, snajdr@pvt.net, snajdr@cpress.cz v.0.01 -A
|
||||
ISO LATIN-8852-2
|
||||
Dal-B<><42> verze Jan Pazdziora, adelton@fi.muni.cz-A
|
||||
@@ -249,7 +249,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -243,7 +243,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -251,7 +251,7 @@
|
||||
"Kreeg fatale fout %d: '%-.128s' van master tijdens lezen van data uit binaire log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -240,7 +240,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -245,7 +245,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -240,7 +240,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -243,7 +243,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect return more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect return more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -240,7 +240,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -242,7 +242,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -240,7 +240,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -242,7 +242,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -240,7 +240,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -242,7 +242,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -242,7 +242,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -244,7 +244,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -240,7 +240,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -244,7 +244,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -243,7 +243,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",
|
||||
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)",
|
||||
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -236,7 +236,7 @@
|
||||
"User '%-.64s' has exceeded the '%s' resource (current value: %ld)",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -248,7 +248,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -241,7 +241,7 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"Subselect returns more than 1 field",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returns more than 1 record",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
|
||||
@@ -240,7 +240,7 @@
|
||||
"Fick fatalt fel %d: '%-.128s' fr<66>n master vid l<>sning av bin<69>r loggen",
|
||||
"Felaktig FOREIGN KEY definition f<>r '%-.64s': %s",
|
||||
"Nyckel referensen och table referensen st<73>mmer inte <20>verens",
|
||||
"Subselect returnerade mer <20>n 1 f<>lt",
|
||||
"Cardinality error (more/less than %d columns)",
|
||||
"Subselect returnerade mer <20>n 1 rad",
|
||||
"Ok<4F>nd PREPARED STATEMENT id (%ld) var given till %s",
|
||||
"Hj<48>lp databasen finns inte eller <20>r skadad",
|
||||
|
||||
@@ -245,10 +245,10 @@
|
||||
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
|
||||
"Wrong foreign key definition for '%-.64s': %s",
|
||||
"Key reference and table reference doesn't match",
|
||||
"<EFBFBD>i<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>i<EFBFBD><EFBFBD><EFBFBD> <EFBFBD>i<EFBFBD> 1 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
|
||||
"<22>i<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD>i<EFBFBD><EFBFBD><EFBFBD> <20>i<EFBFBD> 1 <20><><EFBFBD><EFBFBD><EFBFBD>",
|
||||
"Cardinality error (¦<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Φ<EFBFBD> %d <20><><EFBFBD><EFBFBD><EFBFBD>æ<EFBFBD>)",
|
||||
"<22><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ¦<EFBFBD><EFBFBD><EFBFBD> <20>i<EFBFBD> 1 <20><><EFBFBD><EFBFBD><EFBFBD>",
|
||||
"Unknown prepared statement handler (%ld) given to %s",
|
||||
"Help database is corrupt or does not exist",
|
||||
"<22><><EFBFBD><EFBFBD>i<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <EFBFBD>i<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
|
||||
"<22><><EFBFBD>̦<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> Ц<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
|
||||
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20> %s <20> %s",
|
||||
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%-.64s' <20><> <20>i<EFBFBD><69><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (%s)",
|
||||
|
||||
Reference in New Issue
Block a user