List:Commits« Previous MessageNext Message »
From:Guilhem Bichot Date:October 21 2010 12:53pm
Subject:bzr commit into mysql-next-mr-bugfixing branch (guilhem:3224)
View as plain text  
#At file:///home/mysql_src/bzrrepos_new/mysql-next-mr-opt-backporting-wl4800/ based on revid:guilhem@stripped

 3224 Guilhem Bichot	2010-10-21
      fixes for --opt-trace-protocol

    modified:
      client/mysqltest.cc
      mysql-test/mysql-test-run.pl
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-09-28 08:58:16 +0000
+++ b/client/mysqltest.cc	2010-10-21 12:53:15 +0000
@@ -7653,14 +7653,18 @@ void display_opt_trace(struct st_connect
     DYNAMIC_STRING query_str;
     init_dynamic_string(&query_str, 
                         "SELECT trace FROM information_schema.optimizer_trace "
-                        "/* injected by --opt-trace-mode */",
+                        "/* injected by --opt-trace-protocol */",
                         128, 128);
 
     command->query= query_str.str;
     command->query_len= query_str.length;
     command->end= strend(command->query);
 
+    /* sorted trace is not readable at all*/
+    my_bool save_display_result_sorted= display_result_sorted;
+    display_result_sorted= FALSE;
     run_query(cn, command, flags);
+    display_result_sorted= save_display_result_sorted;
 
     dynstr_free(&query_str);
     *command= save_command;

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-09-28 08:58:16 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-10-21 12:53:15 +0000
@@ -1446,6 +1446,8 @@ sub command_line_setup {
   if ( $opt_trace_protocol )
   {
     push(@opt_extra_mysqld_opt, "--optimizer_trace=enabled=on,one_line=off");
+    # some queries yield big traces:
+    push(@opt_extra_mysqld_opt, "--optimizer-trace-max-mem-size=1000000");
   }
 
   if ( $opt_valgrind )


Attachment: [text/bzr-bundle] bzr/guilhem@mysql.com-20101021125315-ekrj5rqnuvcqxmq1.bundle
Thread
bzr commit into mysql-next-mr-bugfixing branch (guilhem:3224) Guilhem Bichot21 Oct