Skip to content

Commit ee59091

Browse files
committed
Yet more fixes covering thread_id type change
1 parent 03839e7 commit ee59091

File tree

3 files changed

+16
-29
lines changed

3 files changed

+16
-29
lines changed

mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -991,19 +991,6 @@
991991
VARIABLE_COMMENT Seconds between sending progress reports to the client for time-consuming statements. Set to 0 to disable progress reporting.
992992
NUMERIC_MIN_VALUE 0
993993
NUMERIC_MAX_VALUE 4294967295
994-
@@ -3249,10 +3249,10 @@
995-
GLOBAL_VALUE_ORIGIN COMPILE-TIME
996-
DEFAULT_VALUE 0
997-
VARIABLE_SCOPE SESSION ONLY
998-
-VARIABLE_TYPE BIGINT UNSIGNED
999-
+VARIABLE_TYPE INT UNSIGNED
1000-
VARIABLE_COMMENT This variable is for internal server use
1001-
NUMERIC_MIN_VALUE 0
1002-
-NUMERIC_MAX_VALUE 18446744073709551615
1003-
+NUMERIC_MAX_VALUE 4294967295
1004-
NUMERIC_BLOCK_SIZE 1
1005-
ENUM_VALUE_LIST NULL
1006-
READ_ONLY NO
1007994
@@ -3263,7 +3263,7 @@
1008995
GLOBAL_VALUE_ORIGIN COMPILE-TIME
1009996
DEFAULT_VALUE 16384

sql/share/errmsg-utf8.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3947,21 +3947,21 @@ ER_ERROR_DURING_CHECKPOINT
39473947
swe "Fick fel %M vid CHECKPOINT"
39483948
ukr "Отримано помилку %M під час CHECKPOINT"
39493949
ER_NEW_ABORTING_CONNECTION 08S01
3950-
cze "Spojení %ld do databáze: '%-.192s' uživatel: '%-.48s' stroj: '%-.64s' (%-.64s) bylo přerušeno"
3951-
dan "Afbrød forbindelsen %ld til databasen '%-.192s' bruger: '%-.48s' vært: '%-.64s' (%-.64s)"
3952-
nla "Afgebroken verbinding %ld naar db: '%-.192s' gebruiker: '%-.48s' host: '%-.64s' (%-.64s)"
3953-
eng "Aborted connection %ld to db: '%-.192s' user: '%-.48s' host: '%-.64s' (%-.64s)"
3954-
est "Ühendus katkestatud %ld andmebaas: '%-.192s' kasutaja: '%-.48s' masin: '%-.64s' (%-.64s)"
3955-
fre "Connection %ld avortée vers la bd: '%-.192s' utilisateur: '%-.48s' hôte: '%-.64s' (%-.64s)"
3956-
ger "Abbruch der Verbindung %ld zur Datenbank '%-.192s'. Benutzer: '%-.48s', Host: '%-.64s' (%-.64s)"
3957-
ita "Interrotta la connessione %ld al db: ''%-.192s' utente: '%-.48s' host: '%-.64s' (%-.64s)"
3958-
jpn "接続 %ld が中断されました。データベース: '%-.192s' ユーザー: '%-.48s' ホスト: '%-.64s' (%-.64s)"
3959-
por "Conexão %ld abortada para banco de dados '%-.192s' - usuário '%-.48s' - 'host' '%-.64s' ('%-.64s')"
3960-
rus "Прервано соединение %ld к базе данных '%-.192s' пользователя '%-.48s' с хоста '%-.64s' (%-.64s)"
3961-
serbian "Prekinuta konekcija broj %ld ka bazi: '%-.192s' korisnik je bio: '%-.48s' a host: '%-.64s' (%-.64s)"
3962-
spa "Abortada conexión %ld para db: '%-.192s' usuario: '%-.48s' servidor: '%-.64s' (%-.64s)"
3963-
swe "Avbröt länken för tråd %ld till db '%-.192s', användare '%-.48s', host '%-.64s' (%-.64s)"
3964-
ukr "Перервано з'єднання %ld до бази данних: '%-.192s' користувач: '%-.48s' хост: '%-.64s' (%-.64s)"
3950+
cze "Spojení %lld do databáze: '%-.192s' uživatel: '%-.48s' stroj: '%-.64s' (%-.64s) bylo přerušeno"
3951+
dan "Afbrød forbindelsen %lld til databasen '%-.192s' bruger: '%-.48s' vært: '%-.64s' (%-.64s)"
3952+
nla "Afgebroken verbinding %lld naar db: '%-.192s' gebruiker: '%-.48s' host: '%-.64s' (%-.64s)"
3953+
eng "Aborted connection %lld to db: '%-.192s' user: '%-.48s' host: '%-.64s' (%-.64s)"
3954+
est "Ühendus katkestatud %lld andmebaas: '%-.192s' kasutaja: '%-.48s' masin: '%-.64s' (%-.64s)"
3955+
fre "Connection %lld avortée vers la bd: '%-.192s' utilisateur: '%-.48s' hôte: '%-.64s' (%-.64s)"
3956+
ger "Abbruch der Verbindung %lld zur Datenbank '%-.192s'. Benutzer: '%-.48s', Host: '%-.64s' (%-.64s)"
3957+
ita "Interrotta la connessione %lld al db: ''%-.192s' utente: '%-.48s' host: '%-.64s' (%-.64s)"
3958+
jpn "接続 %lld が中断されました。データベース: '%-.192s' ユーザー: '%-.48s' ホスト: '%-.64s' (%-.64s)"
3959+
por "Conexão %lld abortada para banco de dados '%-.192s' - usuário '%-.48s' - 'host' '%-.64s' ('%-.64s')"
3960+
rus "Прервано соединение %lld к базе данных '%-.192s' пользователя '%-.48s' с хоста '%-.64s' (%-.64s)"
3961+
serbian "Prekinuta konekcija broj %lld ka bazi: '%-.192s' korisnik je bio: '%-.48s' a host: '%-.64s' (%-.64s)"
3962+
spa "Abortada conexión %lld para db: '%-.192s' usuario: '%-.48s' servidor: '%-.64s' (%-.64s)"
3963+
swe "Avbröt länken för tråd %lld till db '%-.192s', användare '%-.48s', host '%-.64s' (%-.64s)"
3964+
ukr "Перервано з'єднання %lld до бази данних: '%-.192s' користувач: '%-.48s' хост: '%-.64s' (%-.64s)"
39653965
ER_UNUSED_10
39663966
eng "You should never see it"
39673967
ER_FLUSH_MASTER_BINLOG_CLOSED

storage/myisam/ha_myisam.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ void _mi_report_crashed(MI_INFO *file, const char *message,
637637
char buf[1024];
638638
mysql_mutex_lock(&file->s->intern_lock);
639639
if ((cur_thd= (THD*) file->in_use.data))
640-
sql_print_error("Got an error from thread_id=%lu, %s:%d", cur_thd->thread_id,
640+
sql_print_error("Got an error from thread_id=%lld, %s:%d", cur_thd->thread_id,
641641
sfile, sline);
642642
else
643643
sql_print_error("Got an error from unknown thread, %s:%d", sfile, sline);

0 commit comments

Comments
 (0)