Manual merge.

sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Manual merge

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/client_test.c b/tests/client_test.c
index 8721285ec3f..2767a14da77 100644
--- a/tests/client_test.c
+++ b/tests/client_test.c
@@ -10625,6 +10625,23 @@ static void test_bug6058()
 }
 
 
+static void test_bug6059()
+{
+  MYSQL_STMT *stmt;
+  const char *stmt_text;
+  int rc;
+
+  myheader("test_bug6059");
+
+  stmt_text= "SELECT 'foo' INTO OUTFILE 'x.3'";
+
+  stmt= mysql_stmt_init(mysql);
+  rc= mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text));
+  DIE_UNLESS(mysql_stmt_field_count(stmt) == 0);
+  mysql_stmt_close(stmt);
+}
+
+
 
 /*
   Read and parse arguments and MySQL options from my.cnf
@@ -10938,6 +10955,7 @@ int main(int argc, char **argv)
                                prepared statements */
     test_bug6049();         /* check support for negative TIME values */
     test_bug6058();         /* check support for 0000-00-00 dates */
+    test_bug6059();         /* correct metadata for SELECT ... INTO OUTFILE */
     /*
       XXX: PLEASE RUN THIS PROGRAM UNDER VALGRIND AND VERIFY THAT YOUR TEST
       DOESN'T CONTAIN WARNINGS/ERRORS BEFORE YOU PUSH.