diff options
| author | Igor Babaev <igor@askmonty.org> | 2009-10-11 21:59:34 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2009-10-11 21:59:34 -0700 |
| commit | 3019d3972932931d9c4a14bec4183b232355cdcf (patch) | |
| tree | 657934676c4fce10dc2c9da45a00a946f3f9589e /sql/sql_list.h | |
| parent | 8ea19fa73e86a3c27917a92affd6a9e43763c7ce (diff) | |
| download | mariadb-git-3019d3972932931d9c4a14bec4183b232355cdcf.tar.gz | |
The main patch for WL#24:
"index_merge: fair choice between index_merge union and range access"
mysql-test/include/world.inc:
A new include file to upload the world database.
mysql-test/include/world_schema.inc:
A new include file to create tables of the world database.
mysql-test/r/index_merge_myisam.result:
The results for test cases testing the optimizations added in WL#24 for MyISAM.
mysql-test/r/range_vs_index_merge.result:
The results for test cases testing the optimizations added in WL#24 for InnoDB.
mysql-test/t/range_vs_index_merge.test:
Test cases to test the optimizations added in WL#24 for MyISAM.
mysql-test/t/range_vs_index_merge_innodb.test:
Test cases to test the optimizations added in WL#24 for InnoDB.
sql/sql_list.h:
Fixed a bug that did not allow adding a non-empty list to an empty list.
Diffstat (limited to 'sql/sql_list.h')
| -rw-r--r-- | sql/sql_list.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_list.h b/sql/sql_list.h index 93cdd20c299..cbe94b9f226 100644 --- a/sql/sql_list.h +++ b/sql/sql_list.h @@ -168,6 +168,14 @@ public: { if (!list->is_empty()) { +#if 0 +#else + if (is_empty()) + { + *this= *list; + return; + } +#endif *last= list->first; last= list->last; elements+= list->elements; |