Commit graph

407 commits

Author SHA1 Message Date
unknown
8b09f4b074 samall optimisation (any independent query will not save data for rexecution)
saving/restoring join_tab array (to save it of chnging by create_sort_index() before reexecuting)
(BUG#1523)


mysql-test/r/subselect.result:
  test of BUG#1523
mysql-test/t/subselect.test:
  test of BUG#1523
sql/sql_select.cc:
  samall optimisation (any independent query will not save data for rexecution)
  layout fix
  saving/restoring join_tab array (to save it of chnging by create_sort_index() before reexecuting)
sql/sql_select.h:
  field for storing saved join_tab_array
2003-10-10 21:49:48 +03:00
unknown
1db2b4e60e Some simple optimisation
= ANY and <> ALL converted to (NOT) IN to get advantage of IN optimisation


mysql-test/r/subselect.result:
  test of new optimisation
mysql-test/t/subselect.test:
  test of new optimisation
sql/mysql_priv.h:
  new function for subquery creation
sql/sql_parse.cc:
  layout fix
  new function for subquery creation (convert some ALL/ANY to IN)
sql/sql_yacc.yy:
  same code blocks replaced with function
2003-10-08 17:40:54 +03:00
unknown
0f81ecf501 fixed error handling in SET and DO operators (BUG#1484)
mysql-test/r/subselect.result:
  test for BUG#1484
mysql-test/t/subselect.test:
  layout fix
  test for BUG#1484
sql/set_var.cc:
  value evaluating can fail (because of subqueries for example) => we should check result of operartion and prevent assigning incorrect value
sql/sql_do.cc:
  DO should ignore all errors
2003-10-08 11:19:09 +03:00
unknown
ac68b4e172 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-10-07 21:01:57 +03:00
unknown
0059448152 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
2003-10-07 01:31:16 +03:00
unknown
bd3beb8383 fixed error names
mysql-test/r/row.result:
  fixed error message as it was suggested by Peter Gulutzan
mysql-test/r/subselect.result:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/czech/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/danish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/dutch/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/english/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/estonian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/french/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/german/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/greek/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/hungarian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/italian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/japanese/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/korean/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/norwegian-ny/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/norwegian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/polish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/portuguese/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/romanian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/russian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/serbian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/slovak/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/spanish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/swedish/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
sql/share/ukrainian/errmsg.txt:
  fixed error message as it was suggested by Peter Gulutzan
2003-10-06 22:35:05 +03:00
unknown
ff8c8fa1ef Merge
mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
2003-10-06 20:55:06 +03:00
unknown
9f7674c894 fix error messages
fix derived inside subqueries


mysql-test/r/subselect.result:
  error tex changes whi i forgot to commit
mysql-test/t/derived.test:
  code changing
sql/sql_yacc.yy:
  allow derived inside subselects
2003-10-06 13:16:56 +03:00
unknown
e085cada8d Subselect -> subquery 2003-09-30 11:40:15 -05:00
unknown
cd8508d371 Merging 4.1 -> 5.0
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
BitKeeper/deleted/.del-sel000100.result~84ed46856cb3a69f:
  Auto merged
BitKeeper/deleted/.del-sel000100.test~548501cad19a1a59:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysys/my_pthread.c:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-09-24 11:29:38 +02:00
unknown
e603c1efde fixed processing aggregate functions with static tables (BUG#1318)
mysql-test/r/func_group.result:
  test of BUG#1318
mysql-test/r/subselect.result:
  correct results
mysql-test/t/func_group.test:
  test of BUG#1318
sql/sql_select.cc:
  hixed processing of static tables
2003-09-20 18:30:36 +03:00
unknown
04d1b04edd fixed proccesing global LIMIT in last SELECT of UNION
mysql-test/r/subselect.result:
  correct results
mysql-test/r/union.result:
  correct results
mysql-test/t/subselect.test:
  to be sure that results are correct
sql/sql_parse.cc:
  comment + TODO
2003-09-14 22:12:55 +03:00
unknown
e3b11b1de7 renamed join_types (as was suggested by Peter Gulutzan) 2003-09-14 09:40:57 +03:00
unknown
aedc0ab098 Fixes for OPTION_FOUND_ROWS in UNION's
mysql-test/r/subselect.result:
  A warning added to subselect test due to the recent changes.
  
  UNION in sub-select returns the empty set, which is why this warning is
  a mistery to me.
mysql-test/r/union.result:
  two changes.
  
  First one is due to the proper handling of LIMIT offset, limit in 
  UNION without all.
  
  Second is a change in behaviour due to the fact that ORDER by in a 
  UNION without braces is not now applicable to the last SELECT node.
  
  It can not be applied until one bug is fixed (after my vacation).
  
  Should be documented.
2003-09-13 19:56:58 +03:00
unknown
42eb434993 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
2003-09-10 09:43:30 +03:00
unknown
479c3766d6 after merge fix 2003-09-09 23:07:39 +03:00
unknown
62a33db03b merge
mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
2003-09-09 22:26:19 +03:00
unknown
b2a6994b22 Fix for a bug #1226.
Happens when braces are used on a single select, which leads
to the uninitialized global parameters structure.
2003-09-09 15:23:38 +03:00
unknown
d17cfa9caa removing additional IN subquery condition
fixed IN optimisation bug


mysql-test/r/subselect.result:
  test of IN optimisation bug
mysql-test/t/subselect.test:
  test of IN optimisation bug
sql/item_subselect.cc:
  fixed IN optimisation bug
sql/mysql_priv.h:
  constant for additional IN subquery condition detecting
sql/mysqld.cc:
  constant for additional IN subquery condition detecting
sql/sql_select.cc:
  removing additional IN subquery condition
2003-09-08 21:58:09 +03:00
unknown
57c9756b69 fixed row union processing
mysql-test/r/subselect.result:
  row union test
mysql-test/t/subselect.test:
  row union test
2003-09-07 20:35:10 +03:00
unknown
85f7a6978b reset() split in 2 function clear() & add()
aggregate function reinitialization (if no rows was found) made with help of clear()
(fixed BUG#860)


mysql-test/r/subselect.result:
  test for BUG#860
mysql-test/t/subselect.test:
  test for BUG#860
sql/item_sum.cc:
  reset() replaced with clear()
sql/item_sum.h:
  reset() replaced with clear()
  (reset now is just composition of clear() and add())
sql/item_uniq.h:
  reset() replaced with clear()
sql/sql_select.cc:
  removed NULL value assigment, now it will be done by clear() call
  function for clearing if there was not found any row in group
sql/sql_select.h:
  function for clearing if there was not found any row in group
2003-08-28 03:10:14 +03:00
unknown
542440e823 after merge fix 2003-08-26 17:45:42 +03:00
unknown
97354d0699 merge
sql/item.cc:
  Auto merged
2003-08-26 16:49:53 +03:00
unknown
138f0adf2d Merge 4.1 into 5.0
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/insert.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/my_pthread.c:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
2003-08-26 11:51:09 +02:00
unknown
12b769418a Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2003-08-23 13:33:02 +03:00
unknown
93afa26ea7 fixed bug of lack of fix_fields call (after merge bugfix (SCRUM))
fixed bug in Item_sum
fixed bug in dependence remover
after merge fix


mysql-test/r/subselect.result:
  after merge fix
mysql-test/r/union.result:
  new test
mysql-test/t/subselect.test:
  after merge fix
mysql-test/t/union.test:
  new test
sql/item.cc:
  fixed returned value
sql/item.h:
  fixed flag dropper
  (I was not able to find Item whicj need more to be fix_fielded twice)
sql/item_subselect.h:
  fixed initialisation
sql/item_sum.cc:
  fixed absence of walk method of Item_sum
sql/item_sum.h:
  fixed absence of walk method of Item_sum
sql/mysql_priv.h:
  setup_fields reverter
sql/sql_base.cc:
  setup_fields reverter
sql/sql_derived.cc:
  fixed bug of lack of fix_fields call
sql/sql_union.cc:
  fixed bug of lack of fix_fields call
2003-08-23 13:29:38 +03:00
unknown
78f54936a7 merge
mysql-test/r/subselect.result:
  correct result after merging with fixed Item_in_optimiser::fix_left()
mysql-test/t/subselect.test:
  error code changed
2003-08-21 00:41:08 +03:00
unknown
97ee3f15ab merge
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
2003-08-20 23:39:17 +03:00
unknown
8c93e8ceb6 merge
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-08-20 22:17:57 +03:00
unknown
6d0a048701 merge
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
2003-08-19 20:14:35 +03:00
unknown
755e72a0f5 merge
configure.in:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-08-19 00:10:21 +03:00
unknown
2901c3b8fa After merge fixes
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings


BitKeeper/deleted/.del-convert.result~a3b56e1db6f498e9:
  Delete: mysql-test/r/convert.result
BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72:
  Delete: mysql-test/t/convert.test
BitKeeper/deleted/.del-make_win_src_distribution.old~5c9ebdc4a852b43b:
  Delete: scripts/make_win_src_distribution.old
client/mysql.cc:
  Use server character set if --default-character-set is not used
client/mysqltest.c:
  Code cleanup (merge identical code)
  More debug messages
heap/hp_create.c:
  After merge fix
include/m_ctype.h:
  After merge fix
include/my_global.h:
  Remove size_str (we already have size_s)
include/mysql_com.h:
  After merge fix
libmysql/libmysql.c:
  After merge fix
libmysqld/Makefile.am:
  After merge fix
mysql-test/r/auto_increment.result:
  After merge fix
mysql-test/r/create.result:
  After merge fix
mysql-test/r/ctype_latin1_de.result:
  After merge fix
mysql-test/r/distinct.result:
  After merge fix
mysql-test/r/drop.result:
  After merge fix
mysql-test/r/fulltext.result:
  After merge fix
mysql-test/r/func_gconcat.result:
  After merge fix
mysql-test/r/func_str.result:
  After merge fix
mysql-test/r/func_test.result:
  After merge fix
mysql-test/r/grant.result:
  After merge fix
mysql-test/r/group_by.result:
  After merge fix
mysql-test/r/handler.result:
  After merge fix
mysql-test/r/heap.result:
  After merge fix
mysql-test/r/heap_btree.result:
  After merge fix
mysql-test/r/heap_hash.result:
  After merge fix
mysql-test/r/innodb.result:
  After merge fix
mysql-test/r/insert.result:
  After merge fix
mysql-test/r/insert_select.result:
  After merge fix
mysql-test/r/join_outer.result:
  After merge fix
mysql-test/r/key.result:
  After merge fix
mysql-test/r/key_cache.result:
  After merge fix
mysql-test/r/loaddata.result:
  After merge fix
mysql-test/r/myisam.result:
  After merge fix
mysql-test/r/null.result:
  After merge fix
mysql-test/r/null_key.result:
  After merge fix
mysql-test/r/order_by.result:
  After merge fix
mysql-test/r/rpl_do_grant.result:
  After merge fix
mysql-test/r/rpl_error_ignored_table.result:
  After merge fix
mysql-test/r/rpl_ignore_grant.result:
  After merge fix
mysql-test/r/rpl_loaddata.result:
  After merge fix
mysql-test/r/rpl_log.result:
  After merge fix
mysql-test/r/rpl_log_pos.result:
  After merge fix
mysql-test/r/rpl_max_relay_size.result:
  After merge fix
mysql-test/r/rpl_replicate_do.result:
  After merge fix
mysql-test/r/rpl_reset_slave.result:
  After merge fix
mysql-test/r/rpl_rotate_logs.result:
  After merge fix
mysql-test/r/rpl_user_variables.result:
  After merge fix
mysql-test/r/select.result:
  After merge fix
mysql-test/r/select_safe.result:
  After merge fix
mysql-test/r/subselect.result:
  After merge fix
mysql-test/r/type_blob.result:
  After merge fix
mysql-test/r/type_decimal.result:
  After merge fix
mysql-test/r/type_float.result:
  After merge fix
mysql-test/r/type_ranges.result:
  After merge fix
mysql-test/r/type_time.result:
  After merge fix
mysql-test/r/type_uint.result:
  After merge fix
mysql-test/r/union.result:
  After merge fix
mysql-test/r/warnings.result:
  After merge fix
mysql-test/t/auto_increment.test:
  After merge fix
mysql-test/t/case.test:
  After merge fix
mysql-test/t/ctype_collate.test:
  After merge fix
mysql-test/t/ctype_latin1_de.test:
  After merge fix
mysql-test/t/drop.test:
  After merge fix
mysql-test/t/func_in.test:
  After merge fix
mysql-test/t/func_set.test:
  After merge fix
mysql-test/t/func_str.test:
  After merge fix
mysql-test/t/func_test.test:
  After merge fix
mysql-test/t/grant.test:
  After merge fix
mysql-test/t/group_by.test:
  After merge fix
mysql-test/t/handler.test:
  After merge fix
mysql-test/t/heap.test:
  After merge fix
mysql-test/t/heap_btree.test:
  After merge fix
mysql-test/t/heap_hash.test:
  After merge fix
mysql-test/t/innodb.test:
  After merge fix
mysql-test/t/insert_select.test:
  After merge fix
mysql-test/t/key.test:
  After merge fix
mysql-test/t/key_cache.test:
  After merge fix
mysql-test/t/lock_tables_lost_commit-master.opt:
  After merge fix
mysql-test/t/lock_tables_lost_commit.test:
  After merge fix
mysql-test/t/myisam.test:
  After merge fix
mysql-test/t/row.test:
  After merge fix
mysql-test/t/subselect.test:
  After merge fix
mysql-test/t/type_decimal.test:
  After merge fix
mysql-test/t/type_ranges.test:
  After merge fix
mysql-test/t/type_uint.test:
  After merge fix
mysql-test/t/variables.test:
  After merge fix
mysql-test/t/warnings.test:
  After merge fix
scripts/make_win_src_distribution.sh:
  after merge fixes
sql-common/client.c:
  After merge fix
  Change my_connect() to use poll()
  If character set is not given, use servers character set.
sql/field.cc:
  After merge fix
  Don't give warnings when storing data in fields in optimizer.
sql/ha_myisammrg.h:
  After merge fix
sql/log.cc:
  After merge fix
sql/log_event.cc:
  After merge fix
sql/mysqld.cc:
  After merge fix
sql/opt_range.cc:
  After merge fix
sql/set_var.cc:
  Code cleanup
  Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps
sql/set_var.h:
  Fixed wrong usage of base_names (like medium.key_buffer) that caused core dumps
sql/slave.cc:
  After merge fix
sql/sql_acl.cc:
  After merge fix
  Code cleanup
sql/sql_class.cc:
  Added convert_string() for more efficient alloc+character-set convert of strings
  Add cached flags to avoid calling mysql_charset_same() during parsing.
sql/sql_class.h:
  Added convert_string() for more efficient alloc+character-set convert of strings
  Add cached flags to avoid calling mysql_charset_same() during parsing.
sql/sql_handler.cc:
  After merge fix
sql/sql_lex.h:
  After merge fix
sql/sql_parse.cc:
  Optimize and fix memory reference errors reported by valgrind
sql/sql_repl.cc:
  After merge fix
sql/sql_yacc.yy:
  After merge fix
  Avoid calling mysql_charset_same() when parsing identifiers
strings/ctype-latin1.c:
  Port latin_de conversion code from 4.0
2003-08-19 00:08:08 +03:00
unknown
22422b7813 after merge fix 2003-08-12 18:51:49 +03:00
unknown
d7149a5ba6 merge
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-08-12 17:48:58 +03:00
unknown
964ffc34b1 optimisation of independent ALL/ANY with aggregate function (WL#1115) (SCRUM)
mysql-test/r/subselect.result:
  test of new optimisation
mysql-test/t/subselect.test:
  test of new optimisation
sql/item_subselect.cc:
  special subselect to finding max/min of returned values
  optimisation of independent ALL/ANY with aggregate function
sql/item_subselect.h:
  special subselect to finding max/min of returned values
sql/sql_class.cc:
  class for collaction result for max/min subquery
sql/sql_class.h:
  class for collaction result for max/min subquery
2003-08-12 12:38:03 +03:00
unknown
68f8339158 fixed collation of Item_cache family (BUG#951)
mysql-test/r/subselect.result:
  test of collation
mysql-test/t/subselect.test:
  test of collation
sql/item.cc:
  coping collation in the cache
sql/item.h:
  coping collation in the cache
2003-08-11 20:48:51 +03:00
unknown
c2b8eb33d2 merge
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-08-11 12:00:33 +03:00
unknown
7b44d753d0 merge
sql/sql_union.cc:
  Auto merged
2003-08-09 16:53:23 +03:00
unknown
9b16dd8962 fixed union unlocking problem (BUG#906)
mysql-test/r/subselect.result:
  test of union unlocking problem
mysql-test/t/subselect.test:
  test of union unlocking problem
sql/sql_union.cc:
  prohibit unlocking all tables by fake select execution
2003-08-09 14:39:54 +03:00
unknown
57e31f158b fixed bug in used_tables() report of left expression of IN subquery
fixed number of rows of external field reported to optimizer
added check of choosen key (checked left expression tag)
(SCRUM fix for simple IN optimisation)


mysql-test/r/subselect.result:
  new EXPLAIN results ufter fixing used_tables() of Item_cache
sql/item_cmpfunc.cc:
  fixed used_tables asignment
sql/item_subselect.cc:
  added left expression referenca tag
sql/item_subselect.h:
  fixed layout
sql/mysql_priv.h:
  left expression reference tag
sql/mysqld.cc:
  left expression reference tag
sql/sql_select.cc:
  checked left expression reference tag
  fixed number of rows in outer reference (it should be constant)
2003-08-07 11:16:02 +03:00
unknown
4a8ab8ac56 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-08-05 09:58:00 +03:00
unknown
6181294dab merge
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-08-05 09:56:21 +03:00
unknown
875a26d50a merge
sql/item.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-08-01 18:24:27 +03:00
unknown
a3e261437a merge
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
mysql-test/r/subselect.result:
  merge
  fixed test
mysql-test/t/subselect.test:
  merge
  fixed test
2003-08-01 16:51:54 +03:00
unknown
53e4153de1 Derivation attribute was not processed correctly
by MAX/MIN in some cases:
SELECT coercibility(max(s1)) from t1;

Subselect collation and derivation was not processed
correctly:

create table a select (select s1 from t1);
select * from t1 where s1 = (select s2 from t1);
2003-07-30 14:15:25 +05:00
unknown
668cd9729f prevented finding references in item_list for non-SELECT st_select_lex
(fixed BUG#943)


mysql-test/r/subselect.result:
  test for bug 943
mysql-test/t/subselect.test:
  test for bug 943
sql/item.cc:
  bool field changed with enum
  prevented finding references in item_list for non-SELECT st_select_lex
sql/sql_lex.cc:
  bool field changed with enum
sql/sql_lex.h:
  bool field changed with enum
sql/sql_parse.cc:
  all subqueries and UNION parts marked as SELECT
sql/sql_yacc.yy:
  bool field changed with enum
  PRIMARY SELECT command st_select_lex marked as SELECT
2003-07-29 16:59:46 +03:00
unknown
0792c1c824 count HAVING clause elements with select list elements, because agregate function can be present in it (BUG#922)
removerd unused loop_id


mysql-test/r/subselect.result:
  test of BUG#922
mysql-test/t/subselect.test:
  test of BUG#922
sql/item.cc:
  removerd unused loop_id
  we need count HAVING clause elements, because agregate function can be present in it
sql/item.h:
  removerd unused loop_id
sql/item_subselect.cc:
  new name of field
sql/sql_derived.cc:
  new name of field
sql/sql_lex.cc:
  new name of field
sql/sql_lex.h:
  new name of field
sql/sql_select.cc:
  new name of field
sql/sql_union.cc:
  new name of field
2003-07-29 13:00:32 +03:00
unknown
7ec21e9fc4 added warning about external fields resolving to EXPLAIN command
(SCRUM) (WL#1053)


include/mysqld_error.h:
  new warning
mysql-test/r/subselect.result:
  new warning
sql/item.cc:
  warning for external fields resolving
sql/share/czech/errmsg.txt:
  new warning
sql/share/danish/errmsg.txt:
  new warning
sql/share/dutch/errmsg.txt:
  new warning
sql/share/english/errmsg.txt:
  new warning
sql/share/estonian/errmsg.txt:
  new warning
sql/share/french/errmsg.txt:
  new warning
sql/share/german/errmsg.txt:
  new warning
sql/share/greek/errmsg.txt:
  new warning
sql/share/hungarian/errmsg.txt:
  new warning
sql/share/italian/errmsg.txt:
  new warning
sql/share/japanese/errmsg.txt:
  new warning
sql/share/korean/errmsg.txt:
  new warning
sql/share/norwegian-ny/errmsg.txt:
  new warning
sql/share/norwegian/errmsg.txt:
  new warning
sql/share/polish/errmsg.txt:
  new warning
sql/share/portuguese/errmsg.txt:
  new warning
sql/share/romanian/errmsg.txt:
  new warning
sql/share/russian/errmsg.txt:
  new warning
sql/share/serbian/errmsg.txt:
  new warning
sql/share/slovak/errmsg.txt:
  new warning
sql/share/spanish/errmsg.txt:
  new warning
sql/share/swedish/errmsg.txt:
  new warning
sql/share/ukrainian/errmsg.txt:
  new warning
2003-07-25 01:02:42 +03:00
unknown
9a3979e234 independent ALL/ANY subselect on top of WHERE clause (subselect without GROUP BY or aggregate functions) optimisation
(SCRUM) (WL#1086)


mysql-test/r/subselect.result:
  new optimisation tests
mysql-test/t/subselect.test:
  new optimisation tests
sql/item_cmpfunc.cc:
  new NOT
sql/item_cmpfunc.h:
  new NOT
sql/item_subselect.cc:
  independent ALL/ANY in top of WHERE clause optimisation
sql/item_subselect.h:
  independent ALL/ANY in top of WHERE clause optimisation
sql/item_sum.cc:
  prevent fixlields call for parameters of min/max if it is already done
sql/sql_union.cc:
  removed debuging print
sql/sql_yacc.yy:
  support of ALL optimisation
2003-07-24 15:26:21 +03:00
unknown
ed8be699fe new optimisation for ref_null (SCRUM) (WL#818)
mysql-test/r/subselect.result:
  results of new optimisation
mysql-test/t/subselect.test:
  results of new optimisation
sql/item_cmpfunc.h:
  function type
sql/item_func.h:
  function type
sql/item_subselect.cc:
  new optimisation for ref_or_null
sql/item_subselect.h:
  new optimisation for ref_or_null
sql/sql_select.cc:
  new optimisation for ref_or_null
sql/sql_select.h:
  item_subselect.cc need safe_index_read
2003-07-17 19:39:31 +03:00