diff options
| author | pem@mysql.com <> | 2003-12-01 16:14:40 +0100 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-12-01 16:14:40 +0100 |
| commit | 6e717133c5e43d45f720dff9feb5e9ff58867876 (patch) | |
| tree | 024f2d18e3cf9f65db53f9f8c2d5413859781e16 /sql/sql_list.h | |
| parent | 82270288de9244ff2b1ae5a58d66add2a13d6e70 (diff) | |
| parent | f266cdabab538eeb87682af70d5e76652ee6387b (diff) | |
| download | mariadb-git-6e717133c5e43d45f720dff9feb5e9ff58867876.tar.gz | |
Merge 4.1 to 5.0
Diffstat (limited to 'sql/sql_list.h')
| -rw-r--r-- | sql/sql_list.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_list.h b/sql/sql_list.h index 2f0425f1ddc..592173c36da 100644 --- a/sql/sql_list.h +++ b/sql/sql_list.h @@ -290,9 +290,9 @@ public: List_iterator_fast(List<T> &a) : base_list_iterator(a) {} inline T* operator++(int) { return (T*) base_list_iterator::next_fast(); } inline void rewind(void) { base_list_iterator::rewind(); } - void sublist(List<T> &list, uint el) + void sublist(List<T> &list_arg, uint el_arg) { - base_list_iterator::sublist(list, el); + base_list_iterator::sublist(list_arg, el_arg); } }; |