From 48450d8a2b7a4e50d8642c1f6fb9415eac5f2e12 Mon Sep 17 00:00:00 2001
From: unknown <holyfoot@deer.(none)>
Date: Sat, 10 Dec 2005 18:02:36 +0400
Subject: Fix for bug #15225 (ANALYZE temporary has no effect)

mysql-test/r/analyze.result:
  test result fixed
mysql-test/t/analyze.test:
  test case added
sql/sql_table.cc:
  we don't need to remove temporary table from the cache,
  but we need to reload it's info
---
 mysql-test/r/analyze.result | 9 +++++++++
 mysql-test/t/analyze.test   | 9 +++++++++
 2 files changed, 18 insertions(+)

(limited to 'mysql-test')

diff --git a/mysql-test/r/analyze.result b/mysql-test/r/analyze.result
index 796b382f5d6..bded22c4859 100644
--- a/mysql-test/r/analyze.result
+++ b/mysql-test/r/analyze.result
@@ -37,3 +37,12 @@ Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_
 execute stmt1;
 Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype
 deallocate prepare stmt1;
+create temporary table t1(a int, index(a));
+insert into t1 values('1'),('2'),('3'),('4'),('5');
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+show index from t1;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
+t1	1	a	1	a	A	5	NULL	NULL	YES	BTREE	
+drop table t1;
diff --git a/mysql-test/t/analyze.test b/mysql-test/t/analyze.test
index 5d653b65579..a4694c32d3c 100644
--- a/mysql-test/t/analyze.test
+++ b/mysql-test/t/analyze.test
@@ -48,4 +48,13 @@ execute stmt1;
 execute stmt1;
 deallocate prepare stmt1;
 
+#
+# bug#15225 (ANALYZE temporary has no effect)
+#
+create temporary table t1(a int, index(a));
+insert into t1 values('1'),('2'),('3'),('4'),('5');
+analyze table t1;
+show index from t1;
+drop table t1;
+
 # End of 4.1 tests
-- 
cgit v1.2.1


From 57ecf2b4b417f9f100d56b65413a7133d405809a Mon Sep 17 00:00:00 2001
From: unknown <holyfoot@deer.(none)>
Date: Tue, 11 Apr 2006 15:01:21 +0500
Subject: bug #15442 (mysqltest.test doesn't work with the embedded server)

mysql-test/mysql-test-run.pl:
  no ndbcluster needed here
mysql-test/mysql-test-run.sh:
  no ndbcluster needed here
mysql-test/t/mysqltest.test:
  this test shouldn't work with the embedded server
---
 mysql-test/mysql-test-run.pl | 1 +
 mysql-test/mysql-test-run.sh | 1 +
 mysql-test/t/mysqltest.test  | 1 +
 3 files changed, 3 insertions(+)

(limited to 'mysql-test')

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 20bb6e0117a..3fcc5b554d8 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -678,6 +678,7 @@ sub command_line_setup () {
     $glob_use_embedded_server= 1;
     push(@glob_test_mode, "embedded");
     $opt_skip_rpl= 1;              # We never run replication with embedded
+    $opt_skip_ndbcluster= 1;
 
     if ( $opt_extern )
     {
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index c8d54d7e86c..e74a5ac82d0 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -279,6 +279,7 @@ while test $# -gt 0; do
       USE_EMBEDDED_SERVER=1
       USE_MANAGER=0 NO_SLAVE=1
       USE_RUNNING_SERVER=""
+      USE_NDBCLUSTER=""
       TEST_MODE="$TEST_MODE embedded" ;;
     --purify)
       USE_PURIFY=1
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index f5c6a7617c5..a15a143e9f4 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -1,3 +1,4 @@
+-- source include/not_embedded.inc
 
 # ============================================================================
 #
-- 
cgit v1.2.1


From 651c0c18f04e5c6831402916b66777817dd57c75 Mon Sep 17 00:00:00 2001
From: unknown <holyfoot@vva.(none)>
Date: Mon, 24 Apr 2006 13:07:53 +0500
Subject: bug #16892 (mysql_client_test fails in embedded server)

mysql-test/t/mysql_client_test.test:
  test disabled in embedded server
---
 mysql-test/t/mysql_client_test.test | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'mysql-test')

diff --git a/mysql-test/t/mysql_client_test.test b/mysql-test/t/mysql_client_test.test
index 66b57dd5fb7..1225bf73009 100644
--- a/mysql-test/t/mysql_client_test.test
+++ b/mysql-test/t/mysql_client_test.test
@@ -1,3 +1,6 @@
+# This test should work in embedded server after we fix mysqltest
+-- source include/not_embedded.inc
+
 # We run with different binaries for normal and --embedded-server
 #
 # If this test fails with "command "$MYSQL_CLIENT_TEST" failed",
-- 
cgit v1.2.1