← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Mark Atwood
  • Date: 2008-12-29 22:12:25 UTC
  • mfrom: (752 testable)
  • mto: (754.1.4 devel)
  • mto: This revision was merged to the branch mainline in revision 755.
  • Revision ID: me@mark.atwood.name-20081229221225-u2hiic4ztb2mryfn
merge from main

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
1256
1256
        close_temporary(table, 1, 1);
1257
1257
      }
1258
1258
      session->clear_error();
1259
 
      const CHARSET_INFO * const cs_save= session->variables.character_set_client;
1260
 
      session->variables.character_set_client= system_charset_info;
1261
1259
      Query_log_event qinfo(session, s_query.ptr(),
1262
1260
                            s_query.length() - 1 /* to remove trailing ',' */,
1263
1261
                            0, false);
1264
 
      session->variables.character_set_client= cs_save;
1265
1262
      /*
1266
1263
        Imagine the thread had created a temp table, then was doing a
1267
1264
        SELECT, and the SELECT was killed. Then it's not clever to