database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

srv0srv.c:

Browse Source 
Protect the reading of the latest foreign key error explantion buffer with a mutex; in theory, a race condition could cause SHOW INNODB STATUS print garbage characters after the error info; remove the sprintf of the latest UNIQUE KEY error, since the buffer really was always empty
This commit is contained in:
heikki@hundin.mysql.fi
2004-03-04 15:32:16 +02:00
parent 6fbf1efdc2
commit 995b74ee0d
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
innobase/srv/srv0srv.c
View File

@@ -1434,6 +1434,13 @@ srv_sprintf_innodb_monitor(
buf = buf + strlen(buf); buf = buf + strlen(buf);
ut_a(buf < buf_end + 1500); ut_a(buf < buf_end + 1500);
/* Conceptually, srv_innodb_monitor_mutex has a very high latching
order level in sync0sync.h, while dict_foreign_err_mutex has a very
low level 135. Therefore we can reserve the latter mutex here without
a danger of a deadlock of threads. */
mutex_enter(&dict_foreign_err_mutex);
if (*dict_foreign_err_buf != '\0') { if (*dict_foreign_err_buf != '\0') {
buf += sprintf(buf, buf += sprintf(buf,
"------------------------\n" "------------------------\n"
@@ -1445,18 +1452,7 @@ srv_sprintf_innodb_monitor(
} }
} }
ut_a(buf < buf_end + 1500); mutex_exit(&dict_foreign_err_mutex);
if (*dict_unique_err_buf != '\0') {
buf += sprintf(buf,
"---------------------------------------------------------------\n"
"LATEST UNIQUE KEY ERROR (is masked in REPLACE or INSERT IGNORE)\n"
"---------------------------------------------------------------\n");
if (buf_end - buf > 6000) {
buf+= sprintf(buf, "%.4000s", dict_unique_err_buf);
}
}
ut_a(buf < buf_end + 1500); ut_a(buf < buf_end + 1500);