diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-08-24 15:25:02 +0300 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-08-24 15:25:02 +0300 |
| commit | c2d5b26a3c8f85be0421f3746efe2076962dc31b (patch) | |
| tree | 2bc061d38daf95dca21edfb85cf19f6fb4778c54 /sql/sql_lex.cc | |
| parent | 7a60e167195674197de58af78bd19acef90bb6f7 (diff) | |
| parent | 0aefd73b3dda1705270fb756329c32e10e1cc476 (diff) | |
| download | mariadb-git-c2d5b26a3c8f85be0421f3746efe2076962dc31b.tar.gz | |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
libmysql/libmysql.c:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index b8ca8a7bd31..66f5540d286 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1530,6 +1530,7 @@ void st_select_lex::init_query() */ parent_lex->push_context(&context); cond_count= between_count= with_wild= 0; + max_equal_elems= 0; conds_processed_with_permanent_arena= 0; ref_pointer_array= 0; select_n_where_fields= 0; |