bzr push into mysql-trunk branch (rafal.somla:4731 to 4732)

[Rafal Somla]

 4732 Rafal Somla	2012-10-18
      Fix LOCAL INFILE tracing.

    modified:
      libmysql/libmysql.c
      sql-common/client.c
 4731 Rafal Somla	2012-10-18
      Fix for linux build.

    modified:
      libmysql/test_trace_plugin.cc
=== modified file 'libmysql/libmysql.c'
--- a/libmysql/libmysql.c	2012-10-17 13:22:15 +0000
+++ b/libmysql/libmysql.c	2012-10-18 15:36:27 +0000
@@ -514,6 +514,7 @@ my_bool handle_local_infile(MYSQL *mysql
       (*options->local_infile_error)(li_ptr,
                                      net->last_error,
                                      sizeof(net->last_error)-1);
+    MYSQL_TRACE(ERROR, mysql, ());
     goto err;
   }
 

=== modified file 'sql-common/client.c'
--- a/sql-common/client.c	2012-10-17 13:22:15 +0000
+++ b/sql-common/client.c	2012-10-18 15:36:27 +0000
@@ -4251,7 +4251,7 @@ get_info:
 
     error= handle_local_infile(mysql,(char*) pos);
 
-#if defined(MYSQL_PROTOCOL_TRACING)
+#if defined(CLIENT_PROTOCOL_TRACING)
     if (!error)
       MYSQL_TRACE_STAGE(mysql, WAIT_FOR_RESULT);
 #endif

No bundle (reason: useless for push emails).