Commit graph

6266 commits

Author SHA1 Message Date
unknown
1c88b5f064 COUNT(DISTINCT field) now honors charsets 2002-12-19 16:42:35 +04:00
unknown
d19ba004e4 Less "default_charset_info" 2002-12-19 15:27:46 +04:00
unknown
ef9c226119 BINARY_FLAG has been restored.
It's needed by ODBC code.
2002-12-19 14:36:05 +04:00
unknown
c7182a999c this will make me life easier in the future 2002-12-19 09:38:31 +04:00
unknown
0913ccb79d less use of system_charset_info 2002-12-19 09:38:30 +04:00
unknown
52ed8cb8cb removed several cases of default_charset_info use
a bit more ucs2 compatibility 


sql/des_key_file.cc:
  use latin1
sql/field.cc:
  use latin1
sql/field_conv.cc:
  removed default_charset_info
sql/hostname.cc:
  removed default_charset_info
sql/item_timefunc.cc:
  gets closer to ucs2 compatibility
sql/log_event.cc:
  removed default_charset_info
sql/set_var.h:
  removed default_charset_info
2002-12-19 09:38:29 +04:00
unknown
b29cc128bf thd_charset has been moved to variables structure 2002-12-19 09:38:28 +04:00
unknown
a5ba7824e9 New syntax
CREATE TABLE tname (a CHAR(10) COLLATE latin1_de)
2002-12-19 09:38:27 +04:00
unknown
0a11536c73 SAPDB-style syntax
CREATE TABLE tname (a CHAR(10) ASCII)
  as a synonym for
CREATE TABLE tname (a CHAR(10) CHARACTER SET latin1)
2002-12-19 09:38:26 +04:00
unknown
bc7f8302a4 Introducing SAPDB-style
"fieldname CHAR(n) UNICODE"
as a synonym to
   "fieldname CHAR(n) CHARACTER SET ucs2"
2002-12-19 09:38:25 +04:00
unknown
2cae041aa8 Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/MANY_INIT_COMMANDS/4.1
2002-12-19 09:38:24 +04:00
unknown
8247045e4c fix warnings 2002-12-19 09:37:33 +04:00
unknown
fddbc989a4 sql_type() is now ucs2 compatible 2002-12-17 19:57:22 +04:00
unknown
656b49e50b Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-12-17 19:57:21 +04:00
unknown
f2e5f6524b Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/MANY_INIT_COMMANDS/4.1
2002-12-17 19:57:20 +04:00
unknown
6e128a31b3 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
into eagle.mysql.r18.ru:/home/vva/work/MANY_INIT_COMMANDS/4.1


BitKeeper/etc/logging_ok:
  auto-union
libmysql/libmysql.c:
  Auto merged
2002-12-17 19:14:38 +04:00
unknown
07f3ca938a Many init commands on connect
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-12-17 19:13:07 +04:00
unknown
d888e97e56 Some fixes to get closer to UCS2 compatible SHOW FIELDS 2002-12-17 14:35:19 +04:00
unknown
c22b490789 Move all sql_type() to the same file 2002-12-17 11:25:27 +04:00
unknown
964b8f63e7 extended resolve() and reverse_resolve() UDFs for FreeBSD (SCRUM) 2002-12-16 19:09:48 +04:00
unknown
fce29f66fb moved links initialization
mysql-test/r/delete.result:
  test of delete error
mysql-test/t/delete.test:
  test of delete error
2002-12-15 22:01:09 +02:00
unknown
19ca6d368b Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/sanya_bug/4.1


BitKeeper/etc/logging_ok:
  auto-union
2002-12-16 00:01:08 +04:00
unknown
05163f5e8c adding check for duplicated symbols
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-12-15 22:30:26 +04:00
unknown
1062220566 fixed subselect null test
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
2002-12-15 11:14:53 +02:00
unknown
71a6aa3b0c fixed test result 2002-12-15 10:23:55 +02:00
unknown
4381cd8565 Fix after merge
BitKeeper/etc/ignore:
  added libmysqld/protocol.cc
2002-12-14 18:30:28 +02:00
unknown
5a9437ac05 merge
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
2002-12-14 17:49:01 +02:00
unknown
f935c6a286 Fixes for binary protocol (complement to last push)
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
2002-12-14 17:43:01 +02:00
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