Commit graph

314 commits

Author SHA1 Message Date
unknown
a9457c573d fixed optimized SOME subquery
mysql-test/r/subselect.result:
  correct results of SOME subquery
sql/item_cmpfunc.cc:
  some comments added
  fixed optimized SOME subquery
2004-12-13 01:21:14 +02:00
unknown
3ce0df5937 new reference which refer to current value not to result used for resolving outer
refernces if subqueri is not in HAVING clause (BUG#7079)
  and the same used for subquery transformetion


mysql-test/r/subselect.result:
  reference on changable fields from subquery
mysql-test/t/subselect.test:
  reference on changable fields from subquery
sql/item.cc:
  new reference which refer to current value not to result used
sql/item.h:
  new reference which refer to current value not to result used
sql/item_subselect.cc:
  new reference which refer to current value not to result used
2004-12-11 17:13:19 +02:00
unknown
b9d9c31430 merge
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2004-12-07 09:07:37 +02:00
unknown
b2f7b5bd64 merge 2004-12-03 23:24:41 +02:00
unknown
0a24ac9ed2 Merge
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
2004-12-01 10:25:11 +02:00
unknown
8127cea512 init values to avoid junk returning in case of null value asking without assigning value (BUG#6806)
mysql-test/r/subselect.result:
   Equal operation under row and empty subquery
mysql-test/t/subselect.test:
   Equal operation under row and empty subquery
sql/item.h:
  init values to avoid junk returning in case of null value asking without assigning value
2004-11-25 22:54:49 +02:00
unknown
4389be7557 Fix for bug #6462 "Same request on same data returns different
results." a.k.a. "Proper cleanup of subqueries is missing for SET and DO
statements". (Version #2 with after-review fixes).

To perform proper cleanup for statements that can contain subqueries 
but don't have main select we must call free_undelaid_joins().


mysql-test/r/subselect.result:
  Added test for bug #6462 "Same request on same data returns different
  results." a.k.a. "Proper cleanup of subqueries is missing for SET and DO
  statements".
mysql-test/t/subselect.test:
  Added test for bug #6462 "Same request on same data returns different
  results." a.k.a. "Proper cleanup of subqueries is missing for SET and DO
  statements".
sql/set_var.cc:
  Added missing cleanup of joins used in subqueries to SET statement.
sql/sql_do.cc:
  Added missing cleanup of joins used in subqueries to DO statement.
2004-11-22 13:05:10 +03:00
unknown
9438c2ca76 reporting empty result added in case of max/min optimisation of ALL/ANY/SOME subqueries
fixed null processing in NOT operation used in ALL subquery (Bug #6247)


mysql-test/r/subselect.result:
  new tests of ALL/ANY wiews
mysql-test/t/subselect.test:
  new tests of ALL/ANY wiews
sql/item_cmpfunc.cc:
  fixed special NOT ALL processing
  fixed processing max/min optimized subqueries with empty results (added methods to detect empty results) and special NOP operation to process them for SOME/ANY sobqueries
sql/item_cmpfunc.h:
  fixed processing max/min optimized subqueries with empty results (added methods to detect empty results) and special NOP operation to process them for SOME/ANY sobqueries
sql/item_subselect.cc:
  reporting empty result added for max/min subqueries
sql/item_subselect.h:
  reporting empty result added for max/min subqueries
sql/item_sum.cc:
  reporting empty result added fox max/min aggregate functions
sql/item_sum.h:
  reporting empty result added fox max/min aggregate functions
sql/sql_class.cc:
  reporting empty result added for max/min subqueries
sql/sql_parse.cc:
  reporting empty result added for max/min subqueries
sql/sql_union.cc:
  reporting empty result added for max/min subqueries
2004-11-18 18:10:07 +02:00
unknown
70ed3160d9 backport Serg's fix of FT interface (BUG#6523)
mysql-test/r/subselect.result:
  subqueries with full text search
mysql-test/t/subselect.test:
  subqueries with full text search
sql/ha_myisam.h:
  backport Serg's fix of FT interface
sql/handler.h:
  backport Serg's fix of FT interface
sql/opt_range.h:
  backport Serg's fix of FT interface
sql/sql_select.cc:
  comment for previous patch
2004-11-16 22:58:02 +02:00
unknown
dd93baa00d fixed joincleunup to avoid double deletin tables, and too earlyfull cleanup in case of EXPLAIN
fixed cleunup of TMP_TABLE_PARAM
(BUG#6406)


mysql-test/r/subselect.result:
  primary query with temporary table and subquery with groupping
mysql-test/t/subselect.test:
  primary query with temporary table and subquery with groupping
sql/sql_class.h:
  fixed cleunup of TMP_TABLE_PARAM
sql/sql_select.cc:
  uncacheable test made simplier
  fixed joincleunup to avoid double deletin tables, and too earlyfull cleanup in case of EXPLAIN
2004-11-16 00:16:04 +02:00
unknown
b685909d6a moved procedure list initialization (BUG#6517)
mysql-test/r/subselect.result:
  Subselect in non-select command just after connection
mysql-test/t/subselect.test:
  Subselect in non-select command just after connection
sql/sql_lex.cc:
  moved procedure initialization
sql/sql_parse.cc:
  moved procedure initialization
2004-11-15 14:37:40 +02:00
unknown
464da8f13a removed incorrect error message about aggregate functions
improved mechanisn of detection posibility to be NULL for single row queries
switched off substitution optimisation for single row subqueries in PS due to problem in resolving substituted expressions
(changes to make subselects test working with PS protocol)


mysql-test/r/subselect.result:
  removed incorrect error message about aggregate functions
  improved mechanisn of detection posibility to be NULL for single row queries
mysql-test/t/subselect.test:
  removed incorrect error message about aggregate functions
sql/item_subselect.cc:
  removed incorrect error message about aggregate functions
  switched off substitution optimisation for single row subqueries in PS due to problem in resolving substituted expressions
  improved mechanisn of detection posibility to be NULL for single row queries
sql/item_subselect.h:
  new method to help in NULL ability detection
2004-10-27 21:11:06 +03:00
unknown
9b5cf9464c A fix and test case for Bug#6088 "FOUND_ROWS returns wrong values for
prepared statements when LIMIT is used" and post-review comments.
The fix changes the approach we calculate the need for ORDER BY 
in UNION: the previous was not PS friendly, as it damaged SELECT_LEX 
options in case of single select.


mysql-test/r/ps.result:
  Test results fixed: the test case for Bug#6088
mysql-test/r/subselect.result:
  Test results fixed: now we don't perform ORDER BY for parts of UNION
  if there is no LIMIT clause.
mysql-test/t/ps.test:
  A test case for Bug#6088 "FOUND_ROWS returns wrong values for
   prepared statements when LIMIT is used".
sql/sql_union.cc:
  The actual fix for Bug#6088:
  - don't modify SELECT_LEX'es
  - use boolean variable can_skip_order_by to check if we can skip
    ORDER BY in UNION
2004-10-22 22:51:16 +04:00
unknown
580f12cc04 fixed error handling if creating derived table failed
single row subquery always can return NULL (no rows found) (BUG#5590)


mysql-test/r/subselect.result:
  maybe_null flag returning by subquwery for temporary table creation
mysql-test/t/subselect.test:
  maybe_null flag returning by subquwery for temporary table creation
sql/item.cc:
  storing maybe_null in type holder
sql/item_subselect.cc:
  single row subquery always can return NULL (no rows found)
sql/sql_derived.cc:
  fixed error handling if creating derived table failed
2004-09-17 19:08:46 +03:00
unknown
77ee831d3d fixed temporary table processing expresions of subqueries and removed wrong restrictions of field resolving (BUG#5326)
mysql-test/r/subselect.result:
  tests of fields resolving
mysql-test/t/subselect.test:
  tests of fields resolving
sql/item.cc:
  fixed fild resolving
sql/item_subselect.cc:
  removed aneed call
sql/sql_base.cc:
  fixed case whan we scan un-fixfielded fields
sql/sql_select.cc:
  fixed temporary table processing expresions of subqueries
2004-09-06 13:00:24 +03:00
unknown
c83ef2fdc3 Merging fix 2004-08-24 15:03:44 +05:00
unknown
8854eeda26 Merging 2004-08-24 12:58:21 +05:00
unknown
8d9dca16e2 subselect test split on two tests because gis extention can be absent 2004-08-24 10:15:39 +03:00
unknown
13f7338a3f after review fixes:
allowed parsing of table fields inside aggregate functions
 added new tests of fields resolving in grouping


mysql-test/r/func_gconcat.result:
  allowed parsing of table fields inside aggregate functions
mysql-test/r/subselect.result:
  added new tests of fields resolving in grouping
mysql-test/t/func_gconcat.test:
  allowed parsing of table fields inside aggregate functions
mysql-test/t/subselect.test:
  added new tests of fields resolving in grouping
sql/item_subselect.cc:
  allowed parsing of table fields inside aggregate functions
2004-08-23 22:31:01 +03:00
unknown
e275e347e3 merge
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-08-23 15:50:59 +03:00
unknown
ac4c053852 Proposed fix for bug #5003 (subselect with MIN() and LIKE crashes server)
We have next problem here:
active_index is wrong in the subselect's handler on the second val_int() call.
Optimizer sees that we can use index-read for that kind of condition,
and matching_cond() (sql/opt_sum.cc) doesn't. I suspect, proper solution is
to add appropriate code to the matching_cond() but now just added
missed initialization.


mysql-test/r/subselect.result:
  Appropriate test result
mysql-test/t/subselect.test:
  Test case added
sql/records.cc:
  index's initialization added
2004-08-22 00:06:19 +05:00
unknown
4f8bbaeda0 Bug #4769 - ft in subqueries 2004-08-19 18:40:15 +02:00
unknown
d0c87702f7 skip resolving field in table list if table list is not accessable due to groupping (BUG#4814)
mysql-test/r/func_gconcat.result:
  fix of test queries
mysql-test/r/subselect.result:
  resolving fields of grouped outer SELECT
mysql-test/t/func_gconcat.test:
  fix of test queries
mysql-test/t/subselect.test:
  resolving fields of grouped outer SELECT
sql/item.cc:
  skip resolving field in table list if table list is not accessable due to groupping
  layout fixed
sql/item_subselect.cc:
  detection of place of subquery
sql/item_subselect.h:
  detection of place of subquery
sql/mysql_priv.h:
  enum_parsing_place made global type
sql/sql_lex.cc:
  enum_parsing_place made global type
sql/sql_lex.h:
  enum_parsing_place made global type
sql/sql_yacc.yy:
  enum_parsing_place made global type
2004-08-13 10:01:30 +03:00
unknown
694103472b in case of compound index fill all parts in optimized IN (BUG#4435)
mysql-test/r/subselect.result:
  Optimized IN with compound index test
mysql-test/t/subselect.test:
  Optimized IN with compound index test
sql/item_subselect.cc:
  in case of compound index fill all parts
2004-08-12 17:31:23 +03:00
unknown
cc74326b2a aggregate functions check during substitution made only for single row subselects (BUG#4400)
restoring current senect pointer before PS rexecution (backport from 5.0)
removed spaces at  lines ends


mysql-test/r/subselect.result:
  Aggregate function comparation with ALL/ANY/SOME subselect test
mysql-test/t/subselect.test:
  Aggregate function comparation with ALL/ANY/SOME subselect test
sql/item_subselect.cc:
  removed spaces at  lines ends
  aggregate functions check during substitution made only for single row subselects
sql/item_subselect.h:
  removed spaces at  lines ends
sql/sql_prepare.cc:
  restoring current senect pointer before PS rexecution (backport from 5.0)
2004-07-04 08:46:28 +03:00
unknown
bbf8f03f12 Merge
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  SCCS merged
2004-06-22 13:48:51 +03:00
unknown
e2a5793375 post-review changes (Bug#4090)
mysql-test/r/subselect.result:
  prepare statement test added
mysql-test/t/subselect.test:
  prepare statement test added
2004-06-22 13:41:57 +03:00
unknown
5e7260ab4f after merge fix
sql/item.h:
  Auto merged
2004-06-22 14:48:29 +05:00
unknown
7c021c3acd Merge
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
2004-06-22 12:38:23 +03:00
unknown
028dfdb3f7 merge
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
include/my_global.h:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
innobase/fil/fil0fil.c:
  merge (Use heikki's code)
2004-06-21 10:24:40 +03:00
unknown
7d52eabb39 Fixed some byte order bugs with prepared statements on machines with high-byte-first. (Bug #4173)
Fixed problem with NULL and derived tables (Bug #4097)
Cleanup of new pushed code


BitKeeper/etc/ignore:
  added mysql-test/ndb/ndbcluster
client/mysqltest.c:
  simple cleanup
innobase/os/os0file.c:
  fix for netware
libmysql/libmysql.c:
  Fixed some byte order bugs with prepared statements on machines with
  high-byte-first. (Bug #4173)
myisam/ft_boolean_search.c:
  Comment cleanup
myisam/mi_check.c:
  Removed not needed check (check is done in check_index())
myisam/mi_unique.c:
  crc must be of type ha_checksum.
myisam/myisamchk.c:
  Portability fix.
mysql-test/mysql-test-run.sh:
  Simple cleanup
mysql-test/r/subselect.result:
  Test problem with NULL and derived tables (Bug #4097)
mysql-test/t/subselect.test:
  Test problem with NULL and derived tables (Bug #4097)
sql/mysqld.cc:
  Remove not used defines
sql/sql_select.cc:
  Fixed problem with NULL and derived tables (Bug #4097)
  Indentation fixes
sql/sql_string.cc:
  Code cleanup
sql/sql_yacc.yy:
  Allow one to use DROP PREPARE ...
2004-06-18 03:02:29 +03:00
unknown
8000e4134c a test case (Bug #4102 Crash with a DBUG window after a request) 2004-06-17 12:47:58 +05:00
unknown
a9d4556649 new length detection for non-string in UNION (BUG#4067)
mysql-test/r/subselect.result:
  new length in UNION
mysql-test/r/union.result:
  new length in UNION
  test of int with wrong display length
mysql-test/t/union.test:
  test of int with wrong display length
sql/item.cc:
  new length detection for non-string
sql/item.h:
  new length detection for non-string
2004-06-16 16:06:30 +03:00
unknown
3165c7deda Language/consistency edits to error messages
and affected test results.
2004-06-15 22:18:20 -05:00
unknown
b1cecee055 Language/consistency edits to error messages
and affected test results.
2004-06-15 15:38:36 -05:00
unknown
6f364111cb fixed field resolving mode fo INSERT/REPLACE and CRETE with SELECT (BUG#4090)
mysql-test/r/subselect.result:
  outer fields resolving in INSERT/REPLACE and CRETE with SELECT
mysql-test/t/subselect.test:
  outer fields resolving in INSERT/REPLACE and CRETE with SELECT
sql/sql_parse.cc:
  fixed field resolving mode fo INSERT/REPLACE and CRETE with SELECT
sql/sql_prepare.cc:
  fixed field resolving mode fo INSERT/REPLACE and CRETE with SELECT
2004-06-13 22:39:09 +03:00
unknown
d9b81f3a08 EXISTS(SELECT * ...)
close table before opening in optimize


mysql-test/r/subselect.result:
  test of EXISTS(SELECT * ...)
mysql-test/t/subselect.test:
  test of EXISTS(SELECT * ...)
sql/sql_base.cc:
  EXISTS(SELECT * ...)
sql/sql_table.cc:
  close table before opening one
2004-06-10 21:33:15 +03:00
unknown
bfaaee5343 if exists should not be used inside test
removed influence of some tests on other tests


mysql-test/r/multi_update.result:
  removed influence on other tests
mysql-test/r/subselect.result:
  if exists should not be used inside test
mysql-test/t/multi_update.test:
  removed influence on other tests
mysql-test/t/subselect.test:
  if exists should not be used inside test
mysql-test/t/system_mysql_db_fix.test:
  removed influence on other tests
2004-05-28 21:31:51 +03:00
unknown
9fb55cefac after review changes
mysql-test/r/derived.result:
  explain of hidden subselect changed according to review
mysql-test/r/subselect.result:
  explain of hidden subselect changed according to review
mysql-test/r/union.result:
  explain of hidden subselect changed according to review
sql/sql_class.h:
  we bo not need sign for now
sql/sql_lex.h:
  we do not need sign for now
2004-05-19 17:07:28 +03:00
unknown
aebab97dd0 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
2004-05-14 15:29:23 +03:00
unknown
8c0e5ebfd3 after merge fix 2004-05-14 15:28:59 +03:00
unknown
98fbcd9f2c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
2004-05-14 14:45:27 +03:00
unknown
a6b3433b1f Merge
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  SCCS merged
2004-05-14 13:33:02 +03:00
unknown
fd51cf47a9 fixed flags of printed query 2004-05-13 23:47:20 +03:00
unknown
e54ca13b66 keep old engine & JOIN if we changed subquery Item (Bug #3646)
mysql-test/r/subselect.result:
  ALL/ANY test
mysql-test/t/subselect.test:
  ALL/ANY test
sql/item_subselect.cc:
  keep old engine & JOIN if we changed subquery Item, which allow avoid second all SELECT items fix_fields call with pervios clean up (because of second setup_tables which remove table->key_use and maybe something else)
  keep list when we change Item in SELECT list
  processing inserted max/min function (now JOIN::prepare will be called only once)
  methods of changing item for subselect engines
sql/item_subselect.h:
  change item & results procedure
sql/item_sum.cc:
  Item_sum_hybrid::clear moved to .cc file (to keep .h clean and to make inserving/removing debug info easy)
sql/item_sum.h:
  Item_sum_hybrid::clear moved to .cc file (to keep .h clean and to make inserving/removing debug info easy)
sql/sql_lex.cc:
  note about new method
sql/sql_lex.h:
  method for changing result of UNION JOINs
sql/sql_select.cc:
  method for changing result in JOIN
sql/sql_select.h:
  method for changing result in JOIN
sql/sql_union.cc:
  method for changing result in JOIN
2004-05-07 23:06:11 +03:00
unknown
1a4f499ca8 EXPLAIN UNION using same routing which used for execution which allow return correct bug messages (Bug #3639)
EXPLAIN of hidden SELECT of UNION


mysql-test/r/derived.result:
  explain of hidden select
mysql-test/r/subselect.result:
  explain of hidden select
mysql-test/r/union.result:
  explain of hidden select
  correct error messages on explain
mysql-test/t/subselect.test:
  show eliminated costants in WHERE clause
mysql-test/t/union.test:
  correct error messages on EXPLAIN with union
sql/item.cc:
  fixed name constructing for global ORDER BY items
sql/sql_class.h:
  select ID can be negative (for hidden SELECTs)
  removed unused field
sql/sql_lex.cc:
  new flag of UNION EXPLAIN
sql/sql_lex.h:
  new flag of UNION EXPLAIN
  select ID can be negative (for hidden SELECTs)
sql/sql_select.cc:
  EXPLAIN UNION using same routing which used for execution
  explain for hidden SELECT of UNION
sql/sql_union.cc:
  EXPLAIN UNION using same routing which used for execution
2004-05-06 20:40:21 +03:00
unknown
b52317df71 merge
mysql-test/r/subselect.result:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-05-05 22:30:01 +03:00
unknown
19d3f588f2 After merge fixes 2004-05-05 21:46:16 +03:00
unknown
2c95f97c2b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2004-05-05 21:24:13 +03:00
unknown
f6428e8bb9 caching of queries with isammerge tables forbiden using general way
SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
correct table list passed to class constructor of select_update


mysql-test/r/subselect.result:
  do not show limit if it is not explicit
mysql-test/r/union.result:
  test of LIMIT + ORDER
mysql-test/t/union.test:
  test of LIMIT + ORDER
sql/ha_isammrg.h:
  caching of queries with isammerge tables forbiden
sql/sql_cache.cc:
  removed check on isammerge
sql/sql_lex.cc:
  tag of explicit limit in statement
sql/sql_lex.h:
  tag of explicit limit in statement
sql/sql_parse.cc:
  blanks in empty line removed
  no limit by default (SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause)
sql/sql_union.cc:
  reverted incorrect patch
sql/sql_update.cc:
  reverted incorrect patch
  correct table list passed to class constructor
sql/sql_yacc.yy:
  explicit LIMIT marked
2004-05-05 21:21:41 +03:00