diff options
| author | unknown <msvensson@shellback.(none)> | 2006-05-29 16:33:32 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-05-29 16:33:32 +0200 |
| commit | 9e398f156ff1fee60356a6262c4f6ffc791d3120 (patch) | |
| tree | 5cc688048381ede150330469092a97bfb196f938 /mysql-test | |
| parent | 40a76b900c32848a03386c4b8581e884c2cee45f (diff) | |
| parent | 5c1b4afb447802bbfbbede5f4c03bda8bc8f4d58 (diff) | |
| download | mariadb-git-9e398f156ff1fee60356a6262c4f6ffc791d3120.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint_from_5.1
into shellback.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/analyze.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/ps.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/analyze.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/ps.test | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/r/analyze.result b/mysql-test/r/analyze.result index fc267cb598d..7b476c3cca2 100644 --- a/mysql-test/r/analyze.result +++ b/mysql-test/r/analyze.result @@ -46,6 +46,7 @@ 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; +drop table t1; create temporary table t1(a int, index(a)); insert into t1 values('1'),('2'),('3'),('4'),('5'); analyze table t1; diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index fccaa9b1b66..abebfc8cd93 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -1157,3 +1157,4 @@ test.t1 analyze status Table is already up to date Warnings: Error 1146 Table 'test.t4' doesn't exist deallocate prepare stmt; +drop table t1, t2, t3; diff --git a/mysql-test/t/analyze.test b/mysql-test/t/analyze.test index 1801a4a440f..7c9830bb468 100644 --- a/mysql-test/t/analyze.test +++ b/mysql-test/t/analyze.test @@ -61,6 +61,7 @@ prepare stmt1 from "SELECT * FROM t1 PROCEDURE ANALYSE()"; execute stmt1; execute stmt1; deallocate prepare stmt1; +drop table t1; # # bug#15225 (ANALYZE temporary has no effect) diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index cc7d7ef2d82..e3f3e37cd4c 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -1145,5 +1145,5 @@ prepare stmt from "analyze table t4, t1"; execute stmt; execute stmt; deallocate prepare stmt; - +drop table t1, t2, t3; # End of 5.0 tests |