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

Fix Bug #55397 cannot select from innodb_trx when trx_query contains blobs

Browse Source 
that aren't strings

rb://560 approved by Sunny Bains
This commit is contained in:
Jimmy Yang 2011-01-06 19:36:20 -08:00
parent 00cbd03fd8
commit 25d285ce9c
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
storage/innodb_plugin/ChangeLog
View File

@ -1,3 +1,8 @@
2011-01-06 The InnoDB Team
* handler/i_s.cc, include/trx0i_s.h, trx/trx0i_s.c:
Fix Bug#55397 cannot select from innodb_trx when trx_query contains
blobs that aren't strings
2011-01-04 The InnoDB Team 2011-01-04 The InnoDB Team
* dict/dict0dict.c: * dict/dict0dict.c:
Fix Bug#59197 double quote in field comment prevents foreign Fix Bug#59197 double quote in field comment prevents foreign

12
storage/innodb_plugin/handler/i_s.cc
View File

@ -371,8 +371,16 @@ fill_innodb_trx_from_cache(
row->trx_mysql_thread_id)); row->trx_mysql_thread_id));
/* trx_query */ /* trx_query */
OK(field_store_string(fields[IDX_TRX_QUERY], if (row->trx_query) {
row->trx_query)); /* store will do appropriate character set
conversion check */
fields[IDX_TRX_QUERY]->store(
row->trx_query, strlen(row->trx_query),
row->trx_query_cs);
fields[IDX_TRX_QUERY]->set_notnull();
} else {
fields[IDX_TRX_QUERY]->set_null();
}
OK(schema_table_store_record(thd, table)); OK(schema_table_store_record(thd, table));
} }

2
storage/innodb_plugin/include/trx0i_s.h
View File

@ -110,6 +110,8 @@ struct i_s_trx_row_struct {
/*!< thd_get_thread_id() */ /*!< thd_get_thread_id() */
const char* trx_query; /*!< MySQL statement being const char* trx_query; /*!< MySQL statement being
executed in the transaction */ executed in the transaction */
struct charset_info_st* trx_query_cs; /*!< charset encode the MySQL
statement */
}; };
/** This structure represents INFORMATION_SCHEMA.innodb_lock_waits row */ /** This structure represents INFORMATION_SCHEMA.innodb_lock_waits row */

3
storage/innodb_plugin/trx/trx0i_s.c
View File

@ -498,7 +498,6 @@ fill_trx_row(
stmt = innobase_get_stmt(trx->mysql_thd, &stmt_len); stmt = innobase_get_stmt(trx->mysql_thd, &stmt_len);
if (stmt != NULL) { if (stmt != NULL) {
char query[TRX_I_S_TRX_QUERY_MAX_LEN + 1]; char query[TRX_I_S_TRX_QUERY_MAX_LEN + 1];
if (stmt_len > TRX_I_S_TRX_QUERY_MAX_LEN) { if (stmt_len > TRX_I_S_TRX_QUERY_MAX_LEN) {
@ -512,6 +511,8 @@ fill_trx_row(
cache->storage, stmt, stmt_len + 1, cache->storage, stmt, stmt_len + 1,
MAX_ALLOWED_FOR_STORAGE(cache)); MAX_ALLOWED_FOR_STORAGE(cache));
row->trx_query_cs = innobase_get_charset(trx->mysql_thd);
if (row->trx_query == NULL) { if (row->trx_query == NULL) {
return(FALSE); return(FALSE);