← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/trx/trx0i_s.c

Merge with my query rewrite tree to change the query member in Session to std::string

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/trx/trx0i_s.c
437
437
                row->trx_mysql_thread_id = 0;
438
438
        }
439
439
 
440
 
        if (trx->mysql_query_str != NULL && *trx->mysql_query_str != NULL) {
 
440
        if (trx->mysql_query_str != NULL) {
441
441
 
442
 
                if (strlen(*trx->mysql_query_str)
 
442
                if (strlen(trx->mysql_query_str)
443
443
                    > TRX_I_S_TRX_QUERY_MAX_LEN) {
444
444
 
445
445
                        char    query[TRX_I_S_TRX_QUERY_MAX_LEN + 1];
446
446
 
447
 
                        memcpy(query, *trx->mysql_query_str,
 
447
                        memcpy(query, trx->mysql_query_str,
448
448
                               TRX_I_S_TRX_QUERY_MAX_LEN);
449
449
                        query[TRX_I_S_TRX_QUERY_MAX_LEN] = '\0';
450
450
 
455
455
                } else {
456
456
 
457
457
                        row->trx_query = ha_storage_put_str_memlim(
458
 
                                cache->storage, *trx->mysql_query_str,
 
458
                                cache->storage, trx->mysql_query_str,
459
459
                                MAX_ALLOWED_FOR_STORAGE(cache));
460
460
                }
461
461