Commit graph

6236 commits

Author SHA1 Message Date
unknown
c9fd2749f7 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-12-14 15:15:23 +02:00
unknown
2b29b55c55 Adding comments as per Monty's request. 2002-12-14 15:13:25 +02:00
unknown
19f6ad06c0 fix stupid error in comments to VARIANCE+STD 2002-12-14 04:53:28 +04:00
unknown
29624e3212 Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/VARIANCE/4.1.clone


BitKeeper/etc/logging_ok:
  auto-union
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-12-14 03:38:38 +04:00
unknown
e10f255dd6 add VARIANCE function
mysql-test/r/func_group.result:
  add 'VARIANCE' tests
mysql-test/r/having.result:
  add 'VARIANCE' tests
mysql-test/r/select.result:
  add 'VARIANCE' tests
mysql-test/t/func_group.test:
  add 'VARIANCE' tests
mysql-test/t/having.test:
  add 'VARIANCE' tests
mysql-test/t/select.test:
  add 'VARIANCE' tests
sql/item.cc:
  add 'VARIANCE' sum function
sql/item.h:
  add 'VARIANCE' sum function
sql/item_sum.cc:
  add 'VARIANCE' sum function
sql/item_sum.h:
  add 'VARIANCE' sum function
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-12-14 03:36:59 +04:00
unknown
b3d9826b5a Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
into eagle.mysql.r18.ru:/home/vva/work/SOUNDS_LIKE/4.1


BitKeeper/etc/logging_ok:
  auto-union
2002-12-14 02:18:58 +04:00
unknown
caf1bf0ad0 add 'SOUNDS LIKE' syntax
Docs/manual.texi:
  add 'SOUNDS LIKE' description
mysql-test/r/func_str.result:
  add 'SOUNDS LIKE' test
mysql-test/t/func_str.test:
  add 'SOUNDS LIKE' test
sql/lex.h:
  add 'SOUNDS' symbol
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-12-14 02:18:14 +04:00
unknown
daeed63662 Remove variables redefined and variable shutdown_event_name fix
sql/mysqld.cc:
  Remove variables redefined and same fix for shutdown_event_name made by Monty on 4.0
2002-12-13 05:18:22 -04:00
unknown
0e481109c2 postreview fix 2002-12-12 20:34:16 +02:00
unknown
ad28b4a1e8 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
2002-12-12 17:44:24 +02:00
unknown
aec84fd984 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-12 16:11:03 +02:00
unknown
657b311206 derived tables with UNION's ...
Scrum task !!!!!


mysql-test/r/analyse.result:
  reverting a fix
mysql-test/r/derived.result:
  derived tables with UNION's ...
mysql-test/t/analyse.test:
  reverting a fix
mysql-test/t/derived.test:
  derived tables with UNION's ...
sql/mysql_priv.h:
  derived tables with UNION's ...
sql/sql_analyse.cc:
  reverting a fix
sql/sql_derived.cc:
  derived tables with UNION's ...
sql/sql_lex.cc:
  derived tables with UNION's ...
sql/sql_select.cc:
  derived tables with UNION's ...
sql/sql_union.cc:
  derived tables with UNION's ...
2002-12-12 16:09:06 +02:00
unknown
5d124b3cd0 A set of improvements to the German localized error messages
sql/share/german/errmsg.txt:
  Improved localized error messages courtesy of Georg Richter (georg@php.net)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-12-11 20:17:15 -07:00
unknown
a2cbf48556 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
2002-12-11 23:09:22 +02:00
unknown
4ed872632e Merge jamppa@work:/home/bk/mysql-4.1
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
2002-12-11 16:14:13 +02:00
unknown
ca11072005 Fixed a bug in mysql 'use' command. 'use' can now take quoted arguments. 2002-12-11 16:03:50 +02:00
unknown
ba642eb8d8 Preparation to charset dependant test_if_int and test_if_real 2002-12-11 17:42:48 +04:00
unknown
a626c9aefa Always use latin1 for acl 2002-12-11 17:20:40 +04:00
unknown
0cd96c82fb Some system_charset_info and default_charset_info were replaced by my_charset_latin1 2002-12-11 17:12:55 +04:00
unknown
0ce6d1816f Use of charset dependant num->string conversion routines 2002-12-11 16:04:46 +04:00
unknown
9ff43be81e Use of new num->str functions
fix in ucs2 charset


sql/field.cc:
  Use of new num->str functions
sql/item_sum.cc:
  Use of new num->str functions
strings/ctype-utf8.c:
  Fix
2002-12-11 15:29:23 +04:00
unknown
6cdf5c6543 sql/sql_string.cc@1.39
New num->str functions
strings/ctype-simple.c@1.16
    New num->str functions
strings/ctype-utf8.c@1.18
    New num->str functions


sql/sql_string.cc:
  New num->str functions
strings/ctype-simple.c:
  New num->str functions
strings/ctype-utf8.c:
  New num->str functions
2002-12-11 15:26:49 +04:00
unknown
c8a50df16c Preparing for charset dependant int10_to_str 2002-12-11 12:30:05 +04:00
unknown
91d3e2b3b8 postreview fix (SCRUM)
NULL fixed
max_length fixed
layout fixed


mysql-test/r/row.result:
  NULL fixed
mysql-test/t/row.test:
  NULL fixed
sql/item.cc:
  postreview fix
sql/item.h:
  postreview fix
sql/item_cmpfunc.cc:
  layout fix
  postreview fix
  max_length fix
  NULL fixed
sql/item_cmpfunc.h:
  postreview fix
sql/item_row.cc:
  NULL fixed
sql/item_row.h:
  NULL fixed
sql/sql_class.cc:
  postreview fix
2002-12-10 18:10:00 +02:00
unknown
62ce900c2e Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_analyse.cc:
  Auto merged
2002-12-10 13:39:06 +02:00
unknown
540b243ace Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2002-12-10 12:23:54 +01:00
unknown
5cf1cc9f28 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
2002-12-10 13:53:34 +04:00
unknown
3ed826c68e autoconf version check for BDB 2002-12-10 13:52:41 +04:00
unknown
6f88718fc9 merging
sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-12-10 11:45:40 +02:00
unknown
cd292d1f03 merging
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
2002-12-10 11:41:47 +02:00
unknown
3a25ef2191 More new style str->num 2002-12-10 12:43:17 +04:00
unknown
0eef805e5a Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-12-10 10:55:19 +04:00
unknown
4e20633094 fix for a bug with UNION in sub-select's and start working on
UNION's in derived tables
2002-12-09 20:47:47 +02:00
unknown
3b33f0c2c1 Proper cleanup for BDB test
mysql-test/r/bdb_cache.result:
  Results fixed
mysql-test/t/bdb_cache.test:
  Add proper cleanup for the test
2002-12-09 19:20:05 +03:00
unknown
d42a8757d6 - delete readline/configure from BK tree (will be autogenerated)
- Added missing readline header files to distribution


BitKeeper/deleted/.del-configure~dea4524fff6db494:
  Delete: readline/configure
readline/Makefile.am:
   - Added missing readline header files to distribution
2002-12-09 15:19:53 +01:00
unknown
41b045f483 More use of new str->num conversion routines 2002-12-09 17:57:17 +04:00
unknown
26a5f74152 Merge pzaitsev@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pz/mysql/mysql-4.1-root
2002-12-09 15:30:15 +03:00
unknown
89524b29c4 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_select.cc:
  Auto merged
2002-12-09 14:04:29 +02:00
unknown
97a1587691 More use of new str->num conversion routines 2002-12-09 15:58:33 +04:00
unknown
8ae15f948f More use of new str->num functions 2002-12-09 15:45:05 +04:00
unknown
b569fa6a3e Minor new auth fixes
sql/password.c:
  Add checks and fix new auth changes.
sql/sql_parse.cc:
  Remove the check. It is done in different place
2002-12-09 14:29:17 +03:00
unknown
bb0343b120 More use of new str->number routines 2002-12-09 14:58:24 +04:00
unknown
e503a5807d More use of new string->number conversion routines 2002-12-09 14:31:11 +04:00
unknown
a13f24b490 Use of new string->number conversion routines 2002-12-09 14:08:42 +04:00
unknown
3b24e7c065 fixed typo in cardinality check of row items (SCRUM)
sql/item_cmpfunc.cc:
  fixed typo
2002-12-08 23:56:40 +02:00
unknown
b392b78400 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-leak-4.1
2002-12-08 17:28:11 +02:00
unknown
230f5f3b0f optimized IN with Rows (SCRUM)
NULL with row (IN)
cardinality error of row inside row
new[]
fixed layout


mysql-test/r/row.result:
  test of optimized IN with Rows
  test of NULL with row
  test of cardinality error of row inside row
mysql-test/t/row.test:
  test of optimized IN with Rows
  test of NULL with row
  test of cardinality error of row inside row
sql/item_cmpfunc.cc:
  optimized IN with Rows
  NULL with row (IN)
  cardinality error of row inside row
sql/item_cmpfunc.h:
  optimized IN with Rows
  NULL with row (IN)
  cardinality error of row inside row
  fixed layout
sql/sql_list.h:
  fixed layout
  new[]
2002-12-08 03:19:03 +02:00
unknown
5b54427d7d IN with row item without constant optimisation (SCRUM)
renamed row item test


mysql-test/r/row.result:
  IN with row item without constant optimisation
mysql-test/t/row.test:
  IN with row item without constant optimisation
sql/item_cmpfunc.cc:
  IN with row item without constant optimisation
sql/item_cmpfunc.h:
  IN with row item without constant optimisation
2002-12-07 19:58:05 +02:00
unknown
30cb4a8676 Merge sanja.is.com.ua:/home/bell/mysql/work-null-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
2002-12-07 16:02:03 +02:00
unknown
71622d51c3 Row item fixing (SCRUM related)
Inserted comment


sql/item_row.cc:
  Row item fixing
sql/item_row.h:
  Row item fixing
sql/sql_select.cc:
  Inserted comment
2002-12-07 16:00:39 +02:00