diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-08-31 15:45:25 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-08-31 15:45:25 -0700 |
| commit | 56d3674ba594fd9797332ad83f5fdfcabe37520b (patch) | |
| tree | f3933f46ed69506a3b2abf4a3ab80e42012b64c1 /sql/sql_list.h | |
| parent | 72a26cb020fdbee7bba7612f55ab4e254092a7af (diff) | |
| parent | 6ac61bbe405764a1d05cf102d62dec799e772c84 (diff) | |
| download | mariadb-git-56d3674ba594fd9797332ad83f5fdfcabe37520b.tar.gz | |
Merge
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 15eb85ab52c..6a568c2dfd7 100644 --- a/sql/sql_list.h +++ b/sql/sql_list.h @@ -235,6 +235,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; |