ab5e4eefd5
Fixed some compiler warnings found when compiling for windows.
...
Changed rows_read and rows_sent status variables to be longlong (to avoid compiler warnings)
sql/item_func.cc:
Fixed wrong usage of alias
sql/item_subselect.cc:
Changed buffer size to ulonglong to be able detect buffers bigger than size_t
sql/item_subselect.h:
Changed buffer size to ulonglong to be able detect buffers bigger than size_t
sql/multi_range_read.cc:
Fixed compiler warning by using correct type for function argument
sql/mysqld.cc:
Changed rows_read and rows_sent status variables to be longlong
sql/opt_subselect.h:
Fixed compiler warning by using correct type for function argument
sql/sql_class.cc:
Changed rows_read and rows_sent status variables to be longlong
sql/sql_class.h:
Changed rows_read and rows_sent status variables to be longlong
Changed max_nulls_in_row to uint as this is number of columns in row.
This fixed some compiler warnings.
sql/sql_select.cc:
Added casts to avoid compiler warnings
storage/heap/ha_heap.cc:
Initilize different types separate
storage/oqgraph/ha_oqgraph.cc:
Fixed argument to store(longlong) to avoid compiler warnings
2010-11-30 01:27:14 +02:00
cee6e4565d
Fix trivial error in previous push
2010-11-29 17:27:23 +03:00
a6d47ab1d3
Fix buildbot failure: keep rowid_buf_elem_size to its original value, otherwise
...
subsequent asserts have the wrong meaning.
2010-11-28 23:55:08 +03:00
8604dc78e2
Fix trivial error
2010-11-26 15:45:46 +03:00
40822c8149
Fix buildbot failure
2010-11-26 00:30:39 +03:00
92442fc598
Merge MWL#121-125 DS-MRR improvements
...
- Address Monty's review feedback, part 4
2010-11-25 14:35:21 +03:00
fad2ec7499
MWL#121-125 DS-MRR improvements
...
- Address Monty's review feedback, part 3
2010-11-23 18:08:11 +03:00
a6c1d56e08
MWL#121-125 DS-MRR improvements
...
- Address Monty's review feedback, part 1
- Fix buildbot failure
2010-11-22 19:34:03 +03:00
2ec43747f5
Merge MWL#121-125 DS-MRR improvements
...
- Address Monty's review feedback, part 1
2010-11-22 17:08:22 +03:00
3d698ac616
BUG#671361: virtual int Mrr_ordered_index_reader::refill_buffer(): Assertion `!know_key_tuple_params
...
- Make sure we have enough space for both rowids and keys.
2010-11-09 18:02:08 +02:00
0fb342ba56
BUG#670417: Diverging results in maria-5.3-mwl128-dsmrr-cpk with join buffer, attempt 4
...
- Disable identical key handling optimization when
IndexConditionPushdown is used
2010-11-08 20:37:01 +03:00
197c99427d
DS-MRR improvements
...
- Code cleanup
- Always propagate the error code we got from storage engine all the way up
2010-11-08 15:15:50 +03:00
d6ec99d0b6
Merge {DS-DRR improvements:code cleanup} into MWL#128+DS-MRR tree
2010-11-03 11:03:07 +03:00
c46450de72
Code cleanup
2010-11-03 00:09:28 +03:00
1654780f2d
Code cleanup
2010-11-02 23:25:35 +03:00
59db1d7a39
Address problems uncovered by buildbot
...
- Update test results
- Handle the case where MRR implementation doesn't get any key tuples at all
2010-11-02 19:32:26 +03:00
6c15806b68
MWL#121-124 DS-MRR support for key-ordered retrieval, etc
...
- Merge into 5.3-main
2010-11-01 18:49:59 +03:00
b76a8595c6
Re-initialization reworked
2010-11-01 13:52:10 +03:00
430f63c271
use DBUG_RETURN with DBUG_ENTER
2010-11-01 00:04:34 +03:00
d9a8dd22b2
DS-MRR/CPK improvements: correct buffer exhaustion handling
2010-10-31 22:00:15 +03:00
0b72fd88a1
Merge.
2010-10-30 06:07:45 -07:00
8e4c627ef8
DS-MRR improvements:
...
- Correct buffer re-allocation
2010-10-29 20:21:26 +04:00
1e82320d27
DS-MRR improvements
...
- buildbot test failure fixes: don't try to get more records from SimpleIndexReader
if we've already got EOF for it.
2010-10-29 13:42:48 +04:00
8e7ebfbce8
5.2 merge
2010-10-28 19:04:23 +02:00
a88bd5cf56
DS-MRR improvements:
...
- address the review feedback (class/var renames)
- fix wrong test result (bug in buffer refill logic)
2010-10-28 20:48:16 +04:00
d8efc3b155
DS-MRR improvements: address review feedback for R3 version of the patch
2010-10-26 15:35:13 +04:00
79087c9e07
Ported the fix for bug #57024 (a performance issue for outer joins).
...
Employed the same kind of optimization as in the fix for the cases
when join buffer is used.
The optimization performs early evaluation of the conditions from
on expression with table references to only outer tables of
an outer join.
2010-10-06 13:27:12 -07:00
ac8a79b944
Code cleanup
2010-10-04 10:31:40 +04:00
d4f2e7a9a9
Fix failures introduced in the previous push
2010-10-04 00:37:30 +04:00
5156457506
Address review feedback
...
- One iterator class
- Switch back from state automaton into two-nested-iterators approach..
2010-10-03 14:48:42 +04:00
22d5323fac
DS-MRR/CPK improvements: more of addressing review feedback
2010-10-01 15:54:35 +04:00
61f26f0c62
DS-MRR improvements: address review feedback
...
- change dsmrr_next_from_index() to a switch-based state automaton-like structure.
2010-09-28 20:20:09 +04:00
4f56acb676
Better comments, move Lifo_buffer to separate file.
2010-09-28 12:19:50 +04:00
3066c37718
DS-MRR improvements: review feedback
...
- Switch from one bi-directional buffer class to two
virtual inheritance-based forward and backward buffer classes.
2010-09-21 20:19:54 +04:00
2121ab1eb4
DS-MRR improvements: remove write_size/read_size, have the same size
...
for writing and reading
2010-09-20 13:23:51 +04:00
189555f39a
DS-MRR improvements: more code cleanup
...
- better comments
- rename variables to better reflect their meaning
2010-09-20 13:02:17 +04:00
18a348503a
DS-MRR improvements: better comments, use symbolic name instead of +1/-1 constants.
2010-09-19 01:05:47 +04:00
499b142ad5
BUG#628785: multi_range_read.cc:430: int DsMrr_impl::dsmrr_init(): Assertion `do_sort_keys || do_rowid_fetch' failed
...
- Make Ds_MrrImpl::check_cpk_scan() follow the execution code' logic: don't
do MRR scans on clustered PK when mrr_sort_keys=off.
2010-09-15 16:58:01 +04:00
188de43db1
- Fixed BUG#623285: Crash in quick_range_seq_next() in maria-5.3-dsmrr-cpk
...
- Relax overly-strict assert added in previous commit
- Run generic MRR testsuite for Maria engine, too.
2010-09-13 19:45:41 +04:00
b9e5125050
Remove garbage comments, coding style conformance (no functional changes).
2010-09-12 13:21:25 +04:00
a730bb9caf
Fix a typo bug in SimpleBuffer.read()
2010-09-11 21:56:43 +04:00
9b04caffd4
Commit for buildbot checks
2010-09-10 20:48:11 +04:00
dbc63bed22
MWL#121-125: DS-MRR improvements
...
- Address review feedback, step 1
2010-09-05 14:32:14 +04:00
fae27347d1
Fix one more problem with buffer exhaustion scenario
2010-08-19 19:52:58 +02:00
d4f057f256
More valgrind fixes
2010-08-15 22:30:18 +04:00
3b85e019ab
Fix another (possibly dangerous) valgrind failure.
2010-08-15 07:59:39 +04:00
889e6170fe
Fix [harmless] valgrind failure
2010-08-15 06:59:23 +04:00
c964cb1b62
key/rowid buffer overflow fixes for various tricky cases.
2010-08-14 18:56:37 +04:00
d098596ba5
Fix a number of problems with reverse buffer use
2010-08-12 23:59:29 +04:00
8d07c16ad9
Do dynamic buffer growing/shrinking.
2010-08-12 21:18:41 +04:00
