bk commit into 5.0 tree (schwenke:1.2222)

[axel]

Below is the list of changes that have just been committed into a local
5.0 repository of schwenke. When schwenke does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-10 12:49:16+02:00, schwenke@stripped +2 -0
  merged
  MERGE: 1.2191.2.1

  libmysql/libmysql.c@stripped, 2006-07-10 12:16:56+02:00, schwenke@stripped +0 -3
    Auto merged
    MERGE: 1.243.1.1

  tests/mysql_client_test.c@stripped, 2006-07-10 12:49:14+02:00, schwenke@stripped +0
-56
    manually merged
    MERGE: 1.187.1.2

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	schwenke
# Host:	lmy003.xl.local
# Root:	/home/schwenke/Work/MySQL/bk-internal-tree/mysql-5.0-work/RESYNC

--- 1.188/tests/mysql_client_test.c	2006-07-10 12:49:28 +02:00
+++ 1.189/tests/mysql_client_test.c	2006-07-10 12:49:28 +02:00
@@ -8311,6 +8311,39 @@ static void test_list_fields()
 }
 
 
+static void test_bug19671()
+{
+  MYSQL_RES *result;
+  int rc;
+  myheader("test_bug19671");
+
+  rc= mysql_query(mysql, "drop table if exists t1");
+  myquery(rc);
+
+  rc= mysql_query(mysql, "drop view if exists v1");
+  myquery(rc);
+
+  rc= mysql_query(mysql, "create table t1(f1 int)");
+  myquery(rc);
+
+  rc= mysql_query(mysql, "create view v1 as select va.* from t1 va");
+  myquery(rc);
+
+  result= mysql_list_fields(mysql, "v1", NULL);
+  mytest(result);
+
+  rc= my_process_result_set(result);
+  DIE_UNLESS(rc == 0);
+
+  verify_prepare_field(result, 0, "f1", "f1", MYSQL_TYPE_LONG,
+                       "v1", "v1", current_db, 11, "0");
+
+  mysql_free_result(result);
+  myquery(mysql_query(mysql, "drop view v1"));
+  myquery(mysql_query(mysql, "drop table t1"));
+}
+
+
 /* Test a memory ovverun bug */
 
 static void test_mem_overun()
@@ -14882,11 +14915,13 @@ static void test_bug17667()
 
     printf("success.  All queries found intact in the log.\n");
 
-  } else {
+  }
+  else
+  {
     fprintf(stderr, "Could not find the log file, var/log/master.log, so "
-        "test_bug17667 is \ninconclusive.  Run test from the "
-        "mysql-test/mysql-test-run* program \nto set up the correct "
-        "environment for this test.\n\n");
+            "test_bug17667 is \ninconclusive.  Run test from the "
+            "mysql-test/mysql-test-run* program \nto set up the correct "
+            "environment for this test.\n\n");
   }
 
   if (log_file != NULL)
@@ -14896,7 +14931,8 @@ static void test_bug17667()
 
 
 /*
-  Bug#14169: type of group_concat() result changed to blob if tmp_table was used
+  Bug#14169: type of group_concat() result changed to blob if tmp_table was
+  used
 */
 static void test_bug14169()
 {
@@ -14933,8 +14969,9 @@ static void test_bug14169()
 
 
 /*
- Bug#20152: mysql_stmt_execute() writes to MYSQL_TYPE_DATE buffer
- */
+  Bug#20152: mysql_stmt_execute() writes to MYSQL_TYPE_DATE buffer
+*/
+
 static void test_bug20152()
 {
   MYSQL_BIND bind[1];
@@ -15247,9 +15284,10 @@ static struct my_tests_st my_tests[]= {
   { "test_bug12744", test_bug12744 },
   { "test_bug16143", test_bug16143 },
   { "test_bug15613", test_bug15613 },
+  { "test_bug20152", test_bug20152 },
   { "test_bug14169", test_bug14169 },
   { "test_bug17667", test_bug17667 },
-  { "test_bug20152", test_bug20152 },
+  { "test_bug19671", test_bug19671},
   { 0, 0 }
 };