~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/row/row0sel.c

update to latest from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
3604
3604
            && prebuilt->select_lock_type != LOCK_NONE
3605
3605
            && trx->mysql_query_str != NULL
3606
3606
            && *trx->mysql_query_str != NULL
3607
 
            && trx->mysql_thd != NULL) {
 
3607
            && trx->mysql_session != NULL) {
3608
3608
 
3609
3609
                /* Scan the MySQL query string; check if SELECT is the first
3610
3610
                word there */
3611
3611
 
3612
3612
                if (dict_str_starts_with_keyword(
3613
 
                            trx->mysql_thd, *trx->mysql_query_str, "SELECT")) {
 
3613
                            trx->mysql_session, *trx->mysql_query_str, "SELECT")) {
3614
3614
                        /* It is a plain locking SELECT and the isolation
3615
3615
                        level is low: do not lock gaps */
3616
3616