1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Never pass NULL to innobase_get_stmt()

Browse Source
This commit is contained in:
Marko Mäkelä 2017-05-16 17:45:22 +03:00
parent 71cd205956
commit 408ef65f84
6 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
storage/innobase/handler/ha_innodb.cc
View File

@ -2265,16 +2265,11 @@ innobase_get_stmt(
THD* thd, /*!< in: MySQL thread handle */
size_t* length) /*!< out: length of the SQL statement */
{
const char* query = NULL;
LEX_STRING *stmt = NULL;
if (thd) {
stmt = thd_query_string(thd);
if (stmt) {
*length = stmt->length;
query = stmt->str;
}
if (const LEX_STRING *stmt = thd_query_string(thd)) {
*length = stmt->length;
return stmt->str;
}
return (query);
return NULL;
}
/**********************************************************************//**

22
storage/innobase/lock/lock0lock.cc
View File

@ -909,12 +909,18 @@ lock_reset_lock_and_trx_wait(
const char* stmt2=NULL;
size_t stmt_len;
trx_id_t trx_id = 0;
stmt = innobase_get_stmt(lock->trx->mysql_thd, &stmt_len);
stmt = lock->trx->mysql_thd
? innobase_get_stmt(lock->trx->mysql_thd, &stmt_len)
: NULL;
if (lock->trx->lock.wait_lock &&
lock->trx->lock.wait_lock->trx) {
trx_id = lock->trx->lock.wait_lock->trx->id;
stmt2 = innobase_get_stmt(lock->trx->lock.wait_lock->trx->mysql_thd, &stmt_len);
stmt2 = lock->trx->lock.wait_lock->trx->mysql_thd
? innobase_get_stmt(
lock->trx->lock.wait_lock
->trx->mysql_thd, &stmt_len)
: NULL;
}
ib_logf(IB_LOG_LEVEL_INFO,
@ -5586,13 +5592,11 @@ lock_rec_unlock(
trx_mutex_exit(trx);
stmt = innobase_get_stmt(trx->mysql_thd, &stmt_len);
ut_print_timestamp(stderr);
fprintf(stderr,
" InnoDB: Error: unlock row could not"
" find a %lu mode lock on the record\n",
(ulong) lock_mode);
ut_print_timestamp(stderr);
fprintf(stderr, " InnoDB: current statement: %.*s\n",
ib_logf(IB_LOG_LEVEL_ERROR,
"unlock row could not find a %u mode lock on the record;"
" statement=%.*s",
lock_mode,
(int) stmt_len, stmt);
return;

4
storage/innobase/trx/trx0i_s.cc
View File

@ -503,7 +503,9 @@ fill_trx_row(
row->trx_mysql_thread_id = thd_get_thread_id(trx->mysql_thd);
stmt = innobase_get_stmt(trx->mysql_thd, &stmt_len);
stmt = trx->mysql_thd
? innobase_get_stmt(trx->mysql_thd, &stmt_len)
: NULL;
if (stmt != NULL) {
char query[TRX_I_S_TRX_QUERY_MAX_LEN + 1];

13
storage/xtradb/handler/ha_innodb.cc
View File

@ -2591,16 +2591,11 @@ innobase_get_stmt(
THD* thd, /*!< in: MySQL thread handle */
size_t* length) /*!< out: length of the SQL statement */
{
const char* query = NULL;
LEX_STRING *stmt = NULL;
if (thd) {
stmt = thd_query_string(thd);
if (stmt) {
*length = stmt->length;
query = stmt->str;
}
if (const LEX_STRING *stmt = thd_query_string(thd)) {
*length = stmt->length;
return stmt->str;
}
return (query);
return NULL;
}
/**********************************************************************//**

22
storage/xtradb/lock/lock0lock.cc
View File

@ -921,12 +921,18 @@ lock_reset_lock_and_trx_wait(
const char* stmt2=NULL;
size_t stmt_len;
trx_id_t trx_id = 0;
stmt = innobase_get_stmt(lock->trx->mysql_thd, &stmt_len);
stmt = lock->trx->mysql_thd
? innobase_get_stmt(lock->trx->mysql_thd, &stmt_len)
: NULL;
if (lock->trx->lock.wait_lock &&
lock->trx->lock.wait_lock->trx) {
trx_id = lock->trx->lock.wait_lock->trx->id;
stmt2 = innobase_get_stmt(lock->trx->lock.wait_lock->trx->mysql_thd, &stmt_len);
stmt2 = lock->trx->lock.wait_lock->trx->mysql_thd
? innobase_get_stmt(
lock->trx->lock.wait_lock
->trx->mysql_thd, &stmt_len)
: NULL;
}
ib_logf(IB_LOG_LEVEL_INFO,
@ -5636,13 +5642,11 @@ lock_rec_unlock(
trx_mutex_exit(trx);
stmt = innobase_get_stmt(trx->mysql_thd, &stmt_len);
ut_print_timestamp(stderr);
fprintf(stderr,
" InnoDB: Error: unlock row could not"
" find a %lu mode lock on the record\n",
(ulong) lock_mode);
ut_print_timestamp(stderr);
fprintf(stderr, " InnoDB: current statement: %.*s\n",
ib_logf(IB_LOG_LEVEL_ERROR,
"unlock row could not find a %u mode lock on the record;"
" statement=%.*s",
lock_mode,
(int) stmt_len, stmt);
return;

4
storage/xtradb/trx/trx0i_s.cc
View File

@ -507,7 +507,9 @@ fill_trx_row(
row->trx_mysql_thread_id = thd_get_thread_id(trx->mysql_thd);
stmt = innobase_get_stmt(trx->mysql_thd, &stmt_len);
stmt = trx->mysql_thd
? innobase_get_stmt(trx->mysql_thd, &stmt_len)
: NULL;
if (stmt != NULL) {
char query[TRX_I_S_TRX_QUERY_MAX_LEN + 1];