Commit graph

6408 commits

Author SHA1 Message Date
unknown
4abcd967ba Fix messages in other languages
sql/share/czech/errmsg.txt:
  Chezh
sql/share/danish/errmsg.txt:
  Danish
sql/share/dutch/errmsg.txt:
  Dutch
sql/share/estonian/errmsg.txt:
  Estonian
sql/share/french/errmsg.txt:
  French
sql/share/german/errmsg.txt:
  German
sql/share/greek/errmsg.txt:
  Greek
sql/share/hungarian/errmsg.txt:
  Hungarian
sql/share/italian/errmsg.txt:
  Italian
sql/share/japanese/errmsg.txt:
  Japanese
sql/share/korean/errmsg.txt:
  Korean
sql/share/norwegian-ny/errmsg.txt:
  Norwegian-ny
sql/share/norwegian/errmsg.txt:
  Norwegian
sql/share/polish/errmsg.txt:
  polish
sql/share/portuguese/errmsg.txt:
  Portuguese
sql/share/romanian/errmsg.txt:
  Romainian
sql/share/russian/errmsg.txt:
  Russian
sql/share/serbian/errmsg.txt:
  Serbian
sql/share/slovak/errmsg.txt:
  Slovak
sql/share/spanish/errmsg.txt:
  spanish
sql/share/swedish/errmsg.txt:
  Swedish
sql/share/ukrainian/errmsg.txt:
  Ukrainian
2002-12-24 22:40:19 +03:00
unknown
709311d571 Correct wrong error messages
sql/share/english/errmsg.txt:
  Correct Error messages to match actual behavior
2002-12-24 21:44:54 +03:00
unknown
b8d9e65d47 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb
2002-12-24 18:43:19 +04:00
unknown
5895f3772e Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-derived-4.1


sql/item.cc:
  Auto merged
2002-12-24 14:08:44 +02:00
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
939124425b Merge work:/home/bk/mysql-4.1
into dsl-kpogw4gb5.dial.inet.fi:/home/my/bk/mysql-4.1
2002-12-24 00:53:43 +02:00
unknown
178d712fa9 mysql multiline comment, by Sergey Gluhov.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-12-24 00:53:07 +02:00
unknown
23326969a4 LIMIT is prohibited in IN/ALL/ANY/SOME 2002-12-23 18:25:25 +02:00
unknown
9df41d5a6d Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb
2002-12-23 12:29:59 +04: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
f192e9be01 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb
2002-12-20 17:33:09 +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
e3276a46b4 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb
2002-12-20 17:01:59 +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
6b06ac5cf6 Merge mysql.r18.ru:/usr/home/ram/work/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb
2002-12-20 13:00:22 +04:00
unknown
9d58058996 COUNT(DISTINCT) charset related test 2002-12-20 13:00:06 +04:00
unknown
a05b0f087c row IN subselects (SCRUM)
mysql-test/r/subselect.result:
  test of row IN subslect
mysql-test/t/subselect.test:
  test of row IN subslect
sql/item.cc:
  New helper Item - reference on item list by number
  cache item for row
sql/item.h:
  layout fixed 
  New helper Item - reference on item list by number
  cache item for row
sql/item_cmpfunc.cc:
  changed Item_in_optimizer to be able work with row
sql/item_cmpfunc.h:
  changed Item_in_optimizer to be able work with row
sql/item_row.cc:
  Fixed row Item to be compatible with row subselect
sql/item_row.h:
  Fixed row Item to be compatible with row subselect
sql/item_subselect.cc:
  changed name of class to corerectly reflex its function
  row IN subselect
sql/item_subselect.h:
  changed name of class to corerectly reflex its function
  row IN subselect
sql/sql_class.cc:
  changed name of class to corerectly reflex its function
sql/sql_class.h:
  changed name of class to corerectly reflex its function
sql/sql_yacc.yy:
  changed name of class to corerectly reflex its function
2002-12-19 21:15:09 +02: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
900a86f631 Item_in_optimizer is changed to be used with row IN subselect (SCRUM)
removed unused items


sql/item.cc:
  removed unused Items
sql/item.h:
  removed unused Items
sql/item_cmpfunc.cc:
  Item_in_optimizer is changed to be used with row IN subselect
sql/item_cmpfunc.h:
  Item_in_optimizer is changed to be used with row IN subselect
sql/item_subselect.cc:
  Item_in_optimizer is changed to be used with row IN subselect
2002-12-19 13:35:12 +02: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
de539bf30a patches from sleepycat.com have been applied (SCRUM)
ha_berkeley::rename_table() has been added (SCRUM)


bdb/db/db_open.c:
  patches from sleepycat.com have been applied
bdb/log/log_put.c:
  patches from sleepycat.com have been applied
bdb/mp/mp_fopen.c:
  patches from sleepycat.com have been applied
bdb/rep/rep_record.c:
  patches from sleepycat.com have been applied
bdb/txn/txn.c:
  patches from sleepycat.com have been applied
sql/ha_berkeley.cc:
  ha_berkeley::rename_table() has been added
sql/ha_berkeley.h:
  ha_berkeley::rename_table() has been added
2002-12-19 12:38:32 +04:00
unknown
86ccbe3727 support of simple row subselects (SCRUM)
mysql-test/r/subselect.result:
  test of simple row subselect
  fixed table droping
mysql-test/t/subselect.test:
  test of simple row subselect
  fixed table dropimg
sql/item.cc:
  Item_cache_str fixed to correctly store NULL and copy string value
sql/item.h:
  Item_cache_str fixed to correctly store NULL and copy string value
sql/item_cmpfunc.cc:
  support of simple row subselects
sql/item_subselect.cc:
  support of simple row subselects
sql/item_subselect.h:
  support of simple row subselects
sql/sql_class.cc:
  support of simple row subselects
2002-12-19 07:38:33 +02:00
unknown
ea4f406baf optimized single value subselect (to be used as row) (SCRUM)
sql/item.h:
  optimized single value subselect (to be used as row)
sql/item_subselect.cc:
  optimized single value subselect (to be used as row)
sql/item_subselect.h:
  optimized single value subselect (to be used as row)
sql/sql_class.cc:
  optimized single value subselect (to be used as row)
2002-12-19 07:38:32 +02: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
65e12f2ffe fixed derived table visibility scope for derived tables with union
mysql-test/r/derived.result:
  test of error messages
mysql-test/t/derived.test:
   SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b;
2002-12-17 23:18:19 +02:00
unknown
eb377d06b6 Fix for fix_fields in derived tables with UNION's .... 2002-12-17 22:36:23 +02:00