mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

enforce no trailing \n in Diagnostic_area messages

Browse source 
that is in my_error(), push_warning(), etc
This commit is contained in:
Sergei Golubchik 2024-12-28 20:15:43 +01:00
parent 0031f4a74f
commit 9508a44c37
16 changed files with 123 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
mysql-test/main/long_unique_debug.result
View file

@ -90,13 +90,11 @@ table->field[0]->offset = 1
table->field[0]->field_length = 10
table->field[0]->null_pos wrt to record 0 = 0
table->field[0]->null_bit_pos = 1
table->field[1]->field_name DB_ROW_HASH_1
table->field[1]->offset = 11
table->field[1]->field_length = 8
table->field[1]->null_pos wrt to record 0 = 0
table->field[1]->null_bit_pos = 2
SET debug_dbug="";
drop table t1;
SET debug_dbug="d,print_long_unique_internal_state";
@ -182,37 +180,31 @@ table->field[0]->offset = 1
table->field[0]->field_length = 10
table->field[0]->null_pos wrt to record 0 = 0
table->field[0]->null_bit_pos = 1
table->field[1]->field_name b
table->field[1]->offset = 11
table->field[1]->field_length = 10
table->field[1]->null_pos wrt to record 0 = 0
table->field[1]->null_bit_pos = 2
table->field[2]->field_name c
table->field[2]->offset = 21
table->field[2]->field_length = 10
table->field[2]->null_pos wrt to record 0 = 0
table->field[2]->null_bit_pos = 4
table->field[3]->field_name DB_ROW_HASH_1
table->field[3]->offset = 31
table->field[3]->field_length = 8
table->field[3]->null_pos wrt to record 0 = 0
table->field[3]->null_bit_pos = 8
table->field[4]->field_name DB_ROW_HASH_2
table->field[4]->offset = 39
table->field[4]->field_length = 8
table->field[4]->null_pos wrt to record 0 = 0
table->field[4]->null_bit_pos = 16
table->field[5]->field_name DB_ROW_HASH_3
table->field[5]->offset = 47
table->field[5]->field_length = 8
table->field[5]->null_pos wrt to record 0 = 0
table->field[5]->null_bit_pos = 32
SET debug_dbug="";
drop table t1;
SET debug_dbug="d,print_long_unique_internal_state";
@ -290,37 +282,31 @@ table->field[0]->offset = 1
table->field[0]->field_length = 10
table->field[0]->null_pos wrt to record 0 = 0
table->field[0]->null_bit_pos = 1
table->field[1]->field_name b
table->field[1]->offset = 11
table->field[1]->field_length = 10
table->field[1]->null_pos wrt to record 0 = 0
table->field[1]->null_bit_pos = 2
table->field[2]->field_name c
table->field[2]->offset = 21
table->field[2]->field_length = 10
table->field[2]->null_pos wrt to record 0 = 0
table->field[2]->null_bit_pos = 4
table->field[3]->field_name d
table->field[3]->offset = 31
table->field[3]->field_length = 10
table->field[3]->null_pos wrt to record 0 = 0
table->field[3]->null_bit_pos = 8
table->field[4]->field_name DB_ROW_HASH_1
table->field[4]->offset = 41
table->field[4]->field_length = 8
table->field[4]->null_pos wrt to record 0 = 0
table->field[4]->null_bit_pos = 16
table->field[5]->field_name DB_ROW_HASH_2
table->field[5]->offset = 49
table->field[5]->field_length = 8
table->field[5]->null_pos wrt to record 0 = 0
table->field[5]->null_bit_pos = 32
SET debug_dbug="";
drop table t1;
SET debug_dbug="d,print_long_unique_internal_state";
@ -406,31 +392,26 @@ table->field[0]->offset = 1
table->field[0]->field_length = 4
table->field[0]->null_pos wrt to record 0 = -1
table->field[0]->null_bit_pos = 0
table->field[1]->field_name b
table->field[1]->offset = 5
table->field[1]->field_length = 10
table->field[1]->null_pos wrt to record 0 = 0
table->field[1]->null_bit_pos = 1
table->field[2]->field_name c
table->field[2]->offset = 15
table->field[2]->field_length = 10
table->field[2]->null_pos wrt to record 0 = -1
table->field[2]->null_bit_pos = 0
table->field[3]->field_name DB_ROW_HASH_1
table->field[3]->offset = 25
table->field[3]->field_length = 8
table->field[3]->null_pos wrt to record 0 = 0
table->field[3]->null_bit_pos = 2
table->field[4]->field_name DB_ROW_HASH_2
table->field[4]->offset = 33
table->field[4]->field_length = 8
table->field[4]->null_pos wrt to record 0 = -1
table->field[4]->null_bit_pos = 0
SET debug_dbug="";
drop table t1;
##Using hash
@ -487,25 +468,21 @@ table->field[0]->offset = 1
table->field[0]->field_length = 4
table->field[0]->null_pos wrt to record 0 = 0
table->field[0]->null_bit_pos = 2
table->field[1]->field_name b
table->field[1]->offset = 5
table->field[1]->field_length = 4
table->field[1]->null_pos wrt to record 0 = 0
table->field[1]->null_bit_pos = 4
table->field[2]->field_name c
table->field[2]->offset = 9
table->field[2]->field_length = 4
table->field[2]->null_pos wrt to record 0 = 0
table->field[2]->null_bit_pos = 8
table->field[3]->field_name DB_ROW_HASH_1
table->field[3]->offset = 13
table->field[3]->field_length = 8
table->field[3]->null_pos wrt to record 0 = 0
table->field[3]->null_bit_pos = 16
SET debug_dbug="";
drop table t1;
##Using hash but with memory engine so no long unique column
@ -562,18 +539,15 @@ table->field[0]->offset = 1
table->field[0]->field_length = 4
table->field[0]->null_pos wrt to record 0 = 0
table->field[0]->null_bit_pos = 2
table->field[1]->field_name b
table->field[1]->offset = 5
table->field[1]->field_length = 4
table->field[1]->null_pos wrt to record 0 = 0
table->field[1]->null_bit_pos = 4
table->field[2]->field_name c
table->field[2]->offset = 9
table->field[2]->field_length = 4
table->field[2]->null_pos wrt to record 0 = 0
table->field[2]->null_bit_pos = 8
SET debug_dbug="";
drop table t1;

1
mysql-test/suite/binlog/r/binlog_max_extension.result
View file

@ -4,4 +4,3 @@ call mtr.add_suppression("Can't generate a unique log-filename");
RESET MASTER;
FLUSH LOGS;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)

1
mysql-test/suite/binlog/r/binlog_no_uniqfile_crash.result
View file

@ -16,7 +16,6 @@ master-bin.2147483647 # Gtid # # GTID #-#-#
master-bin.2147483647 # Query # # CREATE DATABASE db1
RESET MASTER TO 2147483648;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
FOUND 1 /Turning logging off for the whole duration of the MariaDB server process/ in mysqld.1.err
"Following CREATE DATABSE db2 command will not be present in binary log"
"as binary log got closed due to ER_NO_UNIQUE_LOGFILE error."

1
mysql-test/suite/binlog/r/binlog_show_binlog_event_random_pos.result
View file

@ -11,5 +11,4 @@ UPDATE t1 SET c1=repeat('b',255);
INSERT INTO t1 VALUES (repeat('a', 255), repeat('a', 255),repeat('a', 255),repeat('a', 255),repeat('a', 255));
SHOW BINLOG EVENTS FROM POS;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Invalid pos specified. Requested from pos:POS is greater than actual file size:MAX_POS
DROP TABLE t1;

9
mysql-test/suite/binlog_encryption/rpl_binlog_errors.result
View file

@ -26,7 +26,6 @@ RESET MASTER;
SET @@global.debug_dbug="d,error_unique_log_filename";
FLUSH LOGS;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
# assert: must show one binlog
show binary logs;
Log_name File_size
@ -52,7 +51,6 @@ RESET MASTER;
SET @@global.debug_dbug="d,error_unique_log_filename";
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t2;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
# assert: must show one entry
SELECT count(*) FROM t2;
count(*)
@ -78,7 +76,6 @@ LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t2;
INSERT INTO t2 VALUES ('muse');
COMMIT;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
# assert: must show three entries
SELECT count(*) FROM t2;
count(*)
@ -95,7 +92,6 @@ count(*)
0
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t4;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
# assert: must show 1 entry
SELECT count(*) FROM t4;
count(*)
@ -118,13 +114,10 @@ count(*)
0
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t4;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t2;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
INSERT INTO t2 VALUES ('aaa'), ('bbb'), ('ccc');
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
# INFO: Count(*) Before Offending DELETEs
# assert: must show 1 entry
SELECT count(*) FROM t4;
@ -136,10 +129,8 @@ count(*)
4
DELETE FROM t4;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
DELETE FROM t2;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
# INFO: Count(*) After Offending DELETEs
# assert: must show zero entries
SELECT count(*) FROM t4;

1
mysql-test/suite/binlog_encryption/rpl_checksum.result
View file

@ -171,7 +171,6 @@ SET @old_dbug= @@GLOBAL.debug_dbug;
SET debug_dbug= '+d,binlog_inject_new_name_error';
FLUSH LOGS;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
SET debug_dbug= @old_dbug;
INSERT INTO t4 VALUES (2);
connection slave;

9
mysql-test/suite/rpl/r/rpl_binlog_errors.result
View file

@ -26,7 +26,6 @@ RESET MASTER;
SET @@global.debug_dbug="d,error_unique_log_filename";
FLUSH LOGS;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
# assert: must show one binlog
show binary logs;
Log_name File_size
@ -52,7 +51,6 @@ RESET MASTER;
SET @@global.debug_dbug="d,error_unique_log_filename";
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t2;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
# assert: must show one entry
SELECT count(*) FROM t2;
count(*)
@ -78,7 +76,6 @@ LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t2;
INSERT INTO t2 VALUES ('muse');
COMMIT;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
# assert: must show three entries
SELECT count(*) FROM t2;
count(*)
@ -95,7 +92,6 @@ count(*)
0
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t4;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
# assert: must show 1 entry
SELECT count(*) FROM t4;
count(*)
@ -118,13 +114,10 @@ count(*)
0
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t4;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t2;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
INSERT INTO t2 VALUES ('aaa'), ('bbb'), ('ccc');
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
# INFO: Count(*) Before Offending DELETEs
# assert: must show 1 entry
SELECT count(*) FROM t4;
@ -136,10 +129,8 @@ count(*)
4
DELETE FROM t4;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
DELETE FROM t2;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
# INFO: Count(*) After Offending DELETEs
# assert: must show zero entries
SELECT count(*) FROM t4;

1
mysql-test/suite/rpl/r/rpl_checksum.result
View file

@ -171,7 +171,6 @@ SET @old_dbug= @@GLOBAL.debug_dbug;
SET debug_dbug= '+d,binlog_inject_new_name_error';
FLUSH LOGS;
ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
SET debug_dbug= @old_dbug;
INSERT INTO t4 VALUES (2);
connection slave;

200
sql/share/errmsg-utf8.txt
View file

@ -1903,83 +1903,83 @@ ER_NORMAL_SHUTDOWN
swe "%s (%s): Normal avslutning"
ukr "%s (%s): Нормальне завершення"
ER_GOT_SIGNAL
chi "%s: 收到信号 %d. 强行中止!\n"
cze "%s: přijat signal %d, končím\n"
dan "%s: Fangede signal %d. Afslutter!!\n"
eng "%s: Got signal %d. Aborting!\n"
est "%s: sain signaali %d. Lõpetan!\n"
fre "%s: Reçu le signal %d. Abandonne!\n"
ger "%s: Signal %d erhalten. Abbruch!\n"
greek "%s: Ελήφθη το μήνυμα %d. Η διαδικασία εγκαταλείπεται!\n"
hindi "%s: सिग्नल %d मिलने के कारण सिस्टम बंद किया जा रहा है!\n"
hun "%s: %d jelzes. Megszakitva!\n"
ita "%s: Ricevuto segnale %d. Interruzione!\n"
jpn "%s: シグナル %d を受信しました。強制終了します！\n"
kor "%s: %d 신호가 들어왔음. 중지!\n"
nla "%s: Signaal %d. Systeem breekt af!\n"
nor "%s: Oppdaget signal %d. Avslutter!\n"
norwegian-ny "%s: Oppdaga signal %d. Avsluttar!\n"
pol "%s: Otrzymano sygnał %d. Kończenie działania!\n"
por "%s: Obteve sinal %d. Abortando!\n"
rum "%s: Semnal %d obtinut. Aborting!\n"
rus "%s: Получен сигнал %d. Прекращаем!\n"
serbian "%s: Dobio signal %d. Prekidam!\n"
slo "%s: prijatý signál %d, ukončenie (Abort)!\n"
spa "%s: Recibiendo signal %d. Abortando!\n"
swe "%s: Fick signal %d. Avslutar!\n"
ukr "%s: Отримано сигнал %d. Перериваюсь!\n"
chi "%s: 收到信号 %d. 强行中止!"
cze "%s: přijat signal %d, končím"
dan "%s: Fangede signal %d. Afslutter!!"
eng "%s: Got signal %d. Aborting!"
est "%s: sain signaali %d. Lõpetan!"
fre "%s: Reçu le signal %d. Abandonne!"
ger "%s: Signal %d erhalten. Abbruch!"
greek "%s: Ελήφθη το μήνυμα %d. Η διαδικασία εγκαταλείπεται!"
hindi "%s: सिग्नल %d मिलने के कारण सिस्टम बंद किया जा रहा है!"
hun "%s: %d jelzes. Megszakitva!"
ita "%s: Ricevuto segnale %d. Interruzione!"
jpn "%s: シグナル %d を受信しました。強制終了します！"
kor "%s: %d 신호가 들어왔음. 중지!"
nla "%s: Signaal %d. Systeem breekt af!"
nor "%s: Oppdaget signal %d. Avslutter!"
norwegian-ny "%s: Oppdaga signal %d. Avsluttar!"
pol "%s: Otrzymano sygnał %d. Kończenie działania!"
por "%s: Obteve sinal %d. Abortando!"
rum "%s: Semnal %d obtinut. Aborting!"
rus "%s: Получен сигнал %d. Прекращаем!"
serbian "%s: Dobio signal %d. Prekidam!"
slo "%s: prijatý signál %d, ukončenie (Abort)!"
spa "%s: Recibiendo signal %d. Abortando!"
swe "%s: Fick signal %d. Avslutar!"
ukr "%s: Отримано сигнал %d. Перериваюсь!"
ER_SHUTDOWN_COMPLETE
chi "%s：关闭完成\n"
cze "%s: ukončení práce hotovo\n"
dan "%s: Server lukket\n"
eng "%s: Shutdown complete\n"
est "%s: Lõpp\n"
fre "%s: Arrêt du serveur terminé\n"
ger "%s: Herunterfahren beendet\n"
greek "%s: Η διαδικασία Shutdown ολοκληρώθηκε\n"
hindi "%s: शटडाउन पूर्ण\n"
hun "%s: A leallitas kesz\n"
ita "%s: Shutdown completato\n"
jpn "%s: シャットダウン完了\n"
kor "%s: Shutdown 이 완료됨!\n"
nla "%s: Afsluiten afgerond\n"
nor "%s: Avslutning komplett\n"
norwegian-ny "%s: Nedkopling komplett\n"
pol "%s: Zakończenie działania wykonane\n"
por "%s: 'Shutdown' completo\n"
rum "%s: Terminare completa\n"
rus "%s: Остановка завершена\n"
serbian "%s: Gašenje završeno\n"
slo "%s: práca ukončená\n"
spa "%s: Apagado completado\n"
swe "%s: Avslutning klar\n"
ukr "%s: Роботу завершено\n"
chi "%s：关闭完成"
cze "%s: ukončení práce hotovo"
dan "%s: Server lukket"
eng "%s: Shutdown complete"
est "%s: Lõpp"
fre "%s: Arrêt du serveur terminé"
ger "%s: Herunterfahren beendet"
greek "%s: Η διαδικασία Shutdown ολοκληρώθηκε"
hindi "%s: शटडाउन पूर्ण"
hun "%s: A leallitas kesz"
ita "%s: Shutdown completato"
jpn "%s: シャットダウン完了"
kor "%s: Shutdown 이 완료됨!"
nla "%s: Afsluiten afgerond"
nor "%s: Avslutning komplett"
norwegian-ny "%s: Nedkopling komplett"
pol "%s: Zakończenie działania wykonane"
por "%s: 'Shutdown' completo"
rum "%s: Terminare completa"
rus "%s: Остановка завершена"
serbian "%s: Gašenje završeno"
slo "%s: práca ukončená"
spa "%s: Apagado completado"
swe "%s: Avslutning klar"
ukr "%s: Роботу завершено"
ER_FORCING_CLOSE 08S01
chi "%s: 强行关闭线程 %ld 用户: '%-.48s'\n"
cze "%s: násilné uzavření threadu %ld uživatele '%-.48s'\n"
dan "%s: Forceret nedlukning af tråd: %ld bruger: '%-.48s'\n"
eng "%s: Forcing close of thread %ld user: '%-.48s'\n"
est "%s: Sulgen jõuga lõime %ld kasutaja: '%-.48s'\n"
fre "%s: Arrêt forcé de la tâche (thread) %ld utilisateur: '%-.48s'\n"
ger "%s: Thread %ld zwangsweise beendet. Benutzer: '%-.48s'\n"
greek "%s: Το thread θα κλείσει %ld user: '%-.48s'\n"
hindi "%s: %ld थ्रेड बंद किया जा रहा है (यूज़र: '%-.48s')\n"
hun "%s: A(z) %ld thread kenyszeritett zarasa. Felhasznalo: '%-.48s'\n"
ita "%s: Forzata la chiusura del thread %ld utente: '%-.48s'\n"
jpn "%s: スレッド %ld を強制終了します (ユーザー: '%-.48s')\n"
kor "%s: thread %ld의 강제 종료 user: '%-.48s'\n"
nla "%s: Afsluiten afgedwongen van thread %ld gebruiker: '%-.48s'\n"
nor "%s: Påtvinget avslutning av tråd %ld bruker: '%-.48s'\n"
norwegian-ny "%s: Påtvinga avslutning av tråd %ld brukar: '%-.48s'\n"
pol "%s: Wymuszenie zamknięcia w?tku %ld użytkownik: '%-.48s'\n"
por "%s: Forçando finalização da 'thread' %ld - usuário '%-.48s'\n"
rum "%s: Terminare fortata a thread-ului %ld utilizatorului: '%-.48s'\n"
rus "%s: Принудительно закрываем поток %ld пользователя: '%-.48s'\n"
serbian "%s: Usiljeno gašenje thread-a %ld koji pripada korisniku: '%-.48s'\n"
slo "%s: násilné ukončenie vlákna %ld užívateľa '%-.48s'\n"
spa "%s: Forzando a cerrar el thread %ld usuario: '%-.48s'\n"
swe "%s: Stänger av tråd %ld; användare: '%-.48s'\n"
ukr "%s: Прискорюю закриття гілки %ld користувача: '%-.48s'\n"
chi "%s: 强行关闭线程 %ld 用户: '%-.48s'"
cze "%s: násilné uzavření threadu %ld uživatele '%-.48s'"
dan "%s: Forceret nedlukning af tråd: %ld bruger: '%-.48s'"
eng "%s: Forcing close of thread %ld user: '%-.48s'"
est "%s: Sulgen jõuga lõime %ld kasutaja: '%-.48s'"
fre "%s: Arrêt forcé de la tâche (thread) %ld utilisateur: '%-.48s'"
ger "%s: Thread %ld zwangsweise beendet. Benutzer: '%-.48s'"
greek "%s: Το thread θα κλείσει %ld user: '%-.48s'"
hindi "%s: %ld थ्रेड बंद किया जा रहा है (यूज़र: '%-.48s')"
hun "%s: A(z) %ld thread kenyszeritett zarasa. Felhasznalo: '%-.48s'"
ita "%s: Forzata la chiusura del thread %ld utente: '%-.48s'"
jpn "%s: スレッド %ld を強制終了します (ユーザー: '%-.48s')"
kor "%s: thread %ld의 강제 종료 user: '%-.48s'"
nla "%s: Afsluiten afgedwongen van thread %ld gebruiker: '%-.48s'"
nor "%s: Påtvinget avslutning av tråd %ld bruker: '%-.48s'"
norwegian-ny "%s: Påtvinga avslutning av tråd %ld brukar: '%-.48s'"
pol "%s: Wymuszenie zamknięcia w?tku %ld użytkownik: '%-.48s'"
por "%s: Forçando finalização da 'thread' %ld - usuário '%-.48s'"
rum "%s: Terminare fortata a thread-ului %ld utilizatorului: '%-.48s'"
rus "%s: Принудительно закрываем поток %ld пользователя: '%-.48s'"
serbian "%s: Usiljeno gašenje thread-a %ld koji pripada korisniku: '%-.48s'"
slo "%s: násilné ukončenie vlákna %ld užívateľa '%-.48s'"
spa "%s: Forzando a cerrar el thread %ld usuario: '%-.48s'"
swe "%s: Stänger av tråd %ld; användare: '%-.48s'"
ukr "%s: Прискорюю закриття гілки %ld користувача: '%-.48s'"
ER_IPSOCK_ERROR 08S01
chi "无法创建IP插口"
cze "Nemohu vytvořit IP socket"
@ -2398,31 +2398,31 @@ ER_TOO_BIG_SET
swe "För många alternativ till kolumn %-.192s för SET"
ukr "Забагато строк для стовбця %-.192s та SET"
ER_NO_UNIQUE_LOGFILE
chi "无法生成唯一的log-filename%-.200s.(1-999)\ n"
cze "Nemohu vytvořit jednoznačné jméno logovacího souboru %-.200s.(1-999)\n"
dan "Kan ikke lave unikt log-filnavn %-.200s.(1-999)\n"
eng "Can't generate a unique log-filename %-.200s.(1-999)\n"
est "Ei suuda luua unikaalset logifaili nime %-.200s.(1-999)\n"
fre "Ne peut générer un unique nom de journal %-.200s.(1-999)\n"
ger "Kann keinen eindeutigen Dateinamen für die Logdatei %-.200s(1-999) erzeugen\n"
greek "Αδύνατη η δημιουργία unique log-filename %-.200s.(1-999)\n"
hindi "एक अनूठा लॉग-फ़ाइल नाम %-.200s.(1-999) उत्पन्न नहीं कर सके\n"
hun "Egyedi log-filenev nem generalhato: %-.200s.(1-999)\n"
ita "Impossibile generare un nome del file log unico %-.200s.(1-999)\n"
jpn "一意なログファイル名 %-.200s.(1-999) を生成できません。\n"
kor "Unique 로그화일 '%-.200s'를 만들수 없습니다.(1-999)\n"
nla "Het is niet mogelijk een unieke naam te maken voor de logfile %-.200s.(1-999)\n"
nor "Kan ikke lage unikt loggfilnavn %-.200s.(1-999)\n"
norwegian-ny "Kan ikkje lage unikt loggfilnavn %-.200s.(1-999)\n"
pol "Nie można stworzyć unikalnej nazwy pliku z logiem %-.200s.(1-999)\n"
por "Não pode gerar um nome de arquivo de 'log' único '%-.200s'.(1-999)\n"
rum "Nu pot sa generez un nume de log unic %-.200s.(1-999)\n"
rus "Невозможно создать уникальное имя файла журнала %-.200s.(1-999)\n"
serbian "Ne mogu da generišem jedinstveno ime log-file-a: '%-.200s.(1-999)'\n"
slo "Nemôžem vytvoriť unikátne meno log-súboru %-.200s.(1-999)\n"
spa "No puede crear un unico archivo log %-.200s.(1-999)\n"
swe "Kan inte generera ett unikt filnamn %-.200s.(1-999)\n"
ukr "Не можу згенерувати унікальне ім'я log-файлу %-.200s.(1-999)\n"
chi "无法生成唯一的log-filename%-.200s.(1-999)"
cze "Nemohu vytvořit jednoznačné jméno logovacího souboru %-.200s.(1-999)"
dan "Kan ikke lave unikt log-filnavn %-.200s.(1-999)"
eng "Can't generate a unique log-filename %-.200s.(1-999)"
est "Ei suuda luua unikaalset logifaili nime %-.200s.(1-999)"
fre "Ne peut générer un unique nom de journal %-.200s.(1-999)"
ger "Kann keinen eindeutigen Dateinamen für die Logdatei %-.200s(1-999) erzeugen"
greek "Αδύνατη η δημιουργία unique log-filename %-.200s.(1-999)"
hindi "एक अनूठा लॉग-फ़ाइल नाम %-.200s.(1-999) उत्पन्न नहीं कर सके"
hun "Egyedi log-filenev nem generalhato: %-.200s.(1-999)"
ita "Impossibile generare un nome del file log unico %-.200s.(1-999)"
jpn "一意なログファイル名 %-.200s.(1-999) を生成できません。"
kor "Unique 로그화일 '%-.200s'를 만들수 없습니다.(1-999)"
nla "Het is niet mogelijk een unieke naam te maken voor de logfile %-.200s.(1-999)"
nor "Kan ikke lage unikt loggfilnavn %-.200s.(1-999)"
norwegian-ny "Kan ikkje lage unikt loggfilnavn %-.200s.(1-999)"
pol "Nie można stworzyć unikalnej nazwy pliku z logiem %-.200s.(1-999)"
por "Não pode gerar um nome de arquivo de 'log' único '%-.200s'.(1-999)"
rum "Nu pot sa generez un nume de log unic %-.200s.(1-999)"
rus "Невозможно создать уникальное имя файла журнала %-.200s.(1-999)"
serbian "Ne mogu da generišem jedinstveno ime log-file-a: '%-.200s.(1-999)'"
slo "Nemôžem vytvoriť unikátne meno log-súboru %-.200s.(1-999)"
spa "No puede crear un unico archivo log %-.200s.(1-999)"
swe "Kan inte generera ett unikt filnamn %-.200s.(1-999)"
ukr "Не можу згенерувати унікальне ім'я log-файлу %-.200s.(1-999)"
ER_TABLE_NOT_LOCKED_FOR_WRITE
chi "表 '%-.192s' 有 READ 锁，无法更新"
cze "Tabulka '%-.192s' byla zamčena s READ a nemůže být změněna"

1
sql/sql_error.cc
View file

@ -692,6 +692,7 @@ Sql_condition *Warning_info::push_warning(THD *thd,
const char *msg)
{
Sql_condition *cond= NULL;
DBUG_ASSERT(msg[strlen(msg)-1] != '\n');
if (! m_read_only)
{

2
sql/sql_repl.cc
View file

@ -4114,7 +4114,7 @@ bool mysql_show_binlog_events(THD* thd)
if (lex_mi->pos > binlog_size)
{
snprintf(errmsg_buf, sizeof(errmsg_buf), "Invalid pos specified. Requested from pos:%llu is "
"greater than actual file size:%lu\n", lex_mi->pos,
"greater than actual file size:%lu", lex_mi->pos,
(ulong)s.st_size);
errmsg= errmsg_buf;
goto err;

2
sql/table.cc
View file

@ -3891,7 +3891,7 @@ static void print_long_unique_table(TABLE *table)
"table->field[%u]->offset = %" PRIdPTR "\n" // `%td` not available
"table->field[%u]->field_length = %d\n"
"table->field[%u]->null_pos wrt to record 0 = %" PRIdPTR "\n"
"table->field[%u]->null_bit_pos = %d\n",
"table->field[%u]->null_bit_pos = %d",
i, field->field_name.str,
i, field->ptr- table->record[0],
i, field->pack_length(),

6
storage/connect/domdoc.cpp
View file

@ -243,8 +243,10 @@ int DOMDOC::DumpDoc(PGLOBAL g, char *ofn)
try {
Docp->save(ofn);
} catch(_com_error e) {
snprintf(g->Message, sizeof(g->Message), "%s: %s", MSG(COM_ERROR),
_com_util::ConvertBSTRToString(e.Description()));
int i = snprintf(g->Message, sizeof(g->Message), "%s: %s", MSG(COM_ERROR),
_com_util::ConvertBSTRToString(e.Description()));
for (i--; i >= 0 && g->Message[i] == '\n'; i--)
g->Message[i] = 0;
rc = -1;
} catch(...) {}

25
storage/innobase/handler/ha_innodb.cc
View file

@ -12684,7 +12684,7 @@ int create_table_info_t::create_table(bool create_fk)
" on table %s. Please check"
" the index definition to"
" make sure it is of correct"
" type\n",
" type",
FTS_DOC_ID_INDEX_NAME,
m_table->name.m_name);
@ -12753,7 +12753,7 @@ int create_table_info_t::create_table(bool create_fk)
"Create table '%s' with foreign key constraint"
" failed. There is no index in the referenced"
" table where the referenced columns appear"
" as the first columns.\n", m_table_name);
" as the first columns.", m_table_name);
break;
case DB_CHILD_NO_INDEX:
@ -12763,7 +12763,7 @@ int create_table_info_t::create_table(bool create_fk)
"Create table '%s' with foreign key constraint"
" failed. There is no index in the referencing"
" table where referencing columns appear"
" as the first columns.\n", m_table_name);
" as the first columns.", m_table_name);
break;
case DB_NO_FK_ON_S_BASE_COL:
push_warning_printf(
@ -12772,7 +12772,7 @@ int create_table_info_t::create_table(bool create_fk)
"Create table '%s' with foreign key constraint"
" failed. Cannot add foreign key constraint"
" placed on the base column of stored"
" column. \n",
" column. ",
m_table_name);
default:
break;
@ -14868,7 +14868,7 @@ ha_innobase::optimize(
} else {
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
uint(err),
"InnoDB: Cannot defragment table %s: returned error code %d\n",
"InnoDB: Cannot defragment table %s: returned error code %d",
m_prebuilt->table->name.m_name, err);
if(err == ER_SP_ALREADY_EXISTS) {
@ -21376,8 +21376,7 @@ innodb_compression_algorithm_validate(
if (compression_algorithm == PAGE_LZ4_ALGORITHM) {
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
HA_ERR_UNSUPPORTED,
"InnoDB: innodb_compression_algorithm = %lu unsupported.\n"
"InnoDB: liblz4 is not installed. \n",
"InnoDB: innodb_compression_algorithm = %lu unsupported. liblz4 is not installed.",
compression_algorithm);
DBUG_RETURN(1);
}
@ -21387,8 +21386,7 @@ innodb_compression_algorithm_validate(
if (compression_algorithm == PAGE_LZO_ALGORITHM) {
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
HA_ERR_UNSUPPORTED,
"InnoDB: innodb_compression_algorithm = %lu unsupported.\n"
"InnoDB: liblzo is not installed. \n",
"InnoDB: innodb_compression_algorithm = %lu unsupported. liblzo is not installed.",
compression_algorithm);
DBUG_RETURN(1);
}
@ -21398,8 +21396,7 @@ innodb_compression_algorithm_validate(
if (compression_algorithm == PAGE_LZMA_ALGORITHM) {
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
HA_ERR_UNSUPPORTED,
"InnoDB: innodb_compression_algorithm = %lu unsupported.\n"
"InnoDB: liblzma is not installed. \n",
"InnoDB: innodb_compression_algorithm = %lu unsupported. liblzma is not installed.",
compression_algorithm);
DBUG_RETURN(1);
}
@ -21409,8 +21406,7 @@ innodb_compression_algorithm_validate(
if (compression_algorithm == PAGE_BZIP2_ALGORITHM) {
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
HA_ERR_UNSUPPORTED,
"InnoDB: innodb_compression_algorithm = %lu unsupported.\n"
"InnoDB: libbz2 is not installed. \n",
"InnoDB: innodb_compression_algorithm = %lu unsupported. libbz2 is not installed.",
compression_algorithm);
DBUG_RETURN(1);
}
@ -21420,8 +21416,7 @@ innodb_compression_algorithm_validate(
if (compression_algorithm == PAGE_SNAPPY_ALGORITHM) {
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
HA_ERR_UNSUPPORTED,
"InnoDB: innodb_compression_algorithm = %lu unsupported.\n"
"InnoDB: libsnappy is not installed. \n",
"InnoDB: innodb_compression_algorithm = %lu unsupported. libsnappy is not installed.",
compression_algorithm);
DBUG_RETURN(1);
}

4
storage/maria/ma_check.c
View file

@ -5429,7 +5429,7 @@ static int sort_get_next_record(MARIA_SORT_PARAM *sort_param)
if (! searching)
_ma_check_print_info(param,
"Found block with wrong recordlength: %lu "
"at %s\n",
"at %s",
block_info.rec_len,
llstr(sort_param->pos,llbuff));
continue;
@ -6429,7 +6429,7 @@ void _ma_update_auto_increment_key(HA_CHECK *param, MARIA_HA *info,
{
if (!(param->testflag & T_VERY_SILENT))
_ma_check_print_info(param,
"Table: %s doesn't have an auto increment key\n",
"Table: %s doesn't have an auto increment key",
param->isam_file_name);
DBUG_VOID_RETURN;
}

8
storage/myisam/mi_check.c
View file

@ -1272,7 +1272,7 @@ int chk_data_link(HA_CHECK *param, MI_INFO *info, my_bool extend)
(HA_OPTION_CHECKSUM | HA_OPTION_COMPRESS_RECORD)))
{
mi_check_print_warning(param,
"Record checksum is not the same as checksum stored in the index file\n");
"Record checksum is not the same as checksum stored in the index file");
error=1;
}
else if (!extend)
@ -3625,7 +3625,7 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
block_info.rec_len > (uint) share->max_pack_length)
{
if (! searching)
mi_check_print_info(param,"Found block with wrong recordlength: %ld at %s\n",
mi_check_print_info(param,"Found block with wrong recordlength: %ld at %s",
block_info.rec_len,
llstr(sort_param->pos,llbuff));
continue;
@ -4135,7 +4135,7 @@ static int sort_delete_record(MI_SORT_PARAM *sort_param)
if (info->s->options & HA_OPTION_COMPRESS_RECORD)
{
mi_check_print_error(param,
"Recover aborted; Can't run standard recovery on compressed tables with errors in data-file. Use switch 'myisamchk --safe-recover' to fix it\n");
"Recover aborted; Can't run standard recovery on compressed tables with errors in data-file. Use switch 'myisamchk --safe-recover' to fix it");
DBUG_RETURN(1);
}
@ -4537,7 +4537,7 @@ void update_auto_increment_key(HA_CHECK *param, MI_INFO *info,
{
if (!(param->testflag & T_VERY_SILENT))
mi_check_print_info(param,
"Table: %s doesn't have an auto increment key\n",
"Table: %s doesn't have an auto increment key",
param->isam_file_name);
DBUG_VOID_RETURN;
}