summaryrefslogtreecommitdiff
path: root/sql/sql_list.h
diff options
context:
space:
mode:
authorgkodinov@dl145s.mysql.com <>2006-09-18 12:57:20 +0200
committergkodinov@dl145s.mysql.com <>2006-09-18 12:57:20 +0200
commitce8ed889d70c63332ba1f8317baf9d6a91cf7cbe (patch)
tree5370a5cf6745df5fd6690197a45f08ce5e60daf1 /sql/sql_list.h
parent343e08391d70accf2d2c9f077b3e950b53ea05fe (diff)
parent2ec485f06eb5cdf8a38c6192690ae29045181a72 (diff)
downloadmariadb-git-ce8ed889d70c63332ba1f8317baf9d6a91cf7cbe.tar.gz
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
Diffstat (limited to 'sql/sql_list.h')
-rw-r--r--sql/sql_list.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_list.h b/sql/sql_list.h
index 05f589a2c23..070fd1e3d9a 100644
--- a/sql/sql_list.h
+++ b/sql/sql_list.h
@@ -94,9 +94,9 @@ public:
inline base_list() { empty(); }
inline base_list(const base_list &tmp) :Sql_alloc()
{
- elements=tmp.elements;
- first=tmp.first;
- last=tmp.last;
+ elements= tmp.elements;
+ first= tmp.first;
+ last= elements ? tmp.last : &first;
}
inline base_list(bool error) { }
inline bool push_back(void *info)