diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-06-04 19:56:06 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-06-04 19:56:06 -0700 |
| commit | f03a3ee54fb8b5aeeba590677f48b54a57ab45cf (patch) | |
| tree | afb1235c5417019a563b1c1d64443f3b890d05df /sql/sql_list.h | |
| parent | f0f2ec3086000a22e83ce9ca33d59a3347784e0c (diff) | |
| parent | 35c35858f859f23c23a414cdb21fdfe39d5de11c (diff) | |
| download | mariadb-git-f03a3ee54fb8b5aeeba590677f48b54a57ab45cf.tar.gz | |
Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.
Resolved all conflicts and failures.
Diffstat (limited to 'sql/sql_list.h')
| -rw-r--r-- | sql/sql_list.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_list.h b/sql/sql_list.h index 7d9f3d26ec8..38235a10c18 100644 --- a/sql/sql_list.h +++ b/sql/sql_list.h @@ -265,6 +265,8 @@ public: prev= &node->next; node= node->next; elements++; + if (node == &end_of_list) + return; } *prev= *last; last= prev; |