diff options
| author | unknown <msvensson@shellback.(none)> | 2006-05-29 16:31:18 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-05-29 16:31:18 +0200 |
| commit | 9186349ef4b8fa8ac7f406f119c008d3749ffd0a (patch) | |
| tree | 60b6ae8f31e635c12d80304b433dea6eb0e8dcf9 /mysql-test | |
| parent | f5b969f42147bb60bee8cd7a725757b7a7f5feb0 (diff) | |
| parent | 5c1b4afb447802bbfbbede5f4c03bda8bc8f4d58 (diff) | |
| download | mariadb-git-9186349ef4b8fa8ac7f406f119c008d3749ffd0a.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint_from_5.1
into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
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 06443cde01d..3e3981c0050 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 639a576fb35..4a336962293 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 |