Commit graph

4195 commits

Author SHA1 Message Date
unknown
4adf180432 SAPDB date/time finctions
mysql-test/r/cast.result:
  Changes for SAPDB date/time finctions
2003-07-08 15:06:05 +05:00
unknown
c11b418db6 Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-07-08 02:29:42 -07:00
unknown
6a2e712290 implementation of mysql_stmt_reset client end
include/mysql.h:
  add mysql_stmt_reset prototype
include/mysql_com.h:
  add COM_STMT_RESET
libmysql/libmysql.def:
  Add mysql_stmt_reset def
sql/sql_prepare.cc:
  Fix selects hang after windows slowdown issue fix (send_fields)
sql/sql_parse.cc:
  Add COM_STMT_RESET
sql/mysql_priv.h:
  add defination of mysql_stmt_reset
2003-07-08 02:27:21 -07:00
unknown
01e7f418af Merge gluh@gw:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC


sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-07-08 12:57:00 +05:00
unknown
1be34f26b3 Error message edits. (Change sentence ending with period + sentence
not ending with period into single sentence.)


sql/share/czech/errmsg.txt:
  Error message edits.
sql/share/danish/errmsg.txt:
  Error message edits.
sql/share/dutch/errmsg.txt:
  Error message edits.
sql/share/english/errmsg.txt:
  Error message edits.
sql/share/french/errmsg.txt:
  Error message edits.
sql/share/german/errmsg.txt:
  Error message edits.
sql/share/italian/errmsg.txt:
  Error message edits.
sql/share/norwegian-ny/errmsg.txt:
  Error message edits.
sql/share/norwegian/errmsg.txt:
  Error message edits.
sql/share/polish/errmsg.txt:
  Error message edits.
sql/share/portuguese/errmsg.txt:
  Error message edits.
sql/share/romanian/errmsg.txt:
  Error message edits.
sql/share/serbian/errmsg.txt:
  Error message edits.
sql/share/slovak/errmsg.txt:
  Error message edits.
sql/share/spanish/errmsg.txt:
  Error message edits.
sql/share/swedish/errmsg.txt:
  Error message edits.
2003-07-07 23:35:24 -05:00
unknown
134cc54e80 merge
sql/sql_select.cc:
  Auto merged
2003-07-07 18:49:54 +03:00
unknown
8d128eed80 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1
2003-07-07 15:01:47 +03:00
unknown
2cd6d8ec6b merge
mysql-test/t/subselect.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-07-07 10:30:52 +03:00
unknown
51b26a4d3f fixed subselect with to temporary tables executing
(now it return correct results. Test was commited before, but it is not pushed,
BUG# is not registered, because bug was introduced after release)


sql/sql_select.cc:
  fixed subselect with to temporary tables executing
sql/sql_select.h:
  fixed subselect with to temporary tables executing
2003-07-07 00:45:51 +03:00
unknown
4efcd17029 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_func.h:
  Auto merged
2003-07-06 21:36:59 +02:00
unknown
e17562b55a Support for variables with components
Added framework to create/drop and manager buffers for multiple key caches


include/my_getopt.h:
  Fixed prototype
include/my_sys.h:
  Added (temporary) KEY_CACHE type
include/mysqld_error.h:
  New error messages
mysql-test/r/select_safe.result:
  Updated test results
mysql-test/r/variables.result:
  Updated test results
mysys/my_getopt.c:
  Fixed bugs with GET_ASK_ADDR
sql/Makefile.am:
  Make sql_yacc.o depend on all header files in sql directory
sql/item_func.cc:
  Added support for variable components
sql/mysql_priv.h:
  Added support for variable components
sql/mysqld.cc:
  Added support for multiple key caches
sql/set_var.cc:
  Added support for multiple key caches
sql/set_var.h:
  Added support for multiple key caches
sql/share/czech/errmsg.txt:
  New error messages
sql/share/danish/errmsg.txt:
  New error messages
sql/share/dutch/errmsg.txt:
  New error messages
sql/share/english/errmsg.txt:
  New error messages
sql/share/estonian/errmsg.txt:
  New error messages
sql/share/french/errmsg.txt:
  New error messages
sql/share/german/errmsg.txt:
  New error messages
sql/share/greek/errmsg.txt:
  New error messages
sql/share/hungarian/errmsg.txt:
  New error messages
sql/share/italian/errmsg.txt:
  New error messages
sql/share/japanese/errmsg.txt:
  New error messages
sql/share/korean/errmsg.txt:
  New error messages
sql/share/norwegian-ny/errmsg.txt:
  New error messages
sql/share/norwegian/errmsg.txt:
  New error messages
sql/share/polish/errmsg.txt:
  New error messages
sql/share/portuguese/errmsg.txt:
  New error messages
sql/share/romanian/errmsg.txt:
  New error messages
sql/share/russian/errmsg.txt:
  New error messages
sql/share/serbian/errmsg.txt:
  New error messages
sql/share/slovak/errmsg.txt:
  New error messages
sql/share/spanish/errmsg.txt:
  New error messages
sql/share/swedish/errmsg.txt:
  New error messages
sql/share/ukrainian/errmsg.txt:
  New error messages
sql/sql_lex.cc:
  Fixes for quoting of variables.
sql/sql_parse.cc:
  Fix after changing prototype for get_system_var
sql/sql_show.cc:
  Fix after introducing variable components
sql/sql_yacc.yy:
  Support for variables with components (To support multiple key caches)
2003-07-06 19:09:57 +03:00
unknown
aa1b02400e renamed enum Item_cast as it's not a 'class Item' child 2003-07-06 17:12:45 +02:00
unknown
cd3e15a6f9 fixed memory leak in group_concat function (BUG#796)
fixed test func_gconcat to be repeatable independent of presend tables and avoid removing user tables


mysql-test/r/func_gconcat.result:
  removed warning in test
  fixed table tnames (should be tN, where N is number)
mysql-test/t/func_gconcat.test:
  removed warning in test
  fixed table tnames (should be tN, where N is number)
sql/item_sum.cc:
  added debug information
  fixed memory leak in group_concat function
2003-07-06 18:11:19 +03:00
unknown
a6943f9988 avoiding of allocating JOIN structure on every UNION executing
(SCRUM)


sql/sql_select.cc:
  support of fake_select_lex join clean
  removed compiler warning
sql/sql_select.h:
  JOIN clean for fake_select_lex
sql/sql_union.cc:
  avoiding of allocating JOIN structure on every UNION executing
2003-07-05 17:21:39 +03:00
unknown
0f792995ec reduced using of slow current_thd/current_lex macro
initialization of item_thd moved to constructor (in any case we need thd in constructor)
initialization of group_concat_max_len to constructor to avoid incorrect length reporting (BUG#757)
removed Item_func_group_concat::fix_length_and_dec() because item have its own fix_fields and will not have inherited items


mysql-test/r/func_gconcat.result:
  test for BUG#757
mysql-test/t/func_gconcat.test:
  test for BUG#757
sql/item_sum.cc:
  reduced using of slow current_thd/current_lex macro
  initialization of item_thd moved to constructor (in any case we need thd in constructor)
  initialization of group_concat_max_len to constructor to avoid incorrect length reporting (BUG#757)
sql/item_sum.h:
  removed Item_func_group_concat::fix_length_and_dec() because item have its own fix_fields and will not have inherited items
2003-07-05 03:03:31 +03:00
unknown
929a4783f1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1


mysql-test/t/subselect.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-07-05 00:10:51 +03:00
unknown
e25c83e0c6 Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-07-04 11:29:25 -07:00
unknown
d30c9e8e81 Fix for send_fields flush after a fix for windows slowdown issue 2003-07-04 10:54:10 -07:00
unknown
0333deefd2 More code was reused 2003-07-04 20:19:07 +05:00
unknown
a371a6e6ca Better arguments format to allow reuse more code 2003-07-04 19:56:32 +05:00
unknown
c29f49c24d Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-04 18:12:59 +05:00
unknown
3b09b2f000 New methods
Item_func::agg_arg_collations()
  Item_func::arr_arg_collations_for_comparison()
 to aggregate argument collations.
It helps to reuse a lot of code.
2003-07-04 18:12:23 +05:00
unknown
f688da006c Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-04 13:13:17 +02:00
unknown
d1f61d6fb2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1
2003-07-04 15:39:57 +05:00
unknown
be1197ec54 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-04 12:07:49 +02:00
unknown
ea4b758ac0 enabling HA_READ_PREFIX_LAST_OR_PREV
mysql-test/t/subselect.test:
  fixed test case for no InnoDB
2003-07-04 12:07:06 +02:00
unknown
a7beff5e15 fix and test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows
mysql-test/r/handler.result:
  test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows
mysql-test/t/handler.test:
  test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows
sql/sql_handler.cc:
  fix for the bug #787: HANDLER without INDEX doesn't work with deleted rows
2003-07-04 14:41:01 +05:00
unknown
c2a4a0ec55 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-07-04 01:57:56 +03:00
unknown
9cc29f9fe4 Fixed problem with stacksize on Unixware 2003-07-04 01:21:42 +03:00
unknown
23759bebcf Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-03 19:25:19 +05:00
unknown
fcc962edcc FIELD() now takes in account arguments collations 2003-07-03 19:24:38 +05:00
unknown
2da8a61477 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2003-07-03 15:25:20 +03:00
unknown
5621263a5c fixed typo in previous fix 2003-07-03 15:25:00 +03:00
unknown
a98815346d Row comparison now does compare field collations, e.g.
ROW('a','b','c) = ROW('A' collate latin1_bin,'b','c') returns 0
When a number is compared to a string, character sets and 
collations are not aggregated. e.g. this returned error in 4.1.0:

SELECT 1=_latin2'1';
because character sets was aggregated, and 1 was considered as
a string of latin1 charset during this aggregation.
2003-07-03 17:00:01 +05:00
unknown
31fa66ffe2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/sql_select.cc:
  Auto merged
2003-07-03 14:13:47 +03:00
unknown
7c16b86213 after review fix 2003-07-03 14:11:08 +03:00
unknown
909464875d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1
2003-07-03 14:02:23 +03:00
unknown
01eb6a4a22 merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/mysql_priv.h:
  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_yacc.yy:
  Auto merged
2003-07-03 11:59:57 +03:00
unknown
69be8b9d64 (SCRUM)
It looks like samll revolution in SELECT_LEX tree, but it was only natural way to solve problem with name resolution of external fields inside subselect which belongs to global order of union
also it have following advantages:
 - removed mess with current_select type conversion
   - type checking/converting
   - a lot of virtual methods
 - fake select for union execution allocated only once (it was allocated for every subselect with union executing)

changes:
fixed bug with outer fields name resolution of subqueries which belong to global ORDER BY clause
remuved select_lex() function, now thd->lex.current_select always have type SELECT_LEX
new SELECT_LEX (fake_select_lex) will be allocated in case of UNION for using in UNION processing
fake_select_lex allocated for union hold global ORDER BY & LIMIT clauses and have linkage equal to GLOBAL_OPTIONS_TYPE 
new description of SELECT_LEX tree

(SCRUM)


sql/item.cc:
  global parameters moved to fake_select_lex
sql/item_subselect.cc:
  global parameters moved to fake_select_lex
sql/item_sum.cc:
  no need type checking & converion now
sql/sql_delete.cc:
  no need type checking & converion now
sql/sql_derived.cc:
  global parameters moved to fake_select_lex
sql/sql_lex.cc:
  not used fields/mrthods moved from st_select_lex_node to st_select_lex
  global parameters moved to fake_select_lex
sql/sql_lex.h:
  comments about new tree of select_lex s
  not used fields/mrthods moved from st_select_lex_node to st_select_lex
  global parameters moved to fake_select_lex
sql/sql_parse.cc:
  global parameters moved to fake_select_lex
  allocation of fake_select_lex on demand
sql/sql_select.cc:
  now fake_select_lex marked as GLOBAL_OPTIONS_TYPE
sql/sql_union.cc:
  global parameters moved to fake_select_lex
sql/sql_yacc.yy:
  global parameters moved to fake_select_lex
2003-07-03 02:30:52 +03:00
unknown
9f6614292b There is no Item->binary() anymore. It was remain from 4.0. 2003-07-02 18:34:43 +05:00
unknown
7db27aded2 fixed typos 2003-07-02 15:03:49 +03:00
unknown
a03cf34f7f fixed bug, which lead to crash mysqld by running 'mysql some_db_with_tables' 2003-07-02 14:45:35 +03:00
unknown
29898afbdd Item tree iterator
fixed dependence of items from reduced subquery
(SCRUM)


sql/item.cc:
  fixed dependence of items from reduced subquery
sql/item.h:
  fixed dependence of items from reduced subquery
  Item tree iterator
sql/item_cmpfunc.cc:
  Item tree iterator
sql/item_cmpfunc.h:
  Item tree iterator
sql/item_func.cc:
  Item tree iterator
sql/item_func.h:
  Item tree iterator
sql/item_row.cc:
  Item tree iterator
sql/item_row.h:
  Item tree iterator
sql/item_strfunc.h:
  Item tree iterator
sql/item_subselect.cc:
  Item tree iterator
2003-07-02 13:12:18 +03:00
unknown
585cec0564 after review changes (SCRUM)
removed outer resolving flag (because of movingtransformation after fix_fields)


sql/item.cc:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item.h:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_cmpfunc.cc:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_cmpfunc.h:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_func.cc:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_func.h:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_row.cc:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_row.h:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_strfunc.h:
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_subselect.cc:
  after review changes
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/item_subselect.h:
  after review changes
  removed outer resolving flag (because of movingtransformation after fix_fields)
sql/mysql_priv.h:
  after review changes
sql/sql_base.cc:
  after review changes
sql/sql_lex.cc:
  after review changes
sql/sql_lex.h:
  after review changes
sql/sql_select.cc:
  after review changes
sql/sql_union.cc:
  after review changes
2003-07-02 01:45:22 +03:00
unknown
54313be5e3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
2003-07-01 19:48:31 +03:00
unknown
4354fcd6ab Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-err-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-07-01 19:05:31 +03:00
unknown
69df67fbcf fixed uninitialized pointer 2003-07-01 19:05:08 +03:00
unknown
c672b5d04b merge
acinclude.m4:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-07-01 15:57:45 +03:00
unknown
2f8f8fabb1 merge
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
2003-07-01 13:57:46 +03:00
unknown
8db5021725 merged
sql/item_subselect.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-07-01 10:03:20 +03:00