Commits · c64dda59434c026071c09515a68d3c70c15dd648 · nexedi / MariaDB

18 Jul, 2003 1 commit

allow to look up queries with leading comments · c64dda59

unknown authored Jul 18, 2003


BitKeeper/etc/ignore:
  Added libmysqld/sp_cache.cc to the ignore list
mysql-test/r/query_cache.result:
  test of query with leding comment
mysql-test/t/query_cache.test:
  test of query with leding comment

c64dda59

10 Jul, 2003 1 commit

A test in subselect.test turned out to be correct after all, a difference between · c8d7ca2b

unknown authored Jul 10, 2003

5.0 and 4.1 (where it fails).


mysql-test/r/subselect.result:
  It turns out that it's correct that this test doesn't give an error in 5.0.
mysql-test/t/subselect.test:
  It turns out that it's correct that this test doesn't give an error in 5.0.

c8d7ca2b

09 Jul, 2003 1 commit

Merging 4.1 into 5.0 (second pass; post-merge fixes). · 2b16d545

unknown authored Jul 09, 2003

One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-(


mysql-test/r/sp-error.result:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/r/subselect.result:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
  One test still wrong (different from 4.1), left for Sanja. :)
mysql-test/r/variables.result:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/t/sp-error.test:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/t/subselect.test:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
  One test still wrong (different from 4.1), left for Sanja :)
scripts/mysql_create_system_tables.sh:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_cmpfunc.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_subselect.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_sum.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/mysql_priv.h:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/mysqld.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/danish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/dutch/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/english/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/estonian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/french/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/german/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/greek/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/hungarian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/italian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/japanese/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/korean/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/norwegian-ny/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/norwegian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/polish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/portuguese/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/russian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/serbian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/slovak/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/spanish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/swedish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/ukrainian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sp.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_base.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_cache.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_insert.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_parse.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_select.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_update.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).

2b16d545

08 Jul, 2003 3 commits

Merge 4.1 into 5.0 (first pass). · d6b33635

unknown authored Jul 08, 2003


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-cron-build:
  Delete: netware/BUILD/cron-build
BitKeeper/deleted/.del-crontab:
  Delete: netware/BUILD/crontab
BitKeeper/triggers/post-commit:
  Auto merged
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
libmysqld/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
netware/BUILD/compile-AUTOTOOLS:
  Auto merged
netware/BUILD/compile-linux-tools:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
netware/BUILD/compile-netware-START:
  Auto merged
netware/BUILD/compile-netware-all:
  Auto merged
netware/BUILD/compile-netware-debug:
  Auto merged
netware/BUILD/compile-netware-standard:
  Auto merged
netware/BUILD/mwasmnlm:
  Auto merged
netware/BUILD/mwccnlm:
  Auto merged
netware/BUILD/mwldnlm:
  Auto merged
netware/BUILD/nwbootstrap:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.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_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged

d6b33635

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

07 Jul, 2003 2 commits

Fixed the old kludge for pre-loading functions and made it more efficient · a6b9cbd6

unknown authored Jul 07, 2003

using a hash table instead (and made it work with lex pointers).
Some additional code cleanup too.


sql/sp.cc:
  Fixed the old kludge for pre-loading functions and made it more efficient
  using a hash table instead (and made it work with lex pointers).
  Some additional cleanup of comments too.
sql/sp_head.h:
  Some additional code cleanup.
sql/sql_lex.cc:
  Use hash table for function pre-loading (isntead of list).
sql/sql_lex.h:
  Use hash table for function pre-loading (isntead of list).

a6b9cbd6

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

06 Jul, 2003 2 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

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 1 commit

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 14 commits
- 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
- Fixed problem with stacksize on Unixware · 9cc29f9f
  unknown authored Jul 04, 2003
  
  9cc29f9f
- Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 · 23759beb
  unknown authored Jul 03, 2003
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
```
  23759beb
- FIELD() now takes in account arguments collations · fcc962ed
  unknown authored Jul 03, 2003
  
  fcc962ed
- Add the new sp cache files too (should have been in previous changeset). · d17a3ae1
  unknown authored Jul 03, 2003
  
  d17a3ae1
- Code cleanup (and moved sp cache to separate file). · f1c754ef
  unknown authored Jul 03, 2003
  
  f1c754ef
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 2da8a614
  unknown authored Jul 03, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
```
  2da8a614
- fixed typo in previous fix · 5621263a
  unknown authored Jul 03, 2003
  
  5621263a
- Row comparison now does compare field collations, e.g. · a9881534
  unknown authored Jul 03, 2003
```
  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.
```
  a9881534
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 2d61b304
  unknown authored Jul 03, 2003
```
into narttu.mysql.fi:/my/mysql-4.1
```
  2d61b304
- Fixed test case to be more portable · 3af862c7
  unknown authored Jul 03, 2003
```
mysql-test/r/func_gconcat.result:
  Update results
mysql-test/t/func_gconcat.test:
  Make tests repeatable.  The problem is that due to floating point handling / qsort implementation the way rows are read may differ between versions
```
  3af862c7
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 31fa66ff
  unknown authored Jul 03, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/sql_select.cc:
  Auto merged
```
  31fa66ff
- after review fix · 7c16b862
  unknown authored Jul 03, 2003
  
  7c16b862
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 90946487
  unknown authored Jul 03, 2003
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1
```
  90946487
02 Jul, 2003 3 commits
- There is no Item->binary() anymore. It was remain from 4.0. · 9f661429
  unknown authored Jul 02, 2003
  
  9f661429
- fixed typos · 7db27ade
  unknown authored Jul 02, 2003
  
  7db27ade
- fixed bug, which lead to crash mysqld by running 'mysql some_db_with_tables' · a03cf34f
  unknown authored Jul 02, 2003
  
  a03cf34f