← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

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:
drizzled/sql_table.cc
342
342
*/
343
343
 
344
344
void write_bin_log(Session *session,
345
 
                   char const *query, size_t query_length)
 
345
                   char const *query)
346
346
{
347
347
  ReplicationServices &replication_services= ReplicationServices::singleton();
348
 
  replication_services.rawStatement(session, query, query_length);
 
348
  replication_services.rawStatement(session, query);
349
349
}
350
350
 
351
351
 
369
369
 
370
370
  built_query.append(table_name);
371
371
  built_query.append("`");
372
 
  replication_services.rawStatement(session, built_query.c_str(), built_query.length());
 
372
  replication_services.rawStatement(session, built_query);
373
373
}
374
374
 
375
375
/*
1711
1711
    Otherwise, the statement shall be binlogged.
1712
1712
   */
1713
1713
  if (!internal_tmp_table && ! lex_identified_temp_table)
1714
 
    write_bin_log(session, session->query, session->query_length);
 
1714
    write_bin_log(session, session->query.c_str());
1715
1715
  error= false;
1716
1716
unlock_and_end:
1717
1717
  pthread_mutex_unlock(&LOCK_open);
2435
2435
        int result= store_create_info(table, &query, is_if_not_exists);
2436
2436
 
2437
2437
        assert(result == 0); // store_create_info() always return 0
2438
 
        write_bin_log(session, query.ptr(), query.length());
 
2438
        write_bin_log(session, query.ptr());
2439
2439
      }
2440
2440
      else                                      // Case 1
2441
 
        write_bin_log(session, session->query, session->query_length);
 
2441
        write_bin_log(session, session->query.c_str());
2442
2442
    }
2443
2443
  }
2444
2444