Commit graph

2772 commits

Author SHA1 Message Date
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
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
unknown
cbd4de0ab8 Merge abelkin@work.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
2003-01-04 17:52:19 +02:00
unknown
e6a76efa29 Fix bug with shared memory's variables
sql/mysql_priv.h:
  Fix bugs with shared memory's variables
sql/mysqld.cc:
  Fix bugs with shared memory's variables
2003-01-04 20:33:17 +05:00
unknown
161c22cbfb fixed SET with subselect
mysql-test/r/subselect.result:
  test of SET with subselect
mysql-test/t/subselect.test:
  test of SET with subselect
2003-01-04 16:33:42 +02:00
unknown
f584778536 Index.xml:
"compiled" flag


sql/share/charsets/Index.xml:
  "compiled" flag
2003-01-04 14:50:15 +04:00
unknown
5bdee64bf0 .del-Index~a8f78510440e2fc4:
Delete: sql/share/charsets/Index


BitKeeper/deleted/.del-Index~a8f78510440e2fc4:
  Delete: sql/share/charsets/Index
2003-01-04 14:25:05 +04:00
unknown
782295137b Some changes to separate charset and collation terms 2003-01-04 14:12:20 +04:00
unknown
22e4c484e7 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1


sql/field.cc:
  Auto merged
2003-01-03 23:44:24 -08:00
unknown
594bfe01bf Fix date,time,timestamp,year - binary protocol 2003-01-03 23:37:16 -08:00
unknown
a644e002ce Fix warnings and error VC++ compiler
client/mysql.cc:
  Removing unreferenced variables
sql/sql_test.cc:
  Fix VC++ compiler error that doesn't permits the declaration and
  initialization of variables that can be skipped by the prior
  goto end instruction.
2003-01-04 01:19:17 -02:00
unknown
8aa2e87a78 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-do-4.1


sql/sql_parse.cc:
  Auto merged
2003-01-03 19:35:14 +02:00
unknown
2ca6d018d7 fixed do with subselects
mysql-test/r/subselect.result:
  test of DO with subselects
mysql-test/t/subselect.test:
  test of DO with subselects
2003-01-03 17:08:00 +02:00
unknown
916697f121 Merge pzaitsev@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pz/mysql/mysql-4.1-root
2003-01-03 17:30:03 +03: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
unknown
7df75ca76a Further fix for export class problem 2003-01-03 15:07:40 +02:00
unknown
9a4a8bd2bc Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2003-01-03 15:39:16 +03:00
unknown
ce8b1f9b79 Merge myvenu.com:/home/venu/bk/src-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1


sql/field.cc:
  Auto merged
2003-01-03 03:54:18 -08:00
unknown
218e9524a6 Binary protocol changes (to monty) 2003-01-03 03:52:53 -08:00
unknown
389cec7d99 Charset index is sotred in XML now 2003-01-03 14:35:32 +04:00
unknown
6d4d487326 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2003-01-02 18:54:22 +03:00
unknown
e79e53dcb3 SCRUM password() function changes.
sql/item_strfunc.cc:
  Fix password() function according Monty's comment
2003-01-02 18:04:02 +03:00
unknown
3d698ba93f Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4rw 2003-01-02 19:18:18 +05:00
unknown
c7901f2f1e Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2003-01-02 16:18:38 +03: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
unknown
4e34255e5a Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-01-01 20:11:18 +03:00
unknown
be551fd943 Fix for QUOTE() function. 2003-01-01 15:59:35 +04: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
unknown
d78d76f114 A fix for a charset bug in the select_export (select into
outfile) class.
2002-12-31 18:01:53 +02:00
unknown
178bce1447 Fixed duplicate of handle_count in __NT__ section
sql/mysqld.cc:
  Fixed duplicate of handle_count
2002-12-31 17:01:53 +05:00
unknown
666e150920 Change locks in sql_udf.cc to rw_locks (SCRUM)
sql/sql_udf.cc:
  Change locks to rw_locks
2002-12-31 16:58:41 +05: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
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
unknown
ed68b61536 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1


sql/sql_table.cc:
  Auto merged
2002-12-30 15:16:12 -08:00
unknown
cbe18bae8b pure coverage test updates 2002-12-30 15:10:10 -08: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
unknown
4fa6912c2d Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


sql/sql_parse.cc:
  Auto merged
2002-12-30 11:10:23 +03: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
unknown
af3f9524f1 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_TEMPORARY/4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
2002-12-30 01:59:08 +04:00
unknown
8dceb7c051 processing thread specific queries
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-12-30 01:46:48 +04:00
unknown
b448b12788 Merge
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-12-29 20:06:43 +03:00
unknown
dd9a101098 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1


sql/sql_yacc.yy:
  Auto merged
2002-12-29 18:41:58 +02:00
unknown
13587ca070 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-12-28 21:37:16 +02:00
unknown
84a9a9fe5b aliases with multi-table updates / deletes
fix for a bug with derived tables and query cache
ix for a charset bug in timestamp


mysql-test/r/multi_update.result:
  aliases with multi-table updates / deletes
mysql-test/r/query_cache.result:
  fix for query cache with derived tables
mysql-test/t/multi_update.test:
  aliases with multi-table updates / deletes
mysql-test/t/outfile.test:
  Fix of bug with charset in timestamp
mysql-test/t/query_cache.test:
  fix for a bug with derived tables and query cache
sql/field.cc:
  fix for a charset bug in timestamp
sql/sql_parse.cc:
  aliases with multi-table updates / deletes
sql/sql_yacc.yy:
  aliases with multi-table updates / deletes
2002-12-28 21:34:17 +02:00
unknown
4e56ad9204 sql_table.cc:
Fix CREATE LIKE TABLE .. temporary case


sql/sql_table.cc:
  Fix CREATE LIKE TABLE .. temporary case
2002-12-28 01:38:29 -08: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
unknown
7388e9bd5b Merge sanja.is.com.ua:/home/bell/mysql/work-row-4.1
into sanja.is.com.ua:/home/bell/mysql/work-from-4.1


sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
2002-12-27 21:36:56 +02:00
unknown
d201a34e8c postreview fix 2002-12-27 21:19:25 +02:00
unknown
acef866008 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
2002-12-27 21:42:21 +03:00
unknown
3db50925c7 SCRUM
Add optional second parameter to password() function. It can be used to force password()
to return fixed values. 


mysql-test/r/func_crypt.result:
  New test results
mysql-test/t/func_crypt.test:
  new tests
sql/item_strfunc.cc:
  Add optional second argument to password() function
sql/item_strfunc.h:
  New method
sql/sql_yacc.yy:
  Handling of password with 2 arguments
2002-12-27 19:47:23 +03:00