Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/rpl_deadlock.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
include/my_sys.h:
  Manual merge, my_getpagesize broken out of "#ifdef HAVE_SYS_MMAN_H"

1 files changed, 6 insertions, 1 deletions

diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index da7fde469ad..aa993230a7f 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -13686,7 +13686,8 @@ static void test_bug11172()
                hired.year, hired.month, hired.day);
     }
     DIE_UNLESS(rc == MYSQL_NO_DATA);
-    mysql_stmt_free_result(stmt) || mysql_stmt_reset(stmt);
+    if (!mysql_stmt_free_result(stmt))
+      mysql_stmt_reset(stmt);
   }
   mysql_stmt_close(stmt);
   mysql_rollback(mysql);
@@ -14828,6 +14829,8 @@ static void test_opt_reconnect()
 }
 
 
+#ifndef EMBEDDED_LIBRARY
+
 static void test_bug12744()
 {
   MYSQL_STMT *prep_stmt = NULL;
@@ -14859,6 +14862,8 @@ static void test_bug12744()
   client_connect(0);
 }
 
+#endif /* EMBEDDED_LIBRARY */
+
 /* Bug #16143: mysql_stmt_sqlstate returns an empty string instead of '00000' */
 
 static void test_bug16143()