List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:May 2 2012 11:33am
Subject:bzr push into mysql-trunk branch (Georgi.Kodinov:3834 to 3835) WL#5924
View as plain text  
 3835 Georgi Kodinov	2012-05-02
      WL#5924 :  Add connect string processing to mysql
      
      wrapped the PSI_CALL into a 
      #ifdef HAVE_PSI_THREAD_INTERFACE (as Chris P suggests)
      for embedded as well.

    modified:
      libmysqld/lib_sql.cc
 3834 Georgi Kodinov	2012-05-02
      WL#5924: Add connect string processing to mysql
      
      Addressed review comments by Chris P and Kristofer.

    modified:
      client/mysqlbinlog.cc
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v1.h.pp
      libmysqld/lib_sql.cc
      mysql-test/suite/perfschema/r/connect_attrs.result
      mysql-test/suite/perfschema/r/table_schema.result
      mysql-test/suite/perfschema/t/connect_attrs.test
      mysys/psi_noop.c
      scripts/mysql_system_tables.sql
      sql/sql_acl.cc
      storage/perfschema/cursor_by_thread_connect_attr.cc
      storage/perfschema/cursor_by_thread_connect_attr.h
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_instr.h
      tests/mysql_client_test.c
=== modified file 'libmysqld/lib_sql.cc'
--- a/libmysqld/lib_sql.cc	2012-05-02 11:04:32 +0000
+++ b/libmysqld/lib_sql.cc	2012-05-02 11:32:54 +0000
@@ -738,6 +738,7 @@ err:
 static void
 emb_transfer_connect_attrs(MYSQL *mysql)
 {
+#ifdef HAVE_PSI_THREAD_INTERFACE
   if (mysql->options.extension &&
       mysql->options.extension->connection_attributes_length)
   {
@@ -749,9 +750,9 @@ emb_transfer_connect_attrs(MYSQL *mysql)
     send_client_connect_attrs(mysql, buf);
     PSI_CALL(set_thread_connect_attrs)((char *) (buf + 2), length,
                                        thd->charset());
-
     my_afree(buf);
   }
+#endif
 }
 
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (Georgi.Kodinov:3834 to 3835) WL#5924Georgi Kodinov2 May