Commits · d0598c88d037431371d106643ba7a6543e386354 · Kirill Smelkov / mariadb

17 Dec, 2002 9 commits

Merging · d0598c88

unknown authored Dec 17, 2002


BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_show.cc:
  Auto merged

d0598c88

sql_type() is now ucs2 compatible · fddbc989
unknown authored Dec 17, 2002

fddbc989
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1 · 656b49e5
unknown authored Dec 17, 2002
```
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
```
656b49e5
Merge vvagin@work.mysql.com:/home/bk/mysql-4.1 · f2e5f652
unknown authored Dec 17, 2002
```
into eagle.mysql.r18.ru:/home/vva/work/MANY_INIT_COMMANDS/4.1
```
f2e5f652

Merging&testing · 44d684d1

unknown authored Dec 17, 2002


libmysqld/lib_sql.cc:
  Protocol::send_fields added
sql/ha_berkeley.cc:
  set_nfields calls added
sql/ha_myisam.cc:
  set_nfield call added
sql/mysql_priv.h:
  embedded_send_row header changed
sql/protocol.cc:
  Protocol::write edited for embedded case
sql/protocol.h:
  n_fields member added
sql/sql_table.cc:
  sen_nfields added

44d684d1

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1 · 6e128a31

unknown authored Dec 17, 2002

into eagle.mysql.r18.ru:/home/vva/work/MANY_INIT_COMMANDS/4.1


BitKeeper/etc/logging_ok:
  auto-union
libmysql/libmysql.c:
  Auto merged

6e128a31

Many init commands on connect · 07f3ca93
unknown authored Dec 17, 2002
```
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
07f3ca93
Some fixes to get closer to UCS2 compatible SHOW FIELDS · d888e97e
unknown authored Dec 17, 2002

d888e97e
Move all sql_type() to the same file · c22b4907
unknown authored Dec 17, 2002

c22b4907

16 Dec, 2002 3 commits

extended resolve() and reverse_resolve() UDFs for FreeBSD (SCRUM) · 964b8f63
unknown authored Dec 16, 2002

964b8f63

Merging · 8db30025

unknown authored Dec 16, 2002


BitKeeper/etc/logging_ok:
  auto-union
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

8db30025

Big purge about embedded library (scrum) · 632717fd

unknown authored Dec 16, 2002


client/mysql.cc:
  #ifdef EMBEDDED_LIBRARY added
client/mysqltest.c:
  #ifdef EMBEDDED_LIBRARY added
include/mysql.h:
  MYSQL structure changed for embedded case
include/mysql_com.h:
  NET structure changed for embedded case
include/violite.h:
  no need to special vio types
libmysqld/embedded_priv.h:
  superfluous functions removed
libmysqld/lib_sql.cc:
  several modifications
libmysqld/lib_vio.c:
  file should be removed
libmysqld/libmysqld.c:
  several modifications
sql/ha_berkeley.cc:
  modification for embedded case
sql/ha_innodb.cc:
  modifications for embedded case
sql/ha_myisam.cc:
  modifications for embedded case
sql/item_func.cc:
  modifications for embedded case
sql/log.cc:
  #ifdef-ed parts of file which don't work in embedded case
sql/log_event.cc:
  #ifdef-ed parts of file which don't work in embedded case
sql/log_event.h:
  #ifdef-ed parts of file which don't work in embedded case
sql/mf_iocache.cc:
  file doesn't work in embedded case
sql/mini_client.cc:
  file should be removed from embedded library
sql/mysqld.cc:
  several modifications
sql/net_pkg.cc:
  #ifdef-ed functions which can't work in embedded case
sql/net_serv.cc:
  file doesn't work in embedded case
sql/repl_failsafe.cc:
  no replication in embedded case
sql/repl_failsafe.h:
  no replication in embedded case
sql/set_var.cc:
  #ifdef-ed variables which have no sense in embedded library
sql/set_var.h:
  #ifdef-ed variables which have no sense in embedded library
sql/slave.cc:
  no replication in embedded library
sql/slave.h:
  no replication in embedded library
sql/sql_acl.cc:
  modifications for embedded case
sql/sql_cache.cc:
  modifications for embedded case
sql/sql_class.cc:
  modifications for embedded case
sql/sql_class.h:
  THD structure modified for embedded case
sql/sql_db.cc:
  modification for embedded case
sql/sql_error.cc:
  modification for embedded case
sql/sql_help.cc:
  modification for embedded case
sql/sql_load.cc:
  #ifdef-ed code which doesn't work in embedded case
sql/sql_parse.cc:
  #ifdef-ed code which doesn't work in embedded case
sql/sql_prepare.cc:
  #ifdef-ed code which doesn't work in embedded case
sql/sql_repl.cc:
  no replication in embedded library
sql/sql_repl.h:
  no replication in embedded library
sql/sql_select.cc:
  query cache don't work now in embedded library
sql/sql_show.cc:
  modifications for embedded case

632717fd

15 Dec, 2002 5 commits

moved links initialization · fce29f66

unknown authored Dec 15, 2002


mysql-test/r/delete.result:
  test of delete error
mysql-test/t/delete.test:
  test of delete error

fce29f66

Merge vvagin@work.mysql.com:/home/bk/mysql-4.1 · 19ca6d36

unknown authored Dec 16, 2002

into eagle.mysql.r18.ru:/home/vva/work/sanya_bug/4.1


BitKeeper/etc/logging_ok:
  auto-union

19ca6d36

adding check for duplicated symbols · 05163f5e
unknown authored Dec 15, 2002
```
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
```
05163f5e

fixed subselect null test · 10622205

unknown authored Dec 15, 2002

fixed method definition (overloading instead of redefinition)
fixed time expression type definition


mysql-test/r/subselect.result:
  test of subselect null test
mysql-test/t/subselect.test:
  test of subselect null test
sql/item.h:
  fixed method definition (overloading instead of redefinition)
sql/item_subselect.h:
  fixed subselect null test
sql/item_timefunc.cc:
  fixed time expression type definition

10622205

fixed test result · 71a6aa3b
unknown authored Dec 15, 2002

71a6aa3b

14 Dec, 2002 6 commits

Fix after merge · 4381cd85
unknown authored Dec 14, 2002
```
BitKeeper/etc/ignore:
  added libmysqld/protocol.cc
```
4381cd85

merge · 5a9437ac

unknown authored Dec 14, 2002


mysql-test/r/derived.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

5a9437ac

Fixes for binary protocol (complement to last push) · f935c6a2

unknown authored Dec 14, 2002

Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format.
DATE_ADD() and related functions now returns correct DATE/DATETIME type depending on argument types.
Now all tests passes, still some work left to remove warnings in log files from mysql-test-run


mysql-test/r/cast.result:
  New result for time
mysql-test/r/delayed.result:
  Timestamp update
mysql-test/r/derived.result:
  Fix after bulk insert change
mysql-test/r/explain.result:
  Fix after bulk insert change
mysql-test/r/func_date_add.result:
  Timestamp change
mysql-test/r/func_str.result:
  Timestamp change
mysql-test/r/func_time.result:
  Timestamp change
mysql-test/r/innodb.result:
  Timestamp change
mysql-test/r/join_outer.result:
  Fix after bulk insert change
mysql-test/r/key_primary.result:
  Fix after bulk insert change
mysql-test/r/keywords.result:
  Timestamp change
mysql-test/r/merge.result:
  Removed warning
mysql-test/r/odbc.result:
  Fix after bulk insert change
mysql-test/r/range.result:
  Fix after bulk insert change
mysql-test/r/select.result:
  Fix after bulk insert change
mysql-test/r/subselect.result:
  Fixed EXPLAIN output
mysql-test/r/type_datetime.result:
  Timestamp update
mysql-test/r/type_ranges.result:
  Timestamp update
mysql-test/r/type_timestamp.result:
  Timestamp update
mysql-test/r/union.result:
  EXPLAIN UPDATE
mysql-test/t/func_str.test:
  Timestamp update
mysql-test/t/func_time.test:
  New test for interval type result
mysql-test/t/merge.test:
  Remove warnings of wrong drop table
mysql-test/t/type_datetime.test:
  Timestamp change
mysql-test/t/type_timestamp.test:
  Timestamp change
sql/field.cc:
  Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format
sql/field.h:
  Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format
sql/item.cc:
  Binary protocol update
sql/item.h:
  Binary protocol update
sql/item_func.cc:
  Added comment
sql/item_func.h:
  @variables are always returned to the client as strings
sql/item_timefunc.cc:
  Changed INTERVAL to return correct type
sql/item_timefunc.h:
  Changed INTERVAL to return correct type
sql/mysqld.cc:
  Changed default pthread_attr_setstacksize to 129K
sql/protocol.cc:
  More type checking
sql/set_var.cc:
  Fixed that @convert works ok with new protocol
sql/sql_analyse.cc:
  Fixed bug in analyze
sql/sql_class.cc:
  Fixed bug from last push in LIMIT
sql/sql_error.cc:
  More optimal types
sql/sql_repl.cc:
  Binary protocol changes
sql/sql_select.cc:
  Fixed bug in multi-table-update
  Changed EXPLAIN to return NULL instead of empty strings
sql/sql_show.cc:
  Binary protocol

f935c6a2

Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 · c9fd2749

unknown authored Dec 14, 2002

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

c9fd2749

Adding comments as per Monty's request. · 2b29b55c
unknown authored Dec 14, 2002

2b29b55c
fix stupid error in comments to VARIANCE+STD · 19f6ad06
unknown authored Dec 14, 2002

19f6ad06

13 Dec, 2002 5 commits

Merge vvagin@work.mysql.com:/home/bk/mysql-4.1 · 29624e32

unknown authored Dec 14, 2002

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

29624e32

add VARIANCE function · e10f255d

unknown authored Dec 14, 2002


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

e10f255d

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1 · b3d9826b
unknown authored Dec 14, 2002
```
into eagle.mysql.r18.ru:/home/vva/work/SOUNDS_LIKE/4.1


BitKeeper/etc/logging_ok:
  auto-union
```
b3d9826b

add 'SOUNDS LIKE' syntax · caf1bf0a

unknown authored Dec 14, 2002


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

caf1bf0a

Remove variables redefined and variable shutdown_event_name fix · daeed636
unknown authored Dec 13, 2002
```
sql/mysqld.cc:
  Remove variables redefined and same fix for shutdown_event_name made by Monty on 4.0
```
daeed636

12 Dec, 2002 7 commits

postreview fix · 0e481109
unknown authored Dec 12, 2002

0e481109
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · ad28b4a1
unknown authored Dec 12, 2002
```
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
```
ad28b4a1
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1 · aec84fd9
unknown authored Dec 12, 2002
```
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
```
aec84fd9

derived tables with UNION's ... · 657b3112

unknown authored Dec 12, 2002

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 ...

657b3112

Resolving merge conflicts · e9525947

unknown authored Dec 12, 2002


BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
sql/convert.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.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_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
libmysqld/lib_sql.cc:
  merging
sql/item_strfunc.cc:
  merging

e9525947

Some fixes · a9f1388b

unknown authored Dec 12, 2002


libmysqld/lib_sql.cc:
  parameters for functions added
libmysqld/lib_vio.c:
  name of option changed
libmysqld/libmysqld.c:
  mysql_fetch_length fixed
sql/field.cc:
  small fix
sql/item.cc:
  fixes about Field::embedded_send
sql/item_strfunc.cc:
  cs parameter added
sql/mysqld.cc:
  small fix
sql/sql_show.cc:
  strange code #ifdef-ed
sql/sql_table.cc:
  small fix
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

a9f1388b

A set of improvements to the German localized error messages · 5d124b3c

unknown authored Dec 11, 2002


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

5d124b3c

11 Dec, 2002 5 commits
- Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 · a2cbf485
  unknown authored Dec 11, 2002
```
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
```
  a2cbf485
- Merge jamppa@work:/home/bk/mysql-4.1 · 4ed87263
  unknown authored Dec 11, 2002
```
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
```
  4ed87263
- Fixed a bug in mysql 'use' command. 'use' can now take quoted arguments. · ca110720
  unknown authored Dec 11, 2002
  
  ca110720
- Preparation to charset dependant test_if_int and test_if_real · ba642eb8
  unknown authored Dec 11, 2002
  
  ba642eb8
- Always use latin1 for acl · a626c9ae
  unknown authored Dec 11, 2002
  
  a626c9ae