Commit graph

6290 commits

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


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2002-12-24 14:02:42 +02:00
unknown
7a74837e00 Many fixes.
I still have to make a test case for :

UPDATE from sub-select with derived table


mysql-test/r/multi_update.result:
  Test for found rows in multi-table update
mysql-test/r/subselect.result:
  Fix for new syntax for UNION's
mysql-test/t/multi_update.test:
  Test for found rows in multi-table update
mysql-test/t/subselect.test:
  Fix for new syntax for UNION's
sql/sql_cache.cc:
  Fix for a bug that involved derived table in sub-select in UPDATE or
  DELETE statement
sql/sql_derived.cc:
  Fix for a bug that involved derived table in sub-select in UPDATE or
  DELETE statement
sql/sql_parse.cc:
  Fix for a bug that involved derived table in sub-select in UPDATE or
  DELETE statement
sql/sql_show.cc:
  Fix for th eshow of replication status
sql/sql_yacc.yy:
  Three fixes.
  
  One for not allowing mixing of braces and non-braces in UNION's
  
  Second one for table aliases in multi-table deletes / updates
  
  Third one for using derived tables within sub-selects for 
  UPDATE / DELETE commands
2002-12-24 13:58:07 +02:00
unknown
b861d68321 thd_charset copy in lex 2002-12-24 14:06:52 +04:00
unknown
23326969a4 LIMIT is prohibited in IN/ALL/ANY/SOME 2002-12-23 18:25:25 +02:00
unknown
a637e9c4c9 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-21 02:54:01 +04:00
unknown
d1856800c1 fix some warnings 2002-12-21 02:53:07 +04:00
unknown
2a6461588d less default_charset_info 2002-12-20 18:08:49 +04:00
unknown
3ebec63351 less default_charset_info 2002-12-20 17:57:24 +04:00
unknown
197e7a2928 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-12-20 17:15:13 +04:00
unknown
54abb8e922 less default_charset_info 2002-12-20 17:14:46 +04:00
unknown
a4d31e3605 Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2002-12-20 13:47:52 +01:00
unknown
baba4b1f2a - added missing file sql/protocol.h to distribution 2002-12-20 13:43:40 +01:00
unknown
f6d3338a91 mysql_com.h:
ulong fails to compile on FreeBSD. Peter, alsways use "unsigned long" instead!!!


include/mysql_com.h:
  ulong fails to compile on FreeBSD. Peter, alsways use "unsigned long" instead!!!
2002-12-20 16:21:22 +04:00
unknown
9d58058996 COUNT(DISTINCT) charset related test 2002-12-20 13:00:06 +04:00
unknown
774e9927b6 ctype_many.result:
COUNT(DISTINCT expr) and charset related test


mysql-test/r/ctype_many.result:
  COUNT(DISTINCT expr) and charset related test
2002-12-19 16:50:48 +04:00
unknown
2220059b99 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-12-19 16:43:47 +04:00
unknown
1c88b5f064 COUNT(DISTINCT field) now honors charsets 2002-12-19 16:42:35 +04:00
unknown
0178b2403a Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.spa


sql/item_strfunc.cc:
  Auto merged
2002-12-19 15:34:30 +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
9528812119 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/item.cc:
  Auto merged
2002-12-19 07:38:30 +02: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
2cd213c95d Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.spa
2002-12-19 09:38:27 +04:00
unknown
af4bafa47f Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-19 07:38:27 +02: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
190fb8960a Spatial-related fixes
sql/item_strfunc.cc:
  spatial function's fixes
sql/spatial.cc:
  spatial type comperations are case-independent now
sql/sql_string.h:
  this is a bit safer
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-12-18 17:17:35 +04:00
unknown
eb377d06b6 Fix for fix_fields in derived tables with UNION's .... 2002-12-17 22:36:23 +02:00
unknown
f8601aa2c7 beautifying the error messages 2002-12-17 21:04:37 +02:00
unknown
28eaef7974 A fix for a bug in fix_fields in case like this:
select .. UNION select some_column;

This is exhibited in sub-selects and derived tables.
2002-12-17 20:15:15 +02: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