Commits · 0a082019d6e89205500e156bb658722b5e3935a9 · nexedi / MariaDB

13 Jul, 2003 3 commits
- Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1 · 0a082019
  unknown authored Jul 13, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
```
  0a082019
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 6d7c4021
  unknown authored Jul 13, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1


sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
```
  6d7c4021
- Removed unreferenced local variable · 768ab1e4
  unknown authored Jul 13, 2003
  
  768ab1e4
12 Jul, 2003 1 commit

Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS. · 19a4a84d

unknown authored Jul 12, 2003

Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
Removed PURGE LOGS (now PURGE MASTER LOGS).
Added SHOW BDB LOGS as synonym for SHOW LOGS.
Note: tests key_cache.test hanged, rpl_log_pos.test, rpl_rotate_logs.test failed for me.
For the second and third one I guess this will disappear after merging 4.0.


mysql-test/r/rpl_rotate_logs.result:
  result update
mysql-test/t/rpl_rotate_logs.test:
  added test for synonym PURGE BINARY LOGS, changed PURGE LOGS to
  PURGE MASTER LOGS.
sql/sql_yacc.yy:
  Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS.
  Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
  Removed PURGE LOGS (now PURGE MASTER LOGS).
  Added SHOW BDB LOGS as synonym for SHOW LOGS.

19a4a84d

11 Jul, 2003 1 commit

field_conv.cc: · d1d636de

unknown authored Jul 11, 2003

  Data was not converted when ALTER TABLE CHAGE changed a field character set.


sql/field_conv.cc:
  Data was not converted when ALTER TABLE CHAGE changed a field character set.

d1d636de

10 Jul, 2003 1 commit

- Updated error message tests in several results of the test suite after · 1846a9eb

unknown authored Jul 10, 2003

   the server error messages had been modified in errmsg.txt


mysql-test/r/create.result:
   - Updated error message in result after errmsg.txt has been modified
mysql-test/r/drop.result:
   - Updated error message in result after errmsg.txt has been modified
mysql-test/r/rpl000009.result:
   - Updated error message in result after errmsg.txt has been modified
mysql-test/r/symlink.result:
   - Updated error message in result after errmsg.txt has been modified
mysql-test/r/warnings.result:
   - Updated error message in result after errmsg.txt has been modified

1846a9eb

08 Jul, 2003 10 commits

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 531a5d76

unknown authored Jul 08, 2003

into mashka.mysql.fi:/home/my/mysql-4.1


sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged

531a5d76

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1f3cf793
unknown authored Jul 08, 2003
```
into ice.snake.net:/Users/paul/mysql-4.1
```
1f3cf793

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0e1d651e

unknown authored Jul 08, 2003

into mashka.mysql.fi:/home/my/mysql-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

0e1d651e

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 · fa936cb6
unknown authored Jul 08, 2003
```
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC


sql/mysql_priv.h:
  Auto merged
```
fa936cb6
SAPDB date/time finctions · 4adf1804
unknown authored Jul 08, 2003
```
mysql-test/r/cast.result:
  Changes for SAPDB date/time finctions
```
4adf1804
Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1 · c11b418d
unknown authored Jul 08, 2003
```
into myvenu.com:/home/venu/work/sql/dev-4.1
```
c11b418d

implementation of mysql_stmt_reset client end · 6a2e7122

unknown authored Jul 08, 2003


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

6a2e7122

test of big subquery · baebb9fb
unknown authored Jul 08, 2003

baebb9fb

Merge gluh@gw:/home/bk/mysql-4.1 · 01e7f418

unknown authored Jul 08, 2003

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

01e7f418

Error message edits. (Change sentence ending with period + sentence · 1be34f26

unknown authored Jul 07, 2003

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.

1be34f26

07 Jul, 2003 6 commits

new IN subquery engine added for simple IN with non-primary index but without NULL returning · 210c4aba

unknown authored Jul 08, 2003

(SCRUM) (part of WL#818)


mysql-test/r/subselect.result:
  test of new engine
mysql-test/t/subselect.test:
  test of new engine
sql/item_subselect.cc:
  new engine added
  some common operation moved in separate method
sql/item_subselect.h:
  new engine added
  some common operation moved in separate method
sql/sql_select.cc:
  new engine added
  some common operation moved in separate method
sql/sql_select.h:
  some common operation moved in separate method

210c4aba

Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1 · f2ad6ba4

unknown authored Jul 07, 2003

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/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged

f2ad6ba4

merge · 134cc54e
unknown authored Jul 07, 2003
```
sql/sql_select.cc:
  Auto merged
```
134cc54e

Optimisation if simple IN subselect with primary index · 923dba86

unknown authored Jul 07, 2003

(SCRUM) (part of WL#818)


mysql-test/r/subselect.result:
  test of new optimisation
mysql-test/t/subselect.test:
  test of new optimisation
sql/item_subselect.cc:
  new engine for simple IN with primary index
sql/item_subselect.h:
  new engine for simple IN with primary index
sql/sql_lex.h:
  fixed typo
sql/sql_select.cc:
  engine changing
  report_error can't be static, because it used in new engine
sql/sql_select.h:
  new JT_ type (just for information in EXPLAIN statement)
  report_error can't be static, because it used in new engine

923dba86

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 8d128eed
unknown authored Jul 07, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1
```
8d128eed

merge · 2cd6d8ec

unknown authored Jul 07, 2003


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

2cd6d8ec

06 Jul, 2003 3 commits

fixed subselect with to temporary tables executing · 51b26a4d

unknown authored Jul 07, 2003

(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

51b26a4d

Support for variables with components · e17562b5

unknown authored Jul 06, 2003

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)

e17562b5

fixed memory leak in group_concat function (BUG#796) · cd3e15a6

unknown authored Jul 06, 2003

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

cd3e15a6

05 Jul, 2003 2 commits

avoiding of allocating JOIN structure on every UNION executing · a6943f99

unknown authored Jul 05, 2003

(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

a6943f99

reduced using of slow current_thd/current_lex macro · 0f792995

unknown authored Jul 05, 2003

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

0f792995

04 Jul, 2003 12 commits
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 929a4783
  unknown authored Jul 05, 2003
```
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
```
  929a4783
- Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1 · e25c83e0
  unknown authored Jul 04, 2003
```
into myvenu.com:/home/venu/work/sql/dev-4.1
```
  e25c83e0
- Fix for send_fields flush after a fix for windows slowdown issue · d30c9e8e
  unknown authored Jul 04, 2003
  
  d30c9e8e
- More code was reused · 0333deef
  unknown authored Jul 04, 2003
  
  0333deef
- Better arguments format to allow reuse more code · a371a6e6
  unknown authored Jul 04, 2003
  
  a371a6e6
- Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · c29f49c2
  unknown authored Jul 04, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  c29f49c2
- New methods · 3b09b2f0
  unknown authored Jul 04, 2003
```
  Item_func::agg_arg_collations()
  Item_func::arr_arg_collations_for_comparison()
 to aggregate argument collations.
It helps to reuse a lot of code.
```
  3b09b2f0
- Merge bk-internal:/home/bk/mysql-4.1/ · f688da00
  unknown authored Jul 04, 2003
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  f688da00
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d1f61d6f
  unknown authored Jul 04, 2003
```
into mysql.r18.ru:/usr/home/ram/work/4.1
```
  d1f61d6f
- Merge bk-internal:/home/bk/mysql-4.1/ · be1197ec
  unknown authored Jul 04, 2003
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  be1197ec
- enabling HA_READ_PREFIX_LAST_OR_PREV · ea4b758a
  unknown authored Jul 04, 2003
```
mysql-test/t/subselect.test:
  fixed test case for no InnoDB
```
  ea4b758a
- fix and test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows · a7beff5e
  unknown authored Jul 04, 2003
```
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
```
  a7beff5e
03 Jul, 2003 1 commit
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c2a4a0ec
  unknown authored Jul 04, 2003
```
into narttu.mysql.fi:/my/mysql-4.1
```
  c2a4a0ec