Skip to content

M
MariaDB
Commit bebafeba authored by unknown's avatar unknown
Browse files
Options

Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0

parents e0ba590f b9c69c16
Show whitespace changes
Inline Side-by-side
Showing with 127 additions and 75 deletions
innobase/ibuf/ibuf0ibuf.c
View file @ bebafeba
...@@ -2488,7 +2488,9 @@ ibuf_merge_or_delete_for_page( ...@@ -2488,7 +2488,9 @@ ibuf_merge_or_delete_for_page(
ulint old_bits; ulint old_bits;
ulint new_bits; ulint new_bits;
dulint max_trx_id; dulint max_trx_id;
ibool corruption_noticed = FALSE;
mtr_t mtr; mtr_t mtr;
char err_buf[500];
if (srv_force_recovery >= SRV_FORCE_NO_IBUF_MERGE) { if (srv_force_recovery >= SRV_FORCE_NO_IBUF_MERGE) {
...@@ -2540,7 +2542,38 @@ ibuf_merge_or_delete_for_page( ...@@ -2540,7 +2542,38 @@ ibuf_merge_or_delete_for_page(
block = buf_block_align(page); block = buf_block_align(page);
rw_lock_x_lock_move_ownership(&(block->lock)); rw_lock_x_lock_move_ownership(&(block->lock));
ut_a(fil_page_get_type(page) == FIL_PAGE_INDEX); if (fil_page_get_type(page) != FIL_PAGE_INDEX) {
corruption_noticed = TRUE;
ut_print_timestamp(stderr);
mtr_start(&mtr);
fprintf(stderr,
" InnoDB: Dump of the ibuf bitmap page:\n");
bitmap_page = ibuf_bitmap_get_map_page(space, page_no,
&mtr);
buf_page_print(bitmap_page);
mtr_commit(&mtr);
fprintf(stderr, "\nInnoDB: Dump of the page:\n");
buf_page_print(page);
fprintf(stderr,
"InnoDB: Error: corruption in the tablespace. Bitmap shows insert\n"
"InnoDB: buffer records to page n:o %lu though the page\n"
"InnoDB: type is %lu, which is not an index page!\n"
"InnoDB: We try to resolve the problem by skipping the insert buffer\n"
"InnoDB: merge for this page. Please run CHECK TABLE on your tables\n"
"InnoDB: to determine if they are corrupt after this.\n\n"
"InnoDB: Please make a detailed bug report and send it to\n"
"InnoDB: mysql@lists.mysql.com\n\n",
page_no, fil_page_get_type(page));
}
} }
n_inserts = 0; n_inserts = 0;
...@@ -2584,7 +2617,13 @@ ibuf_merge_or_delete_for_page( ...@@ -2584,7 +2617,13 @@ ibuf_merge_or_delete_for_page(
goto reset_bit; goto reset_bit;
} }
if (page) { if (corruption_noticed) {
rec_sprintf(err_buf, 450, ibuf_rec);
fprintf(stderr,
"InnoDB: Discarding record\n %s\n from the insert buffer!\n\n", err_buf);
} else if (page) {
/* Now we have at pcur a record which should be /* Now we have at pcur a record which should be
inserted to the index page; NOTE that the call below inserted to the index page; NOTE that the call below
copies pointers to fields in ibuf_rec, and we must copies pointers to fields in ibuf_rec, and we must
......
mysql-test/mysql-test-run.sh
View file @ bebafeba
...@@ -1118,7 +1118,7 @@ run_testcase () ...@@ -1118,7 +1118,7 @@ run_testcase ()
slave_opt_file=$TESTDIR/$tname-slave.opt slave_opt_file=$TESTDIR/$tname-slave.opt
master_init_script=$TESTDIR/$tname-master.sh master_init_script=$TESTDIR/$tname-master.sh
slave_init_script=$TESTDIR/$tname-slave.sh slave_init_script=$TESTDIR/$tname-slave.sh
slave_master_info_file=$TESTDIR/$tname-slave-master-info.opt slave_master_info_file=$TESTDIR/$tname.slave-mi
echo $tname > $CURRENT_TEST echo $tname > $CURRENT_TEST
SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0` SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`
if [ $USE_MANAGER = 1 ] ; then if [ $USE_MANAGER = 1 ] ; then
......
mysql-test/r/bigint.result
View file @ bebafeba
...@@ -7,6 +7,9 @@ select 9223372036854775807,-009223372036854775808; ...@@ -7,6 +7,9 @@ select 9223372036854775807,-009223372036854775808;
select +9999999999999999999,-9999999999999999999; select +9999999999999999999,-9999999999999999999;
+9999999999999999999 -9999999999999999999 +9999999999999999999 -9999999999999999999
10000000000000000000 -10000000000000000000 10000000000000000000 -10000000000000000000
select cast(9223372036854775808 as unsigned)+1;
cast(9223372036854775808 as unsigned)+1
9223372036854775809
select 9223372036854775808+1; select 9223372036854775808+1;
9223372036854775808+1 9223372036854775808+1
9223372036854775808 9223372036854775808
......
mysql-test/t/bigint.test
View file @ bebafeba
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
select 0,256,00000000000000065536,2147483647,-2147483648,2147483648,+4294967296; select 0,256,00000000000000065536,2147483647,-2147483648,2147483648,+4294967296;
select 9223372036854775807,-009223372036854775808; select 9223372036854775807,-009223372036854775808;
select +9999999999999999999,-9999999999999999999; select +9999999999999999999,-9999999999999999999;
select cast(9223372036854775808 as unsigned)+1;
# #
# We need to do a REPLACE here as the atof() function returns different # We need to do a REPLACE here as the atof() function returns different
......
mysys/thr_alarm.c
View file @ bebafeba
...@@ -402,6 +402,8 @@ void end_thr_alarm(void) ...@@ -402,6 +402,8 @@ void end_thr_alarm(void)
void thr_alarm_kill(pthread_t thread_id) void thr_alarm_kill(pthread_t thread_id)
{ {
uint i; uint i;
if (alarm_aborted)
return;
pthread_mutex_lock(&LOCK_alarm); pthread_mutex_lock(&LOCK_alarm);
for (i=0 ; i < alarm_queue.elements ; i++) for (i=0 ; i < alarm_queue.elements ; i++)
{ {
......
netware/mysql_test_run.c
View file @ bebafeba
...@@ -760,7 +760,7 @@ void run_test(char *test) ...@@ -760,7 +760,7 @@ void run_test(char *test)
// create files // create files
snprintf(master_opt_file, PATH_MAX, "%s/%s-master.opt", test_dir, test); snprintf(master_opt_file, PATH_MAX, "%s/%s-master.opt", test_dir, test);
snprintf(slave_opt_file, PATH_MAX, "%s/%s-slave.opt", test_dir, test); snprintf(slave_opt_file, PATH_MAX, "%s/%s-slave.opt", test_dir, test);
snprintf(slave_master_info_file, PATH_MAX, "%s/%s-slave-master-info.opt", test_dir, test); snprintf(slave_master_info_file, PATH_MAX, "%s/%s.slave-mi", test_dir, test);
snprintf(reject_file, PATH_MAX, "%s/%s%s", result_dir, test, REJECT_SUFFIX); snprintf(reject_file, PATH_MAX, "%s/%s%s", result_dir, test, REJECT_SUFFIX);
snprintf(out_file, PATH_MAX, "%s/%s%s", result_dir, test, OUT_SUFFIX); snprintf(out_file, PATH_MAX, "%s/%s%s", result_dir, test, OUT_SUFFIX);
snprintf(err_file, PATH_MAX, "%s/%s%s", result_dir, test, ERR_SUFFIX); snprintf(err_file, PATH_MAX, "%s/%s%s", result_dir, test, ERR_SUFFIX);
......
scripts/make_binary_distribution.sh
View file @ bebafeba
...@@ -183,7 +183,7 @@ done ...@@ -183,7 +183,7 @@ done
$CP mysql-test/include/*.inc $BASE/mysql-test/include $CP mysql-test/include/*.inc $BASE/mysql-test/include
$CP mysql-test/std_data/*.dat mysql-test/std_data/*.001 $BASE/mysql-test/std_data $CP mysql-test/std_data/*.dat mysql-test/std_data/*.001 $BASE/mysql-test/std_data
$CP mysql-test/t/*test mysql-test/t/*.opt mysql-test/t/*.sh $BASE/mysql-test/t $CP mysql-test/t/*test mysql-test/t/*.opt mysql-test/t/*.slave-mi mysql-test/t/*.sh $BASE/mysql-test/t
$CP mysql-test/r/*result mysql-test/r/*.require $BASE/mysql-test/r $CP mysql-test/r/*result mysql-test/r/*.require $BASE/mysql-test/r
if [ $BASE_SYSTEM != "netware" ] ; then if [ $BASE_SYSTEM != "netware" ] ; then
......
sql/share/czech/errmsg.txt
View file @ bebafeba
/* /*
Modifikoval Petr -Bnajdr, snajdr@pvt.net, snajdr@cpress.cz v.0.01 -A Modifikoval Petr -Bnajdr, snajdr@pvt.net, snajdr@cpress.cz v.0.01
ISO LATIN-8852-2 ISO LATIN-8852-2
Dal-B verze Jan Pazdziora, adelton@fi.muni.cz-A Dal-B verze Jan Pazdziora, adelton@fi.muni.cz
Tue Nov 18 17:53:55 MET 1997 Tue Nov 18 17:53:55 MET 1997
Tue Dec 2 19:08:54 MET 1997 podle 3.21.15c Tue Dec 2 19:08:54 MET 1997 podle 3.21.15c
Thu May 7 17:40:49 MET DST 1998 podle 3.21.29 Thu May 7 17:40:49 MET DST 1998 podle 3.21.29
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
"Nalezen-Bch dk: %ld Zmnno: %ld Varovn: %ld", "Nalezen-Bch dk: %ld Zmnno: %ld Varovn: %ld",
"Nemohu vytvo-Bit nov thread (errno %d). Pokud je jet njak voln pam, podvejte se do manulu na st o chybch specifickch pro jednotliv operan systmy", "Nemohu vytvo-Bit nov thread (errno %d). Pokud je jet njak voln pam, podvejte se do manulu na st o chybch specifickch pro jednotliv operan systmy",
"Po-Bet sloupc neodpovd potu hodnot na dku %ld", "Po-Bet sloupc neodpovd potu hodnot na dku %ld",
"Nemohu znovuotev-Bt tabulku: '%-.64s', "Nemohu znovuotev-Bt tabulku: '%-.64s",
"Neplatn-B uit hodnoty NULL", "Neplatn-B uit hodnoty NULL",
"Regul-Brn vraz vrtil chybu '%-.64s'", "Regul-Brn vraz vrtil chybu '%-.64s'",
"Pokud nen-B dn GROUP BY klauzule, nen dovoleno souasn pouit GROUP poloek (MIN(),MAX(),COUNT()...) s ne GROUP polokami", "Pokud nen-B dn GROUP BY klauzule, nen dovoleno souasn pouit GROUP poloek (MIN(),MAX(),COUNT()...) s ne GROUP polokami",
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
"Tabulka '%-.64s' je ozna-Bena jako poruen a mla by bt opravena", "Tabulka '%-.64s' je ozna-Bena jako poruen a mla by bt opravena",
"Tabulka '%-.64s' je ozna-Bena jako poruen a posledn (automatick?) oprava se nezdaila", "Tabulka '%-.64s' je ozna-Bena jako poruen a posledn (automatick?) oprava se nezdaila",
"Warning: Some non-transactional changed tables couldn't be rolled back", "Warning: Some non-transactional changed tables couldn't be rolled back",
"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again', "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
"This operation cannot be performed with a running slave, run SLAVE STOP first", "This operation cannot be performed with a running slave, run SLAVE STOP first",
"This operation requires a running slave, configure slave and do SLAVE START", "This operation requires a running slave, configure slave and do SLAVE START",
"The server is not configured as slave, fix in config file or with CHANGE MASTER TO", "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
......
sql/share/danish/errmsg.txt
View file @ bebafeba
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
"BLOB feltet '%-.64s' kan ikke have en standard værdi", "BLOB feltet '%-.64s' kan ikke have en standard værdi",
"Ugyldigt database navn '%-.64s'", "Ugyldigt database navn '%-.64s'",
"Ugyldigt tabel navn '%-.64s'", "Ugyldigt tabel navn '%-.64s'",
"SELECT ville undersøge for mange poster og ville sandsynligvis tage meget lang tid. Undersøg WHERE delen og brug SET OPTION SQL_BIG_SELECTS=1 hvis udtrykket er korrekt" "SELECT ville undersøge for mange poster og ville sandsynligvis tage meget lang tid. Undersøg WHERE delen og brug SET OPTION SQL_BIG_SELECTS=1 hvis udtrykket er korrekt",
"Ukendt fejl", "Ukendt fejl",
"Ukendt procedure %s", "Ukendt procedure %s",
"Forkert antal parametre til proceduren %s", "Forkert antal parametre til proceduren %s",
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
"Poster fundet: %ld Ændret: %ld Advarsler: %ld", "Poster fundet: %ld Ændret: %ld Advarsler: %ld",
"Kan ikke danne en ny tråd (fejl nr. %d). Hvis computeren ikke er løbet tør for hukommelse, kan du se i brugervejledningen for en mulig operativ-system - afhængig fejl", "Kan ikke danne en ny tråd (fejl nr. %d). Hvis computeren ikke er løbet tør for hukommelse, kan du se i brugervejledningen for en mulig operativ-system - afhængig fejl",
"Kolonne antallet stemmer ikke overens med antallet af værdier i post %ld", "Kolonne antallet stemmer ikke overens med antallet af værdier i post %ld",
"Kan ikke genåbne tabel '%-.64s', "Kan ikke genåbne tabel '%-.64s",
"Forkert brug af nulværdi (NULL)", "Forkert brug af nulværdi (NULL)",
"Fik fejl '%-.64s' fra regexp", "Fik fejl '%-.64s' fra regexp",
"Sammenblanding af GROUP kolonner (MIN(),MAX(),COUNT()...) uden GROUP kolonner er ikke tilladt, hvis der ikke er noget GROUP BY prædikat", "Sammenblanding af GROUP kolonner (MIN(),MAX(),COUNT()...) uden GROUP kolonner er ikke tilladt, hvis der ikke er noget GROUP BY prædikat",
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
"Fik fejlmeddelelse fra fcntl()", "Fik fejlmeddelelse fra fcntl()",
"Modtog ikke datapakker i korrekt rækkefølge", "Modtog ikke datapakker i korrekt rækkefølge",
"Kunne ikke dekomprimere kommunikations-pakke (communication packet)", "Kunne ikke dekomprimere kommunikations-pakke (communication packet)",
"Fik fejlmeddelelse ved læsning af kommunikations-pakker (communication packets)" "Fik fejlmeddelelse ved læsning af kommunikations-pakker (communication packets)",
"Timeout-fejl ved læsning af kommunukations-pakker (communication packets)", "Timeout-fejl ved læsning af kommunukations-pakker (communication packets)",
"Fik fejlmeddelelse ved skrivning af kommunukations-pakker (communication packets)", "Fik fejlmeddelelse ved skrivning af kommunukations-pakker (communication packets)",
"Timeout-fejl ved skrivning af kommunukations-pakker (communication packets)", "Timeout-fejl ved skrivning af kommunukations-pakker (communication packets)",
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
"Tabellen '%-.64s' er markeret med fejl og bør repareres", "Tabellen '%-.64s' er markeret med fejl og bør repareres",
"Tabellen '%-.64s' er markeret med fejl og sidste (automatiske?) REPAIR fejlede", "Tabellen '%-.64s' er markeret med fejl og sidste (automatiske?) REPAIR fejlede",
"Advarsel: Visse data i tabeller der ikke understøtter transaktioner kunne ikke tilbagestilles", "Advarsel: Visse data i tabeller der ikke understøtter transaktioner kunne ikke tilbagestilles",
"Fler-udtryks transaktion krævede mere plads en 'max_binlog_cache_size' bytes. Forhøj værdien af denne variabel og prøv igen', "Fler-udtryks transaktion krævede mere plads en 'max_binlog_cache_size' bytes. Forhøj værdien af denne variabel og prøv igen",
"Denne handling kunne ikke udføres med kørende slave, brug først kommandoen SLAVE STOP", "Denne handling kunne ikke udføres med kørende slave, brug først kommandoen SLAVE STOP",
"Denne handling kræver en kørende slave. Konfigurer en slave og brug kommandoen SLAVE START", "Denne handling kræver en kørende slave. Konfigurer en slave og brug kommandoen SLAVE START",
"Denne server er ikke konfigureret som slave. Ret in config-filen eller brug kommandoen CHANGE MASTER TO", "Denne server er ikke konfigureret som slave. Ret in config-filen eller brug kommandoen CHANGE MASTER TO",
......
sql/share/dutch/errmsg.txt
View file @ bebafeba
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
"Passende rijen: %ld Gewijzigd: %ld Waarschuwingen: %ld", "Passende rijen: %ld Gewijzigd: %ld Waarschuwingen: %ld",
"Kan geen nieuwe thread aanmaken (Errcode: %d). Indien er geen tekort aan geheugen is kunt u de handleiding consulteren over een mogelijke OS afhankelijke fout", "Kan geen nieuwe thread aanmaken (Errcode: %d). Indien er geen tekort aan geheugen is kunt u de handleiding consulteren over een mogelijke OS afhankelijke fout",
"Kolom aantal komt niet overeen met waarde aantal in rij %ld", "Kolom aantal komt niet overeen met waarde aantal in rij %ld",
"Kan tabel niet opnieuw openen: '%-.64s', "Kan tabel niet opnieuw openen: '%-.64s",
"Foutief gebruik van de NULL waarde", "Foutief gebruik van de NULL waarde",
"Fout '%-.64s' ontvangen van regexp", "Fout '%-.64s' ontvangen van regexp",
"Het mixen van GROUP kolommen (MIN(),MAX(),COUNT()...) met no-GROUP kolommen is foutief indien er geen GROUP BY clausule is", "Het mixen van GROUP kolommen (MIN(),MAX(),COUNT()...) met no-GROUP kolommen is foutief indien er geen GROUP BY clausule is",
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
"Kreeg fout van fcntl()", "Kreeg fout van fcntl()",
"Pakketten in verkeerde volgorde ontvangen", "Pakketten in verkeerde volgorde ontvangen",
"Communicatiepakket kon niet worden gedecomprimeerd", "Communicatiepakket kon niet worden gedecomprimeerd",
"Fout bij het lezen van communicatiepakketten" "Fout bij het lezen van communicatiepakketten",
"Timeout bij het lezen van communicatiepakketten", "Timeout bij het lezen van communicatiepakketten",
"Fout bij het schrijven van communicatiepakketten", "Fout bij het schrijven van communicatiepakketten",
"Timeout bij het schrijven van communicatiepakketten", "Timeout bij het schrijven van communicatiepakketten",
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
"Tabel '%-.64s' staat als gecrashed gemarkeerd en dient te worden gerepareerd", "Tabel '%-.64s' staat als gecrashed gemarkeerd en dient te worden gerepareerd",
"Tabel '%-.64s' staat als gecrashed gemarkeerd en de laatste (automatische?) reparatie poging mislukte", "Tabel '%-.64s' staat als gecrashed gemarkeerd en de laatste (automatische?) reparatie poging mislukte",
"Waarschuwing: Roll back mislukt voor sommige buiten transacties gewijzigde tabellen", "Waarschuwing: Roll back mislukt voor sommige buiten transacties gewijzigde tabellen",
"Multi-statement transactie vereist meer dan 'max_binlog_cache_size' bytes opslag. Verhoog deze mysqld variabele en probeer opnieuw', "Multi-statement transactie vereist meer dan 'max_binlog_cache_size' bytes opslag. Verhoog deze mysqld variabele en probeer opnieuw",
"Deze operatie kan niet worden uitgevoerd met een actieve slave, doe eerst SLAVE STOP", "Deze operatie kan niet worden uitgevoerd met een actieve slave, doe eerst SLAVE STOP",
"Deze operatie vereist een actieve slave, configureer slave en doe dan SLAVE START", "Deze operatie vereist een actieve slave, configureer slave en doe dan SLAVE START",
"De server is niet geconfigureerd als slave, fix in configuratie bestand of met CHANGE MASTER TO", "De server is niet geconfigureerd als slave, fix in configuratie bestand of met CHANGE MASTER TO",
......
sql/share/english/errmsg.txt
View file @ bebafeba
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
"Result string is longer than max_allowed_packet", "Result string is longer than max_allowed_packet",
"The used table type doesn't support BLOB/TEXT columns", "The used table type doesn't support BLOB/TEXT columns",
"The used table type doesn't support AUTO_INCREMENT columns", "The used table type doesn't support AUTO_INCREMENT columns",
"INSERT DELAYED can't be used with table '%-.64s', because it is locked with LOCK TABLES", "INSERT DELAYED can't be used with table '%-.64s' because it is locked with LOCK TABLES",
"Incorrect column name '%-.100s'", "Incorrect column name '%-.100s'",
"The used table handler can't index column '%-.64s'", "The used table handler can't index column '%-.64s'",
"All tables in the MERGE table are not identically defined", "All tables in the MERGE table are not identically defined",
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
"Table '%-.64s' is marked as crashed and should be repaired", "Table '%-.64s' is marked as crashed and should be repaired",
"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
"Warning: Some non-transactional changed tables couldn't be rolled back", "Warning: Some non-transactional changed tables couldn't be rolled back",
"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again', "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
"This operation cannot be performed with a running slave, run SLAVE STOP first", "This operation cannot be performed with a running slave, run SLAVE STOP first",
"This operation requires a running slave, configure slave and do SLAVE START", "This operation requires a running slave, configure slave and do SLAVE START",
"The server is not configured as slave, fix in config file or with CHANGE MASTER TO", "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
......
sql/share/french/errmsg.txt
View file @ bebafeba
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
"Ligne trop grande. Le taille maximale d'une ligne, sauf les BLOBs, est %d. Changez le type de quelques colonnes en BLOB", "Ligne trop grande. Le taille maximale d'une ligne, sauf les BLOBs, est %d. Changez le type de quelques colonnes en BLOB",
"Débordement de la pile des tâches (Thread stack). Utilisées: %ld pour une pile de %ld. Essayez 'mysqld -O thread_stack=#' pour indiquer une plus grande valeur", "Débordement de la pile des tâches (Thread stack). Utilisées: %ld pour une pile de %ld. Essayez 'mysqld -O thread_stack=#' pour indiquer une plus grande valeur",
"Dépendance croisée dans une clause OUTER JOIN. Vérifiez la condition ON", "Dépendance croisée dans une clause OUTER JOIN. Vérifiez la condition ON",
"La colonne '%-.32s' fait partie d'un index UNIQUE ou INDEX mais n'est pas définie comme NOT NULL" "La colonne '%-.32s' fait partie d'un index UNIQUE ou INDEX mais n'est pas définie comme NOT NULL",
"Imposible de charger la fonction '%-.64s'", "Imposible de charger la fonction '%-.64s'",
"Impossible d'initialiser la fonction '%-.64s'; %-.80s", "Impossible d'initialiser la fonction '%-.64s'; %-.80s",
"Chemin interdit pour les bibliothèques partagées", "Chemin interdit pour les bibliothèques partagées",
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
"Enregistrements correspondants: %ld Modifiés: %ld Warnings: %ld", "Enregistrements correspondants: %ld Modifiés: %ld Warnings: %ld",
"Impossible de créer une nouvelle tâche (errno %d). S'il reste de la mémoire libre, consultez le manual pour trouver un éventuel bug dépendant de l'OS", "Impossible de créer une nouvelle tâche (errno %d). S'il reste de la mémoire libre, consultez le manual pour trouver un éventuel bug dépendant de l'OS",
"Column count doesn't match value count at row %ld", "Column count doesn't match value count at row %ld",
"Impossible de réouvrir la table: '%-.64s', "Impossible de réouvrir la table: '%-.64s",
"Utilisation incorrecte de la valeur NULL", "Utilisation incorrecte de la valeur NULL",
"Erreur '%-.64s' provenant de regexp", "Erreur '%-.64s' provenant de regexp",
"Mélanger les colonnes GROUP (MIN(),MAX(),COUNT()...) avec des colonnes normales est interdit s'il n'y a pas de clause GROUP BY", "Mélanger les colonnes GROUP (MIN(),MAX(),COUNT()...) avec des colonnes normales est interdit s'il n'y a pas de clause GROUP BY",
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
"Erreur reçue de fcntl() ", "Erreur reçue de fcntl() ",
"Paquets reçus dans le désordre", "Paquets reçus dans le désordre",
"Impossible de décompresser le paquet reçu", "Impossible de décompresser le paquet reçu",
"Erreur de lecture des paquets reçus" "Erreur de lecture des paquets reçus",
"Timeout en lecture des paquets reçus", "Timeout en lecture des paquets reçus",
"Erreur d'écriture des paquets envoyés", "Erreur d'écriture des paquets envoyés",
"Timeout d'écriture des paquets envoyés", "Timeout d'écriture des paquets envoyés",
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
"La table '%-.64s' est marquée 'crashed' et devrait être réparée", "La table '%-.64s' est marquée 'crashed' et devrait être réparée",
"La table '%-.64s' est marquée 'crashed' et le dernier 'repair' a échoué", "La table '%-.64s' est marquée 'crashed' et le dernier 'repair' a échoué",
"Attention: certaines tables ne supportant pas les transactions ont été changées et elles ne pourront pas être restituées", "Attention: certaines tables ne supportant pas les transactions ont été changées et elles ne pourront pas être restituées",
"Cette transaction à commandes multiples nécessite plus de 'max_binlog_cache_size' octets de stockage, augmentez cette variable de mysqld et réessayez', "Cette transaction à commandes multiples nécessite plus de 'max_binlog_cache_size' octets de stockage, augmentez cette variable de mysqld et réessayez",
"Cette opération ne peut être réalisée avec un esclave actif, faites SLAVE STOP d'abord", "Cette opération ne peut être réalisée avec un esclave actif, faites SLAVE STOP d'abord",
"Cette opération nécessite un esclave actif, configurez les esclaves et faites SLAVE START", "Cette opération nécessite un esclave actif, configurez les esclaves et faites SLAVE START",
"Le server n'est pas configuré comme un esclave, changez le fichier de configuration ou utilisez CHANGE MASTER TO", "Le server n'est pas configuré comme un esclave, changez le fichier de configuration ou utilisez CHANGE MASTER TO",
......
sql/share/german/errmsg.txt
View file @ bebafeba
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"Kann Datensatz nicht finden.", "Kann Datensatz nicht finden.",
"Falsche Information in Datei: '%-.64s'", "Falsche Information in Datei: '%-.64s'",
"Falsche Schlüssel-Datei für Tabelle '%-.64s'. Versuche zu reparieren!", "Falsche Schlüssel-Datei für Tabelle '%-.64s'. Versuche zu reparieren!",
"Alte Schlüssel-Datei für Tabelle '%-.64s'. Repariere! "Alte Schlüssel-Datei für Tabelle '%-.64s'. Repariere!",
"'%-.64s' ist nur lesbar.", "'%-.64s' ist nur lesbar.",
"Kein Speicher (benötigt %d bytes). Server neu starten.", "Kein Speicher (benötigt %d bytes). Server neu starten.",
"Kein Speicher zum Sortieren. Server Sortier-Buffer erhöhen.", "Kein Speicher zum Sortieren. Server Sortier-Buffer erhöhen.",
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
"Fehler von fcntl()", "Fehler von fcntl()",
"Empfangenes Paket ist nicht in Reihenfolge", "Empfangenes Paket ist nicht in Reihenfolge",
"Communikation-Packet läßt sich nicht entpacken", "Communikation-Packet läßt sich nicht entpacken",
"Fehler beim Lesen eines Communication-Packets" "Fehler beim Lesen eines Communication-Packets",
"Timeout beim Lesen eines Communication-Packets", "Timeout beim Lesen eines Communication-Packets",
"Fehler beim Schreiben eines Communication-Packets", "Fehler beim Schreiben eines Communication-Packets",
"Timeout beim Schreiben eines Communication-Packets", "Timeout beim Schreiben eines Communication-Packets",
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
"Tabelle '%-.64s' ist als defekt makiert und sollte repariert werden", "Tabelle '%-.64s' ist als defekt makiert und sollte repariert werden",
"Tabelle '%-.64s' ist als defekt makiert und der letzte (automatische) Reparaturversuch schlug fehl.", "Tabelle '%-.64s' ist als defekt makiert und der letzte (automatische) Reparaturversuch schlug fehl.",
"Warnung: Das Rollback konnte bei einigen Tabellen, die nicht mittels Transaktionen geändert wurden, nicht ausgeführt werden.", "Warnung: Das Rollback konnte bei einigen Tabellen, die nicht mittels Transaktionen geändert wurden, nicht ausgeführt werden.",
"Multi-Statement Transaktionen benötigen mehr als 'max_binlog_cache_size' Bytes An Speicher. Diese mysqld-Variabel vergrössern und nochmal versuchen.', "Multi-Statement Transaktionen benötigen mehr als 'max_binlog_cache_size' Bytes An Speicher. Diese mysqld-Variabel vergrössern und nochmal versuchen.",
"Diese Operation kann nicht bei einem aktiven Slave durchgeführt werden. Das Kommand SLAVE STOP muss zuerst ausgeführt werden.", "Diese Operation kann nicht bei einem aktiven Slave durchgeführt werden. Das Kommand SLAVE STOP muss zuerst ausgeführt werden.",
"Diese Operationbenötigt einen aktiven Slave. Slave konfigurieren und mittels SLAVE START aktivieren.", "Diese Operationbenötigt einen aktiven Slave. Slave konfigurieren und mittels SLAVE START aktivieren.",
"Der Server ist nicht als Slave konfigiriert. Im Konfigurations-File oder mittel CHANGE MASTER TO beheben.", "Der Server ist nicht als Slave konfigiriert. Im Konfigurations-File oder mittel CHANGE MASTER TO beheben.",
......
sql/share/greek/errmsg.txt
View file @ bebafeba
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
"Got an error from fcntl()", "Got an error from fcntl()",
"Got packets out of order", "Got packets out of order",
"Couldn't uncompress communication packet", "Couldn't uncompress communication packet",
"Got an error reading communication packets" "Got an error reading communication packets",
"Got timeout reading communication packets", "Got timeout reading communication packets",
"Got an error writing communication packets", "Got an error writing communication packets",
"Got timeout writing communication packets", "Got timeout writing communication packets",
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
"Table '%-.64s' is marked as crashed and should be repaired", "Table '%-.64s' is marked as crashed and should be repaired",
"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
"Warning: Some non-transactional changed tables couldn't be rolled back", "Warning: Some non-transactional changed tables couldn't be rolled back",
"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again', "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
"This operation cannot be performed with a running slave, run SLAVE STOP first", "This operation cannot be performed with a running slave, run SLAVE STOP first",
"This operation requires a running slave, configure slave and do SLAVE START", "This operation requires a running slave, configure slave and do SLAVE START",
"The server is not configured as slave, fix in config file or with CHANGE MASTER TO", "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
......
sql/share/hungarian/errmsg.txt
View file @ bebafeba
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
"Megegyezo sorok szama: %ld Valtozott: %ld Warnings: %ld", "Megegyezo sorok szama: %ld Valtozott: %ld Warnings: %ld",
"Uj thread letrehozasa nem lehetseges (Hibakod: %d). Amenyiben van meg szabad memoria, olvassa el a kezikonyv operacios rendszerfuggo hibalehetosegekrol szolo reszet", "Uj thread letrehozasa nem lehetseges (Hibakod: %d). Amenyiben van meg szabad memoria, olvassa el a kezikonyv operacios rendszerfuggo hibalehetosegekrol szolo reszet",
"Az oszlopban talalhato ertek nem egyezik meg a %ld sorban szamitott ertekkel", "Az oszlopban talalhato ertek nem egyezik meg a %ld sorban szamitott ertekkel",
"Nem lehet ujra-megnyitni a tablat: '%-.64s', "Nem lehet ujra-megnyitni a tablat: '%-.64s",
"A NULL ervenytelen hasznalata", "A NULL ervenytelen hasznalata",
"'%-.64s' hiba a regularis kifejezes hasznalata soran (regexp)", "'%-.64s' hiba a regularis kifejezes hasznalata soran (regexp)",
"A GROUP mezok (MIN(),MAX(),COUNT()...) kevert hasznalata nem lehetseges GROUP BY hivatkozas nelkul", "A GROUP mezok (MIN(),MAX(),COUNT()...) kevert hasznalata nem lehetseges GROUP BY hivatkozas nelkul",
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
"Hiba a fcntl() fuggvenyben", "Hiba a fcntl() fuggvenyben",
"Helytelen sorrendben erkezett adatcsomagok", "Helytelen sorrendben erkezett adatcsomagok",
"A kommunikacios adatcsomagok nem tomorithetok ki", "A kommunikacios adatcsomagok nem tomorithetok ki",
"HIba a kommunikacios adatcsomagok olvasasa soran" "HIba a kommunikacios adatcsomagok olvasasa soran",
"Idotullepes a kommunikacios adatcsomagok olvasasa soran", "Idotullepes a kommunikacios adatcsomagok olvasasa soran",
"Hiba a kommunikacios csomagok irasa soran", "Hiba a kommunikacios csomagok irasa soran",
"Idotullepes a kommunikacios csomagok irasa soran", "Idotullepes a kommunikacios csomagok irasa soran",
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
"Table '%-.64s' is marked as crashed and should be repaired", "Table '%-.64s' is marked as crashed and should be repaired",
"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
"Warning: Some non-transactional changed tables couldn't be rolled back", "Warning: Some non-transactional changed tables couldn't be rolled back",
"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again', "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
"This operation cannot be performed with a running slave, run SLAVE STOP first", "This operation cannot be performed with a running slave, run SLAVE STOP first",
"This operation requires a running slave, configure slave and do SLAVE START", "This operation requires a running slave, configure slave and do SLAVE START",
"The server is not configured as slave, fix in config file or with CHANGE MASTER TO", "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
......
sql/share/italian/errmsg.txt
View file @ bebafeba
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
"Errore durante la rinominazione da '%-.64s' a '%-.64s' (errno: %d)", "Errore durante la rinominazione da '%-.64s' a '%-.64s' (errno: %d)",
"Errore durante la scrittura del file '%-.64s' (errno: %d)", "Errore durante la scrittura del file '%-.64s' (errno: %d)",
"'%-.64s' e` soggetto a lock contro i cambiamenti", "'%-.64s' e` soggetto a lock contro i cambiamenti",
"Operazione di ordinamento abbandonata" , "Operazione di ordinamento abbandonata",
"La view '%-.64s' non esiste per '%-.64s'", "La view '%-.64s' non esiste per '%-.64s'",
"Rilevato l'errore %d dal gestore delle tabelle", "Rilevato l'errore %d dal gestore delle tabelle",
"Il gestore delle tabelle per '%-.64s' non ha questa opzione", "Il gestore delle tabelle per '%-.64s' non ha questa opzione",
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
"%s: Forzata la chiusura del thread %ld utente: '%-.64s'\n", "%s: Forzata la chiusura del thread %ld utente: '%-.64s'\n",
"Impossibile creare il socket IP", "Impossibile creare il socket IP",
"La tabella '%-.64s' non ha nessun indice come quello specificatato dalla CREATE INDEX. Ricrea la tabella", "La tabella '%-.64s' non ha nessun indice come quello specificatato dalla CREATE INDEX. Ricrea la tabella",
"L'argomento 'Field separator' non e` quello atteso. Controlla il manuale"," "L'argomento 'Field separator' non e` quello atteso. Controlla il manuale",
"Non possono essere usate righe a lunghezza fissa con i BLOB. Usa 'FIELDS TERMINATED BY'.", "Non possono essere usate righe a lunghezza fissa con i BLOB. Usa 'FIELDS TERMINATED BY'.",
"Il file '%-.64s' deve essere nella directory del database e deve essere leggibile da tutti", "Il file '%-.64s' deve essere nella directory del database e deve essere leggibile da tutti",
"Il file '%-.64s' esiste gia`", "Il file '%-.64s' esiste gia`",
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
"La tabella '%-.64s' e` segnalata come corrotta e deve essere riparata", "La tabella '%-.64s' e` segnalata come corrotta e deve essere riparata",
"La tabella '%-.64s' e` segnalata come corrotta e l'ultima ricostruzione (automatica?) e` fallita", "La tabella '%-.64s' e` segnalata come corrotta e l'ultima ricostruzione (automatica?) e` fallita",
"Attenzione: Alcune delle modifiche alle tabelle non transazionali non possono essere ripristinate (roll back impossibile)", "Attenzione: Alcune delle modifiche alle tabelle non transazionali non possono essere ripristinate (roll back impossibile)",
"La transazione a comandi multipli (multi-statement) ha richiesto piu` di 'max_binlog_cache_size' bytes di disco: aumentare questa variabile di mysqld e riprovare', "La transazione a comandi multipli (multi-statement) ha richiesto piu` di 'max_binlog_cache_size' bytes di disco: aumentare questa variabile di mysqld e riprovare",
"Questa operazione non puo' essere eseguita con un database 'slave' che gira, lanciare prima SLAVE STOP", "Questa operazione non puo' essere eseguita con un database 'slave' che gira, lanciare prima SLAVE STOP",
"Questa operaione richiede un database 'slave', configurarlo ed eseguire SLAVE START", "Questa operaione richiede un database 'slave', configurarlo ed eseguire SLAVE START",
"Il server non e' configurato come 'slave', correggere il file di configurazione cambiando CHANGE MASTER TO", "Il server non e' configurato come 'slave', correggere il file di configurazione cambiando CHANGE MASTER TO",
......
sql/share/japanese/errmsg.txt
View file @ bebafeba
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
"Got an error from fcntl()", "Got an error from fcntl()",
"Got packets out of order", "Got packets out of order",
"Couldn't uncompress communication packet", "Couldn't uncompress communication packet",
"Got an error reading communication packets" "Got an error reading communication packets",
"Got timeout reading communication packets", "Got timeout reading communication packets",
"Got an error writing communication packets", "Got an error writing communication packets",
"Got timeout writing communication packets", "Got timeout writing communication packets",
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
"Table '%-.64s' is marked as crashed and should be repaired", "Table '%-.64s' is marked as crashed and should be repaired",
"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
"Warning: Some non-transactional changed tables couldn't be rolled back", "Warning: Some non-transactional changed tables couldn't be rolled back",
"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again', "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
"This operation cannot be performed with a running slave, run SLAVE STOP first", "This operation cannot be performed with a running slave, run SLAVE STOP first",
"This operation requires a running slave, configure slave and do SLAVE START", "This operation requires a running slave, configure slave and do SLAVE START",
"The server is not configured as slave, fix in config file or with CHANGE MASTER TO", "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
......
sql/share/korean/errmsg.txt
View file @ bebafeba
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
"일치하는 Rows : %ld개 변경됨: %ld개 경고: %ld개", "일치하는 Rows : %ld개 변경됨: %ld개 경고: %ld개",
"새로운 쓰레드를 만들 수 없습니다.(에러번호 %d). 만약 여유메모리가 있다면 OS-dependent버그 의 메뉴얼 부분을 찾아보시오.", "새로운 쓰레드를 만들 수 없습니다.(에러번호 %d). 만약 여유메모리가 있다면 OS-dependent버그 의 메뉴얼 부분을 찾아보시오.",
"Row %ld에서 칼럼 카운트와 value 카운터와 일치하지 않습니다.", "Row %ld에서 칼럼 카운트와 value 카운터와 일치하지 않습니다.",
"테이블을 다시 열수 없군요: '%-.64s', "테이블을 다시 열수 없군요: '%-.64s",
"NULL 값을 잘못 사용하셨군요...", "NULL 값을 잘못 사용하셨군요...",
"regexp에서 '%-.64s'가 났습니다.", "regexp에서 '%-.64s'가 났습니다.",
"Mixing of GROUP 칼럼s (MIN(),MAX(),COUNT()...) with no GROUP 칼럼s is illegal if there is no GROUP BY clause", "Mixing of GROUP 칼럼s (MIN(),MAX(),COUNT()...) with no GROUP 칼럼s is illegal if there is no GROUP BY clause",
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
"fcntl() 함수로부터 에러가 발생하였습니다.", "fcntl() 함수로부터 에러가 발생하였습니다.",
"순서가 맞지않는 패킷을 받았습니다.", "순서가 맞지않는 패킷을 받았습니다.",
"통신 패킷의 압축해제를 할 수 없었습니다.", "통신 패킷의 압축해제를 할 수 없었습니다.",
"통신 패킷을 읽는 중 오류가 발생하였습니다." "통신 패킷을 읽는 중 오류가 발생하였습니다.",
"통신 패킷을 읽는 중 timeout이 발생하였습니다.", "통신 패킷을 읽는 중 timeout이 발생하였습니다.",
"통신 패킷을 기록하는 중 오류가 발생하였습니다.", "통신 패킷을 기록하는 중 오류가 발생하였습니다.",
"통신 패팃을 기록하는 중 timeout이 발생하였습니다.", "통신 패팃을 기록하는 중 timeout이 발생하였습니다.",
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
"Table '%-.64s' is marked as crashed and should be repaired", "Table '%-.64s' is marked as crashed and should be repaired",
"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
"Warning: Some non-transactional changed tables couldn't be rolled back", "Warning: Some non-transactional changed tables couldn't be rolled back",
"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again', "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
"This operation cannot be performed with a running slave, run SLAVE STOP first", "This operation cannot be performed with a running slave, run SLAVE STOP first",
"This operation requires a running slave, configure slave and do SLAVE START", "This operation requires a running slave, configure slave and do SLAVE START",
"The server is not configured as slave, fix in config file or with CHANGE MASTER TO", "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
......
sql/share/norwegian-ny/errmsg.txt
View file @ bebafeba
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
"Blob feltet '%-.64s' kan ikkje ha ein standard verdi", "Blob feltet '%-.64s' kan ikkje ha ein standard verdi",
"Ugyldig database namn '%-.64s'", "Ugyldig database namn '%-.64s'",
"Ugyldig tabell namn '%-.64s'", "Ugyldig tabell namn '%-.64s'",
"SELECT ville underskje for mange postar og ville sannsynligvis ta veldig lang tid. Undersk WHERE klausulen og bruk SET OPTION SQL_BIG_SELECTS=1 om SELECTen er korrekt" "SELECT ville underskje for mange postar og ville sannsynligvis ta veldig lang tid. Undersk WHERE klausulen og bruk SET OPTION SQL_BIG_SELECTS=1 om SELECTen er korrekt",
"Ukjend feil", "Ukjend feil",
"Ukjend prosedyre %s", "Ukjend prosedyre %s",
"Feil parameter tal til prosedyra %s", "Feil parameter tal til prosedyra %s",
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
"Rows matched: %ld Changed: %ld Warnings: %ld", "Rows matched: %ld Changed: %ld Warnings: %ld",
"Can't create a new thread (errno %d). If you are not out of available memory you can consult the manual for any possible OS dependent bug", "Can't create a new thread (errno %d). If you are not out of available memory you can consult the manual for any possible OS dependent bug",
"Column count doesn't match value count at row %ld", "Column count doesn't match value count at row %ld",
"Can't reopen table: '%-.64s', "Can't reopen table: '%-.64s",
"Invalid use of NULL value", "Invalid use of NULL value",
"Got error '%-.64s' from regexp", "Got error '%-.64s' from regexp",
"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause", "Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
"Got an error from fcntl()", "Got an error from fcntl()",
"Got packets out of order", "Got packets out of order",
"Couldn't uncompress communication packet", "Couldn't uncompress communication packet",
"Got an error reading communication packets" "Got an error reading communication packets",
"Got timeout reading communication packets", "Got timeout reading communication packets",
"Got an error writing communication packets", "Got an error writing communication packets",
"Got timeout writing communication packets", "Got timeout writing communication packets",
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
"Table '%-.64s' is marked as crashed and should be repaired", "Table '%-.64s' is marked as crashed and should be repaired",
"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
"Warning: Some non-transactional changed tables couldn't be rolled back", "Warning: Some non-transactional changed tables couldn't be rolled back",
"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again', "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
"This operation cannot be performed with a running slave, run SLAVE STOP first", "This operation cannot be performed with a running slave, run SLAVE STOP first",
"This operation requires a running slave, configure slave and do SLAVE START", "This operation requires a running slave, configure slave and do SLAVE START",
"The server is not configured as slave, fix in config file or with CHANGE MASTER TO", "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
......
sql/share/norwegian/errmsg.txt
View file @ bebafeba
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
"Blob feltet '%-.64s' kan ikke ha en standard verdi", "Blob feltet '%-.64s' kan ikke ha en standard verdi",
"Ugyldig database navn '%-.64s'", "Ugyldig database navn '%-.64s'",
"Ugyldig tabell navn '%-.64s'", "Ugyldig tabell navn '%-.64s'",
"SELECT ville undersøke for mange poster og ville sannsynligvis ta veldig lang tid. Undersøk WHERE klausulen og bruk SET OPTION SQL_BIG_SELECTS=1 om SELECTen er korrekt" "SELECT ville undersøke for mange poster og ville sannsynligvis ta veldig lang tid. Undersøk WHERE klausulen og bruk SET OPTION SQL_BIG_SELECTS=1 om SELECTen er korrekt",
"Ukjent feil", "Ukjent feil",
"Ukjent prosedyre %s", "Ukjent prosedyre %s",
"Feil parameter antall til prosedyren %s", "Feil parameter antall til prosedyren %s",
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
"Rows matched: %ld Changed: %ld Warnings: %ld", "Rows matched: %ld Changed: %ld Warnings: %ld",
"Can't create a new thread (errno %d). If you are not out of available memory you can consult the manual for any possible OS dependent bug", "Can't create a new thread (errno %d). If you are not out of available memory you can consult the manual for any possible OS dependent bug",
"Column count doesn't match value count at row %ld", "Column count doesn't match value count at row %ld",
"Can't reopen table: '%-.64s', "Can't reopen table: '%-.64s",
"Invalid use of NULL value", "Invalid use of NULL value",
"Got error '%-.64s' from regexp", "Got error '%-.64s' from regexp",
"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause", "Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
"Got an error from fcntl()", "Got an error from fcntl()",
"Got packets out of order", "Got packets out of order",
"Couldn't uncompress communication packet", "Couldn't uncompress communication packet",
"Got an error reading communication packets" "Got an error reading communication packets",
"Got timeout reading communication packets", "Got timeout reading communication packets",
"Got an error writing communication packets", "Got an error writing communication packets",
"Got timeout writing communication packets", "Got timeout writing communication packets",
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
"Table '%-.64s' is marked as crashed and should be repaired", "Table '%-.64s' is marked as crashed and should be repaired",
"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
"Warning: Some non-transactional changed tables couldn't be rolled back", "Warning: Some non-transactional changed tables couldn't be rolled back",
"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again', "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
"This operation cannot be performed with a running slave, run SLAVE STOP first", "This operation cannot be performed with a running slave, run SLAVE STOP first",
"This operation requires a running slave, configure slave and do SLAVE START", "This operation requires a running slave, configure slave and do SLAVE START",
"The server is not configured as slave, fix in config file or with CHANGE MASTER TO", "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
......
sql/share/polish/errmsg.txt
View file @ bebafeba
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
"%s: Wymuszenie zamknicia w?tku %ld uytkownik: '%-.64s'\n", "%s: Wymuszenie zamknicia w?tku %ld uytkownik: '%-.64s'\n",
"Nie mona stworzy socket'u IP", "Nie mona stworzy socket'u IP",
"Tabela '%-.64s' nie ma indeksu takiego jak w CREATE INDEX. Stwrz tabel", "Tabela '%-.64s' nie ma indeksu takiego jak w CREATE INDEX. Stwrz tabel",
"Nie oczekiwano separatora. Sprawd podrcznik"," "Nie oczekiwano separatora. Sprawd podrcznik",
"Nie mona uy staej dugo?ci wiersza z polami typu BLOB. Uyj 'fields terminated by'.", "Nie mona uy staej dugo?ci wiersza z polami typu BLOB. Uyj 'fields terminated by'.",
"Plik '%-.64s' musi znajdowa sie w katalogu bazy danych lub mie prawa czytania przez wszystkich", "Plik '%-.64s' musi znajdowa sie w katalogu bazy danych lub mie prawa czytania przez wszystkich",
"Plik '%-.64s' ju istnieje", "Plik '%-.64s' ju istnieje",
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
"Rows matched: %ld Changed: %ld Warnings: %ld", "Rows matched: %ld Changed: %ld Warnings: %ld",
"Can't create a new thread (errno %d). If you are not out of available memory you can consult the manual for any possible OS dependent bug", "Can't create a new thread (errno %d). If you are not out of available memory you can consult the manual for any possible OS dependent bug",
"Column count doesn't match value count at row %ld", "Column count doesn't match value count at row %ld",
"Can't reopen table: '%-.64s', "Can't reopen table: '%-.64s",
"Invalid use of NULL value", "Invalid use of NULL value",
"Got error '%-.64s' from regexp", "Got error '%-.64s' from regexp",
"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause", "Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
"Got an error from fcntl()", "Got an error from fcntl()",
"Got packets out of order", "Got packets out of order",
"Couldn't uncompress communication packet", "Couldn't uncompress communication packet",
"Got an error reading communication packets" "Got an error reading communication packets",
"Got timeout reading communication packets", "Got timeout reading communication packets",
"Got an error writing communication packets", "Got an error writing communication packets",
"Got timeout writing communication packets", "Got timeout writing communication packets",
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
"Table '%-.64s' is marked as crashed and should be repaired", "Table '%-.64s' is marked as crashed and should be repaired",
"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
"Warning: Some non-transactional changed tables couldn't be rolled back", "Warning: Some non-transactional changed tables couldn't be rolled back",
"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again', "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
"This operation cannot be performed with a running slave, run SLAVE STOP first", "This operation cannot be performed with a running slave, run SLAVE STOP first",
"This operation requires a running slave, configure slave and do SLAVE START", "This operation requires a running slave, configure slave and do SLAVE START",
"The server is not configured as slave, fix in config file or with CHANGE MASTER TO", "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
......
sql/share/portuguese/errmsg.txt
View file @ bebafeba
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
"Linhas que combinaram: %ld - Alteradas: %ld - Avisos: %ld", "Linhas que combinaram: %ld - Alteradas: %ld - Avisos: %ld",
"Não pode criar uma nova 'thread' (erro no. %d). Se você não estiver sem memória disponível, você pode consultar o manual sobre um possível 'bug' dependente do sistema operacional", "Não pode criar uma nova 'thread' (erro no. %d). Se você não estiver sem memória disponível, você pode consultar o manual sobre um possível 'bug' dependente do sistema operacional",
"Contagem de colunas não confere com a contagem de valores na linha %ld", "Contagem de colunas não confere com a contagem de valores na linha %ld",
"Não pode reabrir a tabela '%-.64s', "Não pode reabrir a tabela '%-.64s",
"Uso inválido do valor NULL", "Uso inválido do valor NULL",
"Obteve erro '%-.64s' em regexp", "Obteve erro '%-.64s' em regexp",
"Mistura de colunas agrupadas (com MIN(), MAX(), COUNT(), ...) com colunas não agrupadas é ilegal, se não existir uma cláusula de agrupamento (cláusula GROUP BY)", "Mistura de colunas agrupadas (com MIN(), MAX(), COUNT(), ...) com colunas não agrupadas é ilegal, se não existir uma cláusula de agrupamento (cláusula GROUP BY)",
......
sql/share/romanian/errmsg.txt
View file @ bebafeba
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
"Table '%-.64s' is marked as crashed and should be repaired", "Table '%-.64s' is marked as crashed and should be repaired",
"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
"Warning: Some non-transactional changed tables couldn't be rolled back", "Warning: Some non-transactional changed tables couldn't be rolled back",
"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again', "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
"This operation cannot be performed with a running slave, run SLAVE STOP first", "This operation cannot be performed with a running slave, run SLAVE STOP first",
"This operation requires a running slave, configure slave and do SLAVE START", "This operation requires a running slave, configure slave and do SLAVE START",
"The server is not configured as slave, fix in config file or with CHANGE MASTER TO", "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
......
sql/share/russian/errmsg.txt
View file @ bebafeba
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
" '%-.64s' GROUP BY", " '%-.64s' GROUP BY",
" '%-.64s'", " '%-.64s'",
" , ", " , ",
" " " ",
" : '%-.64s'", " : '%-.64s'",
" '%-.64s'", " '%-.64s'",
" '%-.64s'", " '%-.64s'",
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
" : %ld : %ld : %ld", " : %ld : %ld : %ld",
" ( %d). - , OS- ", " ( %d). - , OS- ",
" %ld", " %ld",
" : '%-.64s', " : '%-.64s",
" NULL", " NULL",
"REGEXP '%-.64s'", "REGEXP '%-.64s'",
" (MIN(),MAX(),COUNT()...) GROUP BY", " (MIN(),MAX(),COUNT()...) GROUP BY",
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
"fcntl() ", "fcntl() ",
" ", " ",
" ", " ",
" " " ",
" ", " ",
" ", " ",
" ", " ",
......
sql/share/slovak/errmsg.txt
View file @ bebafeba
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
"Rows matched: %ld Changed: %ld Warnings: %ld", "Rows matched: %ld Changed: %ld Warnings: %ld",
"Can't create a new thread (errno %d). If you are not out of available memory, you can consult the manual for a possible OS-dependent bug", "Can't create a new thread (errno %d). If you are not out of available memory, you can consult the manual for a possible OS-dependent bug",
"Column count doesn't match value count at row %ld", "Column count doesn't match value count at row %ld",
"Can't reopen table: '%-.64s', "Can't reopen table: '%-.64s",
"Invalid use of NULL value", "Invalid use of NULL value",
"Got error '%-.64s' from regexp", "Got error '%-.64s' from regexp",
"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause", "Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
"Got an error from fcntl()", "Got an error from fcntl()",
"Got packets out of order", "Got packets out of order",
"Couldn't uncompress communication packet", "Couldn't uncompress communication packet",
"Got an error reading communication packets" "Got an error reading communication packets",
"Got timeout reading communication packets", "Got timeout reading communication packets",
"Got an error writing communication packets", "Got an error writing communication packets",
"Got timeout writing communication packets", "Got timeout writing communication packets",
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
"Table '%-.64s' is marked as crashed and should be repaired", "Table '%-.64s' is marked as crashed and should be repaired",
"Table '%-.64s' is marked as crashed and last (automatic?) repair failed", "Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
"Warning: Some non-transactional changed tables couldn't be rolled back", "Warning: Some non-transactional changed tables couldn't be rolled back",
"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again', "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again",
"This operation cannot be performed with a running slave, run SLAVE STOP first", "This operation cannot be performed with a running slave, run SLAVE STOP first",
"This operation requires a running slave, configure slave and do SLAVE START", "This operation requires a running slave, configure slave and do SLAVE START",
"The server is not configured as slave, fix in config file or with CHANGE MASTER TO", "The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
......
sql/share/spanish/errmsg.txt
View file @ bebafeba
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
"Líneas correspondientes: %ld Cambiadas: %ld Avisos: %ld", "Líneas correspondientes: %ld Cambiadas: %ld Avisos: %ld",
"No puedo crear un nuevo thread (errno %d). Si tu está con falta de memoria disponible, tu puedes consultar el Manual para posibles problemas con SO", "No puedo crear un nuevo thread (errno %d). Si tu está con falta de memoria disponible, tu puedes consultar el Manual para posibles problemas con SO",
"El número de columnas no corresponde al número en la línea %ld", "El número de columnas no corresponde al número en la línea %ld",
"No puedo reabrir tabla: '%-.64s', "No puedo reabrir tabla: '%-.64s",
"Invalido uso de valor NULL", "Invalido uso de valor NULL",
"Obtenido error '%-.64s' de regexp", "Obtenido error '%-.64s' de regexp",
"Mezcla de columnas GROUP (MIN(),MAX(),COUNT()...) con no GROUP columnas es ilegal si no hat la clausula GROUP BY", "Mezcla de columnas GROUP (MIN(),MAX(),COUNT()...) con no GROUP columnas es ilegal si no hat la clausula GROUP BY",
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
"Obtenido un error de fcntl()", "Obtenido un error de fcntl()",
"Obtenido paquetes desordenados", "Obtenido paquetes desordenados",
"No puedo descomprimir paquetes de comunicación", "No puedo descomprimir paquetes de comunicación",
"Obtenido un error leyendo paquetes de comunicación" "Obtenido un error leyendo paquetes de comunicación",
"Obtenido timeout leyendo paquetes de comunicación", "Obtenido timeout leyendo paquetes de comunicación",
"Obtenido un error de escribiendo paquetes de comunicación", "Obtenido un error de escribiendo paquetes de comunicación",
"Obtenido timeout escribiendo paquetes de comunicación", "Obtenido timeout escribiendo paquetes de comunicación",
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
"Tabla '%-.64s' está marcada como crashed y debe ser reparada", "Tabla '%-.64s' está marcada como crashed y debe ser reparada",
"Tabla '%-.64s' está marcada como crashed y la última reparación (automactica?) falló", "Tabla '%-.64s' está marcada como crashed y la última reparación (automactica?) falló",
"Aviso: Algunas tablas no transancionales no pueden tener rolled back", "Aviso: Algunas tablas no transancionales no pueden tener rolled back",
"Multipla transición necesita mas que 'max_binlog_cache_size' bytes de almacenamiento. Aumente esta variable mysqld y tente de nuevo', "Multipla transición necesita mas que 'max_binlog_cache_size' bytes de almacenamiento. Aumente esta variable mysqld y tente de nuevo",
"Esta operación no puede ser hecha con el esclavo funcionando, primero use SLAVE STOP", "Esta operación no puede ser hecha con el esclavo funcionando, primero use SLAVE STOP",
"Esta operación necesita el esclavo funcionando, configure esclavo y haga el SLAVE START", "Esta operación necesita el esclavo funcionando, configure esclavo y haga el SLAVE START",
"El servidor no está configurado como esclavo, edite el archivo config file o con CHANGE MASTER TO", "El servidor no está configurado como esclavo, edite el archivo config file o con CHANGE MASTER TO",
......
sql/share/swedish/errmsg.txt
View file @ bebafeba
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
"Kan inte skapa IP socket", "Kan inte skapa IP socket",
"Tabellen '%-.64s' har inget index som motsvarar det angivna i CREATE INDEX. Skapa om tabellen", "Tabellen '%-.64s' har inget index som motsvarar det angivna i CREATE INDEX. Skapa om tabellen",
"Fält separatorerna är inte emotsägande eller för långa. Kontrollera mot manualen", "Fält separatorerna är inte emotsägande eller för långa. Kontrollera mot manualen",
"Man kan inte använda fast radlängd med blobs. Använd 'fields terminated by'." "Man kan inte använda fast radlängd med blobs. Använd 'fields terminated by'",
"Textfilen '%' måste finnas i databas biblioteket eller vara läsbar för alla", "Textfilen '%' måste finnas i databas biblioteket eller vara läsbar för alla",
"Filen '%-.64s' existerar redan", "Filen '%-.64s' existerar redan",
"Rader: %ld Bortagna: %ld Dubletter: %ld Varningar: %ld", "Rader: %ld Bortagna: %ld Dubletter: %ld Varningar: %ld",
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
"Kan inte generera ett unikt filnamn %s.(1-999)\n", "Kan inte generera ett unikt filnamn %s.(1-999)\n",
"Tabell '%-.64s' kan inte uppdateras emedan den är låst för läsning", "Tabell '%-.64s' kan inte uppdateras emedan den är låst för läsning",
"Tabell '%-.64s' är inte låst med LOCK TABLES", "Tabell '%-.64s' är inte låst med LOCK TABLES",
"BLOB fält '%-.64s' kan inte ha ett DEFAULT värde" "BLOB fält '%-.64s' kan inte ha ett DEFAULT värde",
"Felaktigt databas namn '%-.64s'", "Felaktigt databas namn '%-.64s'",
"Felaktigt tabell namn '%-.64s'", "Felaktigt tabell namn '%-.64s'",
"Den angivna frågan skulle troligen ta mycket long tid! Kontrollar din WHERE och använd SET OPTION SQL_BIG_SELECTS=1 ifall du vill hantera stora joins", "Den angivna frågan skulle troligen ta mycket long tid! Kontrollar din WHERE och använd SET OPTION SQL_BIG_SELECTS=1 ifall du vill hantera stora joins",
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
"Tabeller måste ha minst 1 kolumn", "Tabeller måste ha minst 1 kolumn",
"Tabellen '%-.64s' är full", "Tabellen '%-.64s' är full",
"Okänt karaktärset: '%-.64s'", "Okänt karaktärset: '%-.64s'",
"För många tabeller. MySQL can ha högst %d tabeller i en och samma join" "För många tabeller. MySQL can ha högst %d tabeller i en och samma join",
"För många fält", "För många fält",
"För stor total rad längd. Den högst tillåtna rad-längden, förutom BLOBs, är %d. Ändra några av dina fält till BLOB", "För stor total rad längd. Den högst tillåtna rad-längden, förutom BLOBs, är %d. Ändra några av dina fält till BLOB",
"Tråd-stacken tog slut: Har använt %ld av %ld bytes. Använd 'mysqld -O thread_stack=#' ifall du behöver en större stack", "Tråd-stacken tog slut: Har använt %ld av %ld bytes. Använd 'mysqld -O thread_stack=#' ifall du behöver en större stack",
...@@ -136,9 +136,9 @@ ...@@ -136,9 +136,9 @@
"För att ändra lösenord för andra måste du ha rättigheter att uppdatera mysql databasen", "För att ändra lösenord för andra måste du ha rättigheter att uppdatera mysql databasen",
"Hittade inte användaren i 'user' tabellen", "Hittade inte användaren i 'user' tabellen",
"Rader: %ld Uppdaterade: %ld Varningar: %ld", "Rader: %ld Uppdaterade: %ld Varningar: %ld",
"Kan inte skapa en ny tråd (errno %d)" "Kan inte skapa en ny tråd (errno %d)",
"Antalet kolumner motsvarar inte antalet värden på rad: %ld", "Antalet kolumner motsvarar inte antalet värden på rad: %ld",
"Kunde inte stänga och öppna tabell: '%-.64s', "Kunde inte stänga och öppna tabell: '%-.64s",
"Felaktig använding av NULL", "Felaktig använding av NULL",
"Fix fel '%-.64s' från REGEXP", "Fix fel '%-.64s' från REGEXP",
"Man får ha både GROUP kolumner (MIN(),MAX(),COUNT()...) och fält i en fråga om man inte har en GROUP BY del", "Man får ha både GROUP kolumner (MIN(),MAX(),COUNT()...) och fält i en fråga om man inte har en GROUP BY del",
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
"%-.16s ej tillåtet för '%-.32s@%-.64s'\n för kolumn '%-.64s' i tabell '%-.64s'", "%-.16s ej tillåtet för '%-.32s@%-.64s'\n för kolumn '%-.64s' i tabell '%-.64s'",
"Felaktigt GRANT privilegium använt", "Felaktigt GRANT privilegium använt",
"Felaktigt maskinnamn eller användarnamn använt med GRANT", "Felaktigt maskinnamn eller användarnamn använt med GRANT",
"Det finns ingen tabell som heter '%-.64s.%s'" "Det finns ingen tabell som heter '%-.64s.%s'",
"Det finns inget privilegium definierat för användare '%-.32s' på '%-.64s' för tabell '%-.64s'", "Det finns inget privilegium definierat för användare '%-.32s' på '%-.64s' för tabell '%-.64s'",
"Du kan inte använda detta kommando med denna MySQL version", "Du kan inte använda detta kommando med denna MySQL version",
"Du har något fel i din syntax", "Du har något fel i din syntax",
......
sql/share/ukrainian/errmsg.txt
View file @ bebafeba
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
" '%-.64s' ڦ Ҧ צ", " '%-.64s' ڦ Ҧ צ",
" '%-.64s' ڦ Τ (?) צ ", " '%-.64s' ڦ Τ (?) צ ",
": ˦ æΦ ͦ ", ": ˦ æΦ ͦ ",
"æ ¦ Φ 'max_binlog_cache_size' Ԧ Ҧ. ¦ ͦ mysqld ', "æ ¦ Φ 'max_binlog_cache_size' Ԧ Ҧ. ¦ ͦ mysqld ",
"æ Ц, SLAVE STOP", "æ Ц, SLAVE STOP",
"æ Ц, Ʀ Ц SLAVE START", "æ Ц, Ʀ Ц SLAVE START",
" Ʀ Ц, ̦ Ʀæ CHANGE MASTER TO", " Ʀ Ц, ̦ Ʀæ CHANGE MASTER TO",
......
sql/sql_analyse.cc
View file @ bebafeba
...@@ -89,6 +89,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result, ...@@ -89,6 +89,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
if ((*param->item)->type() != Item::INT_ITEM || if ((*param->item)->type() != Item::INT_ITEM ||
(*param->item)->val() < 0) (*param->item)->val() < 0)
{ {
delete pc;
net_printf(&thd->net, ER_WRONG_PARAMETERS_TO_PROCEDURE, proc_name); net_printf(&thd->net, ER_WRONG_PARAMETERS_TO_PROCEDURE, proc_name);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
...@@ -96,6 +97,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result, ...@@ -96,6 +97,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
param = param->next; param = param->next;
if (param->next) // no third parameter possible if (param->next) // no third parameter possible
{ {
delete pc;
net_printf(&thd->net, ER_WRONG_PARAMCOUNT_TO_PROCEDURE, proc_name); net_printf(&thd->net, ER_WRONG_PARAMCOUNT_TO_PROCEDURE, proc_name);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
...@@ -103,6 +105,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result, ...@@ -103,6 +105,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
if ((*param->item)->type() != Item::INT_ITEM || if ((*param->item)->type() != Item::INT_ITEM ||
(*param->item)->val() < 0) (*param->item)->val() < 0)
{ {
delete pc;
net_printf(&thd->net, ER_WRONG_PARAMETERS_TO_PROCEDURE, proc_name); net_printf(&thd->net, ER_WRONG_PARAMETERS_TO_PROCEDURE, proc_name);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
...@@ -111,6 +114,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result, ...@@ -111,6 +114,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
else if ((*param->item)->type() != Item::INT_ITEM || else if ((*param->item)->type() != Item::INT_ITEM ||
(*param->item)->val() < 0) (*param->item)->val() < 0)
{ {
delete pc;
net_printf(&thd->net, ER_WRONG_PARAMETERS_TO_PROCEDURE, proc_name); net_printf(&thd->net, ER_WRONG_PARAMETERS_TO_PROCEDURE, proc_name);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
......
sql/sql_analyse.h
View file @ bebafeba
...@@ -297,14 +297,17 @@ class analyse: public Procedure ...@@ -297,14 +297,17 @@ class analyse: public Procedure
public: public:
uint max_tree_elements, max_treemem; uint max_tree_elements, max_treemem;
analyse(select_result *res) :Procedure(res, PROC_NO_SORT), rows(0), analyse(select_result *res) :Procedure(res, PROC_NO_SORT), f_info(0),
output_str_length(0) {} rows(0), output_str_length(0) {}
~analyse() ~analyse()
{
if (f_info)
{ {
for (field_info **f=f_info; f != f_end; f++) for (field_info **f=f_info; f != f_end; f++)
delete (*f); delete (*f);
} }
}
virtual void add() {} virtual void add() {}
virtual bool change_columns(List<Item> &fields); virtual bool change_columns(List<Item> &fields);
virtual int send_row(List<Item> &fields); virtual int send_row(List<Item> &fields);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7