diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-01-10 18:26:14 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-01-10 18:26:14 +0200 |
| commit | cb55a65bdab2253510e53ae20b6786a1363e3955 (patch) | |
| tree | 14a9a35bebd797884d83d2f862d2cffffb0b52f3 /mysql-test | |
| parent | a1f84c11160ff26892ad9931354d3be341b71496 (diff) | |
| parent | 9112cdf58a675ddd3f7fe9547c7a02359ea494a7 (diff) | |
| download | mariadb-git-cb55a65bdab2253510e53ae20b6786a1363e3955.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/analyse.result | 3 | ||||
| -rw-r--r-- | mysql-test/r/handler.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/analyse.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/handler.test | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/analyse.result b/mysql-test/r/analyse.result index ede83afe4e1..0cb33526457 100644 --- a/mysql-test/r/analyse.result +++ b/mysql-test/r/analyse.result @@ -1,6 +1,9 @@ drop table if exists t1,t2; create table t1 (i int, j int); insert into t1 values (1,2), (3,4), (5,6), (7,8); +select count(*) from t1 procedure analyse(); +Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype + -6510615555426900571 -6510615555426900571 -6510615555426900571 -6510615555426900571 select * from t1 procedure analyse(); Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype t1.i 1 7 1 1 0 0 4.0000 2.2361 ENUM('1','3','5','7') NOT NULL diff --git a/mysql-test/r/handler.result b/mysql-test/r/handler.result index 35765c48049..b47f97e167f 100644 --- a/mysql-test/r/handler.result +++ b/mysql-test/r/handler.result @@ -5,6 +5,8 @@ insert into t1 values (14,"aaa"),(15,"bbb"),(16,"ccc"),(16,"xxx"), (20,"ggg"),(21,"hhh"),(22,"iii"); handler t1 open as t2; +handler t2 read a=(SELECT 1); +You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near 'SELECT 1)' at line 1 handler t2 read a first; a b 14 aaa diff --git a/mysql-test/t/analyse.test b/mysql-test/t/analyse.test index ccbfb56a801..117ca40ce54 100644 --- a/mysql-test/t/analyse.test +++ b/mysql-test/t/analyse.test @@ -7,6 +7,7 @@ drop table if exists t1,t2; --enable_warnings create table t1 (i int, j int); insert into t1 values (1,2), (3,4), (5,6), (7,8); +select count(*) from t1 procedure analyse(); select * from t1 procedure analyse(); create table t2 select * from t1 procedure analyse(); select * from t2; diff --git a/mysql-test/t/handler.test b/mysql-test/t/handler.test index 2b0a6a7be8d..b72b739600e 100644 --- a/mysql-test/t/handler.test +++ b/mysql-test/t/handler.test @@ -12,6 +12,8 @@ insert into t1 values (14,"aaa"),(15,"bbb"),(16,"ccc"),(16,"xxx"), (20,"ggg"),(21,"hhh"),(22,"iii"); handler t1 open as t2; +-- error 1064 +handler t2 read a=(SELECT 1); handler t2 read a first; handler t2 read a next; handler t2 read a next; |