diff options
| author | unknown <gkodinov@mysql.com> | 2006-06-29 10:46:30 +0300 |
|---|---|---|
| committer | unknown <gkodinov@mysql.com> | 2006-06-29 10:46:30 +0300 |
| commit | bdf32845d697f394e848fb892b7bf99a6dfc24eb (patch) | |
| tree | 27cfa18b3c1fa298ff58e9bab48779bed0d2a73a /sql/opt_range.cc | |
| parent | 8f42d836dc3f7e2ce71b7116602710515dae5ebc (diff) | |
| parent | 1ae69b6b1a1d70366679794a5e5c2393d3bb3d13 (diff) | |
| download | mariadb-git-bdf32845d697f394e848fb892b7bf99a6dfc24eb.tar.gz | |
Merge mysql.com:/home/kgeorge/mysql/4.1/warnings
into mysql.com:/home/kgeorge/mysql/5.0/warnings
sql/opt_range.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/item_cmpfunc.h:
resolve the conflicts in 4.1->5.0 merge of the gcc 4.1 warnings in favor of
5.0 code
sql/spatial.h:
resolve the conflicts in 4.1->5.0 merge of the gcc 4.1 warnings in favor of
5.0 code
sql/sql_select.h:
resolve the conflicts in 4.1->5.0 merge of the gcc 4.1 warnings in favor of
5.0 code
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index cb0f35a425e..72ead07059b 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -80,8 +80,8 @@ public: SEL_ARG(Field *field, uint8 part, char *min_value, char *max_value, uint8 min_flag, uint8 max_flag, uint8 maybe_flag); SEL_ARG(enum Type type_arg) - :elements(1),use_count(1),left(0),next_key_part(0),color(BLACK), - type(type_arg),min_flag(0) + :min_flag(0),elements(1),use_count(1),left(0),next_key_part(0), + color(BLACK), type(type_arg) {} inline bool is_same(SEL_ARG *arg) { |