diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-02-08 03:21:34 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-02-08 03:21:34 +0200 |
| commit | 0f9932a162bdd80d83fd0c4a3d6641d41ff3f1e3 (patch) | |
| tree | 6fb2be8a25c87f580e5d7831b049ad0839a48237 /mysql-test/r | |
| parent | 6340283614f9f5cc4b9212ec5affa177b3f71711 (diff) | |
| download | mariadb-git-0f9932a162bdd80d83fd0c4a3d6641d41ff3f1e3.tar.gz | |
Fix some bugs introduced with the new my_getopt
Added counting of rollback's and commits
Fixed bug in 'SELECT 0 LIMIT 0'
Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'
Docs/manual.texi:
Changelog
configure.in:
Cleanup
myisam/myisamchk.c:
Fix some bugs introduced with the new my_getopt
mysql-test/r/limit.result:
Test for bugfix
mysql-test/r/rpl000001.result:
fix wrong result
mysql-test/r/select.result:
Fix things after fixing ignore index()
mysql-test/r/select_found.result:
Test of bug in SQL_CALC_FOUND_ROWS
mysql-test/t/limit.test:
Test bug in LIMIT 0
mysql-test/t/rpl000001.test:
fix wrong result
mysql-test/t/select_found.test:
Test of bug in SQL_CALC_FOUND_ROWS
sql/handler.cc:
Added counting of rollback's and commits
sql/mysql_priv.h:
Added counting of rollback's and commits
sql/mysqld.cc:
Added counting of rollback's and commits
sql/sql_select.cc:
Fixed bug in 'SELECT 0 LIMIT 0'
Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/limit.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/rpl000001.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/select.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/select_found.result | 17 |
4 files changed, 22 insertions, 3 deletions
diff --git a/mysql-test/r/limit.result b/mysql-test/r/limit.result index f341eebb968..5a8edc99c12 100644 --- a/mysql-test/r/limit.result +++ b/mysql-test/r/limit.result @@ -48,3 +48,5 @@ i 2 1 drop table t1; +select 0 limit 0; +0 diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result index 3dae52c6d3f..60a5db1de3a 100644 --- a/mysql-test/r/rpl000001.result +++ b/mysql-test/r/rpl000001.result @@ -7,7 +7,7 @@ use test; drop table if exists t1,t3; create table t1 (word char(20) not null); load data infile '../../std_data/words.dat' into table t1; -load data local infile '/home/sasha/bk/mysql-4.0/mysql-test/std_data/words.dat' into table t1; +load data local infile 'MYSQL_TEST_DIR/std_data/words.dat' into table t1; select * from t1; word Aarhus diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index ee057b268fd..051aeb43b43 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -1331,10 +1331,10 @@ table type possible_keys key key_len ref rows Extra t2 ref fld3 fld3 30 const 1 where used; Using index explain select fld3 from t2 ignore index (fld3) where fld3 = 'honeysuckle'; table type possible_keys key key_len ref rows Extra -t2 index fld3 fld3 30 NULL 1199 where used; Using index +t2 index NULL fld3 30 NULL 1199 where used; Using index explain select fld3 from t2 use index (fld1) where fld3 = 'honeysuckle'; table type possible_keys key key_len ref rows Extra -t2 index fld3 fld3 30 NULL 1199 where used; Using index +t2 index NULL fld3 30 NULL 1199 where used; Using index explain select fld3 from t2 use index (fld3) where fld3 = 'honeysuckle'; table type possible_keys key key_len ref rows Extra t2 ref fld3 fld3 30 const 1 where used; Using index diff --git a/mysql-test/r/select_found.result b/mysql-test/r/select_found.result index 2fab1642cc5..3a84c3e52da 100644 --- a/mysql-test/r/select_found.result +++ b/mysql-test/r/select_found.result @@ -45,3 +45,20 @@ select found_rows(); FOUND_ROWS() 8 drop table t1; +create table t1 (a int not null primary key); +insert into t1 values (1),(2),(3),(4),(5); +select sql_calc_found_rows a from t1 where a in (1,2,3) order by a desc limit 0,2; +a +3 +2 +select FOUND_ROWS(); +FOUND_ROWS() +3 +select sql_calc_found_rows a from t1 where a in (1,2,3) order by a+2 desc limit 0,2; +a +3 +2 +select FOUND_ROWS(); +FOUND_ROWS() +3 +drop table t1; |