Commit graph

3351 commits

Author SHA1 Message Date
hf@deer.mysql.r18.ru
9967da942b SCRUM
additions about DEFAULT in UPDATE and SELECT
2003-01-05 17:56:11 +04:00
unknown
d33e652321 Conflicts resolving
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.h:
  Conflict resolving
2003-01-05 14:12:03 +04:00
hf@deer.mysql.r18.ru
445d426203 Conflicts resolving 2003-01-05 14:12:03 +04:00
unknown
7ef0dad72e SCRUM
DEFAULT in UPDATE and SELECT


sql/field.h:
  set_default() implementation changed
sql/item.cc:
  Item_default_value methods implementations added
sql/item.h:
  Item_default_value class added
sql/sql_yacc.yy:
  DEFAULT in UPDATE and SELECT added
sql/table.cc:
  table->default_values initialization added
sql/table.h:
  st_table::default_values added
2003-01-05 14:07:24 +04:00
hf@deer.mysql.r18.ru
f6e8e1f985 SCRUM
DEFAULT in UPDATE and SELECT
2003-01-05 14:07:24 +04:00
unknown
3f4c4cbfdd Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
2003-01-03 15:08:40 +02:00
Sinisa@sinisa.nasamreza.org
164ab11b29 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-01-03 15:08:40 +02:00
unknown
7df75ca76a Further fix for export class problem 2003-01-03 15:07:40 +02:00
Sinisa@sinisa.nasamreza.org
adac21640e Further fix for export class problem 2003-01-03 15:07:40 +02:00
unknown
3fe840ee07 post-post-review fix (SCRUM)
sql/item.cc:
  post-post-review fix
sql/item_cmpfunc.h:
  post-post-review fix
sql/item_row.cc:
  post-post-review fix
sql/item_subselect.cc:
  post-post-review fix
2003-01-02 12:24:33 +02:00
bell@sanja.is.com.ua
945758f0ec post-post-review fix (SCRUM) 2003-01-02 12:24:33 +02:00
unknown
cd248a8d63 postreviews fix (SCRUM related)
reordered Item_row class variables to be sorted by memory size


mysql-test/r/subselect.result:
  fix result of subselect test
sql/item.cc:
  postreviews fix
sql/item.h:
  postreviews fix
sql/item_cmpfunc.h:
  postreviews fix
sql/item_row.cc:
  postreviews fix
sql/item_row.h:
  reordered class variables to be sorted by memory size
  postreviews fix
sql/item_strfunc.cc:
  postreviews fix
sql/item_subselect.cc:
  postreviews fix
2002-12-31 18:39:16 +02:00
bell@sanja.is.com.ua
c7a02249f5 postreviews fix (SCRUM related)
reordered Item_row class variables to be sorted by memory size
2002-12-31 18:39:16 +02:00
unknown
d78d76f114 A fix for a charset bug in the select_export (select into
outfile) class.
2002-12-31 18:01:53 +02:00
Sinisa@sinisa.nasamreza.org
885d9d9037 A fix for a charset bug in the select_export (select into
outfile) class.
2002-12-31 18:01:53 +02:00
unknown
53894481bf merging
mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2002-12-31 12:55:03 +02:00
bell@sanja.is.com.ua
7c0a074614 merging 2002-12-31 12:55:03 +02:00
unknown
a83a0d4b32 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-12-31 12:48:00 +02:00
bell@sanja.is.com.ua
2c6fca2755 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
2002-12-31 12:48:00 +02:00
unknown
f32d1148ac Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2002-12-30 19:42:03 +02:00
Sinisa@sinisa.nasamreza.org
a4a80302b8 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-30 19:42:03 +02:00
unknown
49efae72b1 Fix compiler warnings removing unreferenced variables
sql/field.cc:
  Removing unreferenced local variables
sql/item.cc:
  Remove unreferenced local variable
sql/sql_parse.cc:
  Remove unreferenced local variable
sql/sql_select.cc:
  Remove unreferenced local variable
sql/sql_show.cc:
  Remove unreferenced local variable
2002-12-29 21:50:52 -02:00
miguel@hegel.br
f43ebb83db Fix compiler warnings removing unreferenced variables 2002-12-29 21:50:52 -02:00
unknown
3ab0ddc294 postreview fix (SCRUM)
fixed layout


sql/filesort.cc:
  fixed layout
sql/gstream.cc:
  fixed layout
sql/item.cc:
  postreview fix
sql/item.h:
  postreview fix
sql/item_cmpfunc.cc:
  postreview fix
sql/item_cmpfunc.h:
  fixed layout
sql/item_func.h:
  fixed layout
sql/item_row.h:
  fixed layout
sql/item_strfunc.cc:
  fixed layout
sql/item_subselect.cc:
  postreview fix
sql/item_subselect.h:
  postreview fix
sql/nt_servc.cc:
  fixed layout
sql/opt_range.cc:
  fixed layout
sql/password.c:
  fixed layout
sql/spatial.cc:
  fixed layout
sql/sql_help.cc:
  fixed layout
sql/sql_lex.cc:
  fixed layout
sql/sql_olap.cc:
  fixed layout
sql/sql_select.cc:
  fixed layout
sql/sql_show.cc:
  fixed layout
sql/sql_string.cc:
  fixed layout
sql/sql_table.cc:
  fixed layout
sql/stacktrace.c:
  fixed layout
2002-12-28 01:01:05 +02:00
bell@sanja.is.com.ua
fe9e139056 postreview fix (SCRUM)
fixed layout
2002-12-28 01:01:05 +02:00
unknown
dcf6470f31 merge fixes
mysql-test/r/derived.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.cc:
  Fixes for merge ...
2002-12-26 20:04:22 +02:00
Sinisa@sinisa.nasamreza.org
5a44f2bc26 merge fixes 2002-12-26 20:04:22 +02:00
unknown
1dfa625f7b support of subselect without FROM reducing (SCRUM)
fixed bug of calling setup_fields without correct lex->current_select pointer in mysql_derived
more correct creation of reference in Item_field::fix_field


mysql-test/r/subselect.result:
  new explain with subselect reduced
mysql-test/t/subselect.test:
  new explain with subselect reduced
sql/item.cc:
  support of subselect without FROM reducing
  more correct creation of reference in Item_field::fix_field
sql/item.h:
  support of subselect without FROM reducing
sql/item_cmpfunc.cc:
  support of subselect without FROM reducing
sql/item_cmpfunc.h:
  support of subselect without FROM reducing
sql/item_func.cc:
  support of subselect without FROM reducing
sql/item_func.h:
  support of subselect without FROM reducing
sql/item_row.cc:
  support of subselect without FROM reducing
sql/item_row.h:
  support of subselect without FROM reducing
sql/item_strfunc.h:
  fixed layout
  support of subselect without FROM reducing
sql/item_subselect.cc:
  support of subselect without FROM reducing
sql/item_subselect.h:
  support of subselect without FROM reducing
sql/mysql_priv.h:
  reference in Item_field::fix_field related changes
sql/sql_base.cc:
  reference in Item_field::fix_field related changes
sql/sql_derived.cc:
  fixed bug of calling setup_fields without correct lex->current_select pointer
2002-12-26 01:28:59 +02:00
bell@sanja.is.com.ua
1dd7cb52ae support of subselect without FROM reducing (SCRUM)
fixed bug of calling setup_fields without correct lex->current_select pointer in mysql_derived
more correct creation of reference in Item_field::fix_field
2002-12-26 01:28:59 +02:00
unknown
e10a326790 merging
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
2002-12-25 11:09:19 +02:00
bell@sanja.is.com.ua
980ca35645 merging 2002-12-25 11:09:19 +02:00
unknown
5895f3772e Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-derived-4.1


sql/item.cc:
  Auto merged
2002-12-24 14:08:44 +02:00
bell@sanja.is.com.ua
61ae697837 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-derived-4.1
2002-12-24 14:08:44 +02:00
unknown
f46decc780 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2002-12-24 14:02:42 +02:00
Sinisa@sinisa.nasamreza.org
7f304a2746 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-24 14:02:42 +02:00
unknown
2a6461588d less default_charset_info 2002-12-20 18:08:49 +04:00
bar@bar.mysql.r18.ru
1b6c65c183 less default_charset_info 2002-12-20 18:08:49 +04:00
unknown
a05b0f087c row IN subselects (SCRUM)
mysql-test/r/subselect.result:
  test of row IN subslect
mysql-test/t/subselect.test:
  test of row IN subslect
sql/item.cc:
  New helper Item - reference on item list by number
  cache item for row
sql/item.h:
  layout fixed 
  New helper Item - reference on item list by number
  cache item for row
sql/item_cmpfunc.cc:
  changed Item_in_optimizer to be able work with row
sql/item_cmpfunc.h:
  changed Item_in_optimizer to be able work with row
sql/item_row.cc:
  Fixed row Item to be compatible with row subselect
sql/item_row.h:
  Fixed row Item to be compatible with row subselect
sql/item_subselect.cc:
  changed name of class to corerectly reflex its function
  row IN subselect
sql/item_subselect.h:
  changed name of class to corerectly reflex its function
  row IN subselect
sql/sql_class.cc:
  changed name of class to corerectly reflex its function
sql/sql_class.h:
  changed name of class to corerectly reflex its function
sql/sql_yacc.yy:
  changed name of class to corerectly reflex its function
2002-12-19 21:15:09 +02:00
bell@sanja.is.com.ua
b63f230346 row IN subselects (SCRUM) 2002-12-19 21:15:09 +02:00
unknown
900a86f631 Item_in_optimizer is changed to be used with row IN subselect (SCRUM)
removed unused items


sql/item.cc:
  removed unused Items
sql/item.h:
  removed unused Items
sql/item_cmpfunc.cc:
  Item_in_optimizer is changed to be used with row IN subselect
sql/item_cmpfunc.h:
  Item_in_optimizer is changed to be used with row IN subselect
sql/item_subselect.cc:
  Item_in_optimizer is changed to be used with row IN subselect
2002-12-19 13:35:12 +02:00
bell@sanja.is.com.ua
54c7afd2a5 Item_in_optimizer is changed to be used with row IN subselect (SCRUM)
removed unused items
2002-12-19 13:35:12 +02:00
unknown
1bc932384b Merge
include/mysql_com.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
libmysqld/libmysqld.c:
  e
  merging with vva's code.
2002-12-19 14:57:24 +04:00
hf@deer.mysql.r18.ru
8a205e4ba3 Merge 2002-12-19 14:57:24 +04:00
unknown
86ccbe3727 support of simple row subselects (SCRUM)
mysql-test/r/subselect.result:
  test of simple row subselect
  fixed table droping
mysql-test/t/subselect.test:
  test of simple row subselect
  fixed table dropimg
sql/item.cc:
  Item_cache_str fixed to correctly store NULL and copy string value
sql/item.h:
  Item_cache_str fixed to correctly store NULL and copy string value
sql/item_cmpfunc.cc:
  support of simple row subselects
sql/item_subselect.cc:
  support of simple row subselects
sql/item_subselect.h:
  support of simple row subselects
sql/sql_class.cc:
  support of simple row subselects
2002-12-19 07:38:33 +02:00
bell@sanja.is.com.ua
4cfb6d97b5 support of simple row subselects (SCRUM) 2002-12-19 07:38:33 +02:00
unknown
9528812119 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/item.cc:
  Auto merged
2002-12-19 07:38:30 +02:00
Sinisa@sinisa.nasamreza.org
4158538dc7 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-19 07:38:30 +02:00
unknown
b29cc128bf thd_charset has been moved to variables structure 2002-12-19 09:38:28 +04:00
bar@bar.mysql.r18.ru
6ac401b550 thd_charset has been moved to variables structure 2002-12-19 09:38:28 +04:00
unknown
65e12f2ffe fixed derived table visibility scope for derived tables with union
mysql-test/r/derived.result:
  test of error messages
mysql-test/t/derived.test:
   SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b;
2002-12-17 23:18:19 +02:00