database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/kgeorge/mysql/4.1/warnings

Browse Source 
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
This commit is contained in:
unknown
2006-06-29 10:46:30 +03:00
parent 8f42d836dc 1ae69b6b1a
commit bdf32845d6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/opt_range.cc
View File

@ -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)
{