diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-08-14 22:35:50 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-08-14 22:35:50 +0400 |
| commit | 937db4bff4575971996e401f0a5b969ce3475801 (patch) | |
| tree | 6724ecb95b89037e7536a3c6a84a4fae7a23c226 | |
| parent | c964cb1b626d9ff1c995b42fde406342aa35547a (diff) | |
| download | mariadb-git-937db4bff4575971996e401f0a5b969ce3475801.tar.gz | |
- Remove out-of-date comments
- Make testcase stable
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_misc.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/t/vcol_misc.test | 3 | ||||
| -rw-r--r-- | sql/multi_range_read.h | 13 |
3 files changed, 5 insertions, 13 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index 57460b1d669..f72373c6d3d 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -13,8 +13,8 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 ref idx idx 5 test.t1.b 2 Using where; Using join buffer select * from t1,t2 where t1.b=t2.c and d <= 100; a b c d v -4 20 20 100 101 1 20 20 100 101 3 30 30 100 101 +4 20 20 100 101 set join_cache_level=default; drop table t1, t2; diff --git a/mysql-test/suite/vcol/t/vcol_misc.test b/mysql-test/suite/vcol/t/vcol_misc.test index afe6f838268..5031a23aa49 100644 --- a/mysql-test/suite/vcol/t/vcol_misc.test +++ b/mysql-test/suite/vcol/t/vcol_misc.test @@ -17,7 +17,8 @@ set join_cache_level=6; explain select * from t1,t2 where t1.b=t2.c and d <= 100; +--sorted_result select * from t1,t2 where t1.b=t2.c and d <= 100; set join_cache_level=default; -drop table t1, t2;
\ No newline at end of file +drop table t1, t2; diff --git a/sql/multi_range_read.h b/sql/multi_range_read.h index 4941cac688d..0696dde21ca 100644 --- a/sql/multi_range_read.h +++ b/sql/multi_range_read.h @@ -47,12 +47,6 @@ When reading, there is current position pointing at start (for reverse buffer, end) of the element that will be read next. ^^ why end for reverse? it's more logical to point at start - - One can peek at what's behind that element by using advance_ptr function. - - TODO: will the reverse buffer store {tuple; rowid} or {rowid; tuple} pairs? - (why does it matter??? Read and write in the same order and then it - shouldn't matter.) */ class SimpleBuffer @@ -63,7 +57,7 @@ class SimpleBuffer uchar *write_pos; /* - 1 <=> buffer grows/is filled/is read from start to end + 1 <=> buffer grows/is filled/is read from start to end -1 <=> everthing is done from end to start instead. */ int direction; @@ -141,10 +135,7 @@ public: DBUG_ASSERT(0); /* Attempt to grow buffer in wrong direction */ } - /* */ - void grow(); - - friend class PeekIterator; + //friend class PeekIterator; class PeekIterator { // if direction==1 : pointer to what to return next |