Commit graph

6590 commits

Author SHA1 Message Date
unknown
d765d3f37b check of LIMIT in row IN subquery (SCRUM related)
mysql-test/r/subselect.result:
  test of LIMIT in row IN subquery
mysql-test/t/subselect.test:
  test of LIMIT in row IN subquery
sql/item_subselect.cc:
  check of LIMIT in row IN subquery
2002-12-25 12:03:08 +02:00
unknown
e10a326790 merging
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
2002-12-25 11:09:19 +02:00
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
a7f0745dfa - bumped up version number to 4.0.8-gamma
- tagged ChangeSet 1.1484 as mysql-4.0.7


configure.in:
   - bumped up version number to 4.0.8-gamma
2002-12-24 16:25:03 +01: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
8753e655d9 fix for an error in the merge from 3.23 2002-12-24 14:33:11 +02: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
f0a3a93741 - fix CC_VERSION and CXX_VERSION for compilers that return multiple lines of
output for "--version" (e.g. gcc 3.x)
2002-12-23 13:33:55 +01: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
b69d8f4a6f Many files:
Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
sql_select.cc:
  Remove superfluous prints to .err log when a locking SELECT fails to a deadlock or a lock wait timeout


sql/sql_select.cc:
  Remove superfluous prints to .err log when a locking SELECT fails to a deadlock or a lock wait timeout
innobase/btr/btr0sea.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/dict/dict0dict.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/fsp/fsp0fsp.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/ibuf/ibuf0ibuf.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/include/buf0buf.h:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/include/db0err.h:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/include/dict0mem.h:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/include/mem0mem.h:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/include/row0mysql.h:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/include/row0upd.h:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/include/mem0mem.ic:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/mem/mem0pool.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/row/row0ins.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/row/row0mysql.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/row/row0sel.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/row/row0upd.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/srv/srv0start.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
innobase/ut/ut0ut.c:
  Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE
2002-12-22 01:54:29 +02:00
unknown
62c7449a55 Merge with 3.23:
Remove duplicate casedn_str() in mysql_change_db()
Fix for null handling in CASE


innobase/btr/btr0sea.c:
  Auto merged
mysql-test/t/case.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/case.result:
  merge with 3.23
sql/sql_db.cc:
  Merge with 3.23 (to remove duplicate casedn_str())
2002-12-21 10:56:40 +02:00
unknown
5f1b9717c5 Optimization of CASE bug fix 2002-12-21 10:45:06 +02:00
unknown
23362b5cae errmsg.txt:
More descriptive foreign key error messages


sql/share/english/errmsg.txt:
  More descriptive foreign key error messages
2002-12-21 03:50:09 +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
35f6e920c5 btr0sea.c:
Remove an assertion which can fail in a race of 3 threads


innobase/btr/btr0sea.c:
  Remove an assertion which can fail in a race of 3 threads
2002-12-20 20:55:51 +02:00
unknown
7560ffcfaf Merge work:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2002-12-20 19:13:15 +01:00
unknown
0c9a1ba592 Merge work:/home/bk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql
2002-12-20 19:11:33 +01:00
unknown
09781c3bc2 merged 2002-12-20 18:50:34 +01:00
unknown
313b296b2e removed chroot() bugfix, now --chroot in 3.23 is broken again :(( 2002-12-20 18:39:53 +01: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
ede01c2b20 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
configure.in:
  Auto merged
2002-12-20 14:59:35 +02:00
unknown
791e9fb37e Changed thd variables max_join_size and select_limit to type ha_rows.
This fixed some optimization problems when using -DBIG_TABLES
Portabilty fixes for OpenUnix and HPUX
Added C and C++ version numbers to mysqlbug


Docs/mysqld_error.txt:
  Added new error message
acinclude.m4:
  Fix for configure problem on OpenUnix
configure.in:
  Fix for OpenUnix
  Added C and C++ versions to mysqlbug
mysql-test/r/variables.result:
  Update of max_join_size handling
mysql-test/t/variables.test:
  Update of max_join_size handling
mysys/Makefile.am:
  Removed duplicate row
mysys/my_alloc.c:
  Safety fixes (not fatal)
scripts/Makefile.am:
  Added C and C++ compiler versions to mysqlbug
scripts/mysqlbug.sh:
  Added C and C++ compiler versions to mysqlbug
sql/item_func.cc:
  Fixed that user variables that changes are not threated as constants.
sql/item_func.h:
  Fixed that user variables that changes are not threated as constants.
sql/mysqld.cc:
  Changed thd variables max_join_size and select_limit to type ha_rows
sql/repl_failsafe.cc:
  Removed not needed cast
sql/set_var.cc:
  Changed thd variables max_join_size and select_limit to type ha_rows
sql/set_var.h:
  Changed thd variables max_join_size and select_limit to type ha_rows
sql/slave.cc:
  Removed not needed cast
sql/sql_class.h:
  Changed thd variables max_join_size and select_limit to type ha_rows
sql/sql_parse.cc:
  Removed not needed cast
  Fixed security problem with mysql_drop_db()
sql/sql_show.cc:
  Changed thd variables max_join_size and select_limit to type ha_rows
sql/structs.h:
  Changed thd variables max_join_size and select_limit to type ha_rows
2002-12-20 14:58:27 +02: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
63c9b06a62 - tagged ChangeSet 1.1477 as MySQL 4.0.6
- bumped up version number in configure.in to 4.0.7-gamma


configure.in:
   - bumped up version number in configure.in to 4.0.7-gamma
2002-12-20 12:56:00 +01: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
05ef8a612a ha_innobase.cc:
Better error message to help users who created tables with < 3.23.54 where MySQL implicitly added a PRIMARY KEY definition


sql/ha_innobase.cc:
  Better error message to help users who created tables with < 3.23.54 where MySQL implicitly added a PRIMARY KEY definition
2002-12-19 20:58:07 +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