← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log_event.cc

enable remaining subselect tests, merge with latest from the trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log_event.cc
1300
1300
    we will probably want to reclaim the 29 bits. So we need the &.
1301
1301
  */
1302
1302
  flags2= (uint32_t) (session_arg->options & OPTIONS_WRITTEN_TO_BIN_LOG);
1303
 
  assert(session_arg->variables.character_set_client->number < 256*256);
1304
 
  assert(session_arg->variables.collation_connection->number < 256*256);
1305
1303
  assert(session_arg->variables.collation_server->number < 256*256);
1306
 
  assert(session_arg->variables.character_set_client->mbminlen == 1);
1307
 
  int2store(charset, session_arg->variables.character_set_client->number);
1308
 
  int2store(charset+2, session_arg->variables.collation_connection->number);
1309
1304
  int2store(charset+4, session_arg->variables.collation_server->number);
1310
1305
  time_zone_len= 0;
1311
1306
}