1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Commit Graph

19274 Commits

Author SHA1 Message Date
unknown
b448b12788 Merge
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-12-29 20:06:43 +03:00
unknown
dd9a101098 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1


sql/sql_yacc.yy:
  Auto merged
2002-12-29 18:41:58 +02:00
unknown
13587ca070 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-12-28 21:37:16 +02:00
unknown
84a9a9fe5b aliases with multi-table updates / deletes
fix for a bug with derived tables and query cache
ix for a charset bug in timestamp


mysql-test/r/multi_update.result:
  aliases with multi-table updates / deletes
mysql-test/r/query_cache.result:
  fix for query cache with derived tables
mysql-test/t/multi_update.test:
  aliases with multi-table updates / deletes
mysql-test/t/outfile.test:
  Fix of bug with charset in timestamp
mysql-test/t/query_cache.test:
  fix for a bug with derived tables and query cache
sql/field.cc:
  fix for a charset bug in timestamp
sql/sql_parse.cc:
  aliases with multi-table updates / deletes
sql/sql_yacc.yy:
  aliases with multi-table updates / deletes
2002-12-28 21:34:17 +02:00
unknown
4e56ad9204 sql_table.cc:
Fix CREATE LIKE TABLE .. temporary case


sql/sql_table.cc:
  Fix CREATE LIKE TABLE .. temporary case
2002-12-28 01:38:29 -08:00
unknown
3ab0ddc294 postreview fix (SCRUM)
fixed layout


sql/filesort.cc:
  fixed layout
sql/gstream.cc:
  fixed layout
sql/item.cc:
  postreview fix
sql/item.h:
  postreview fix
sql/item_cmpfunc.cc:
  postreview fix
sql/item_cmpfunc.h:
  fixed layout
sql/item_func.h:
  fixed layout
sql/item_row.h:
  fixed layout
sql/item_strfunc.cc:
  fixed layout
sql/item_subselect.cc:
  postreview fix
sql/item_subselect.h:
  postreview fix
sql/nt_servc.cc:
  fixed layout
sql/opt_range.cc:
  fixed layout
sql/password.c:
  fixed layout
sql/spatial.cc:
  fixed layout
sql/sql_help.cc:
  fixed layout
sql/sql_lex.cc:
  fixed layout
sql/sql_olap.cc:
  fixed layout
sql/sql_select.cc:
  fixed layout
sql/sql_show.cc:
  fixed layout
sql/sql_string.cc:
  fixed layout
sql/sql_table.cc:
  fixed layout
sql/stacktrace.c:
  fixed layout
2002-12-28 01:01:05 +02:00
unknown
7388e9bd5b Merge sanja.is.com.ua:/home/bell/mysql/work-row-4.1
into sanja.is.com.ua:/home/bell/mysql/work-from-4.1


sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
2002-12-27 21:36:56 +02:00
unknown
d201a34e8c postreview fix 2002-12-27 21:19:25 +02:00
unknown
acef866008 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
2002-12-27 21:42:21 +03:00
unknown
3db50925c7 SCRUM
Add optional second parameter to password() function. It can be used to force password()
to return fixed values. 


mysql-test/r/func_crypt.result:
  New test results
mysql-test/t/func_crypt.test:
  new tests
sql/item_strfunc.cc:
  Add optional second argument to password() function
sql/item_strfunc.h:
  New method
sql/sql_yacc.yy:
  Handling of password with 2 arguments
2002-12-27 19:47:23 +03:00
unknown
2f723e07fb Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1


sql/sql_yacc.yy:
  Auto merged
2002-12-27 17:14:33 +02:00
unknown
4c23977185 merge fixes 2002-12-27 14:46:23 +02:00
unknown
2d624d8ad4 reverting a patch 2002-12-27 14:39:12 +02:00
unknown
dcf6470f31 merge fixes
mysql-test/r/derived.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.cc:
  Fixes for merge ...
2002-12-26 20:04:22 +02:00
unknown
f1696d4f5f Cut hostnames at HOSTNAME_LENGTH to avoid theoretical hostname overruns
Changed long packat handling to check for packets of length 0xffffff.
This does however break packet handling for older clients.
If you are using packets >= 16M then you need to upgrade client and server
after this patch.


Docs/internals.texi:
  Updated documentation for 4.1 protocol
sql/ha_innodb.cc:
  Optimization of checking command
sql/item.h:
  Removed automatic set of length for Item_string
sql/item_create.cc:
  Optimized create of create_func_current_user()
sql/net_serv.cc:
  Fixed wrong max packet length
sql/sql_acl.cc:
  Safety fix.
sql/sql_parse.cc:
  Cut hostnames at HOSTNAME_LENGTH to avoid theoretical hostname overruns
2002-12-26 18:26:37 +02:00
unknown
c917474ed2 Add proper error message for old client connecting new server using user which has password in
new format SCRUM


include/mysqld_error.h:
  Add new error message
sql/share/czech/errmsg.txt:
  czech
sql/share/danish/errmsg.txt:
  danish
sql/share/dutch/errmsg.txt:
  dutch
sql/share/english/errmsg.txt:
  New Error message for in case old client connects new server and new auth is to be used
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:
  japaneese
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:
  romanian
sql/share/russian/errmsg.txt:
  russian
sql/share/serbian/errmsg.txt:
  se
sql/share/slovak/errmsg.txt:
  slovak
sql/share/spanish/errmsg.txt:
  spanish
sql/share/swedish/errmsg.txt:
  swedish
sql/share/ukrainian/errmsg.txt:
  ukrainian
sql/sql_parse.cc:
  Add proper error message if old clients can't authenticate due to unsupported protocol
  SCRUM
2002-12-26 19:12:57 +03:00
unknown
884e3dee03 Safety fix to not allow one to specify too big max_alloc_packet to mysqld
Safety fix to not cause conflicts with extended packages in 4.0.


sql/mysqld.cc:
  Safety fix to not allow one to specify too big max_alloc_packet
sql/net_serv.cc:
  Safety fix to not cause conflicts with extended packages in 4.0.
  (Should not cause any notable changes for 3.23 servers)
2002-12-26 17:50:07 +02:00
unknown
5265a1656e added FROM DUAL for derived tables 2002-12-26 17:48:19 +02:00
unknown
f6cf1d0737 Updated comment 2002-12-26 16:35:15 +02:00
unknown
717656bb1c Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-send_error-4.1


sql/sql_select.cc:
  Auto merged
2002-12-26 10:48:03 +02:00
unknown
1dfa625f7b support of subselect without FROM reducing (SCRUM)
fixed bug of calling setup_fields without correct lex->current_select pointer in mysql_derived
more correct creation of reference in Item_field::fix_field


mysql-test/r/subselect.result:
  new explain with subselect reduced
mysql-test/t/subselect.test:
  new explain with subselect reduced
sql/item.cc:
  support of subselect without FROM reducing
  more correct creation of reference in Item_field::fix_field
sql/item.h:
  support of subselect without FROM reducing
sql/item_cmpfunc.cc:
  support of subselect without FROM reducing
sql/item_cmpfunc.h:
  support of subselect without FROM reducing
sql/item_func.cc:
  support of subselect without FROM reducing
sql/item_func.h:
  support of subselect without FROM reducing
sql/item_row.cc:
  support of subselect without FROM reducing
sql/item_row.h:
  support of subselect without FROM reducing
sql/item_strfunc.h:
  fixed layout
  support of subselect without FROM reducing
sql/item_subselect.cc:
  support of subselect without FROM reducing
sql/item_subselect.h:
  support of subselect without FROM reducing
sql/mysql_priv.h:
  reference in Item_field::fix_field related changes
sql/sql_base.cc:
  reference in Item_field::fix_field related changes
sql/sql_derived.cc:
  fixed bug of calling setup_fields without correct lex->current_select pointer
2002-12-26 01:28:59 +02:00
unknown
1e687d196e bug fixes and tests ...
mysql-test/r/update.result:
  Test for update with subselect and derived table ...
mysql-test/t/update.test:
  Test for update with subselect and derived table ...
sql/sql_union.cc:
  Fix for usage of ORDER BY ... and / or LIMIT .... without braces
2002-12-25 15:07:36 +02:00
unknown
88f364a762 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb
2002-12-25 15:39:52 +04:00
unknown
0ba620214c more correct argument for translation function (SCRUM related)
fiexd bug in LIMIT check


sql/item_subselect.cc:
  more correct argument for translation function
  fiexd bug in LIMIT check
sql/item_subselect.h:
  more correct argument for translation function
2002-12-25 12:51:08 +02:00
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
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
23326969a4 LIMIT is prohibited in IN/ALL/ANY/SOME 2002-12-23 18:25:25 +02:00
unknown
00c6129c10 many bug fixes
sql/log.cc:
  Fix for a bug in query logging ...
sql/mysqld.cc:
  Fix for a bug with max_allowed_packt
sql/sql_select.cc:
  Fix for a bug which is caused when a single table is scanned by
  entire index and WHERE clause is so broad that JOIN type is JT_ALL.
2002-12-23 14:56:41 +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
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
a3c5ad1747 Moved lower_case_table_name check to right place. 2002-12-21 10:57:53 +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
0c9a1ba592 Merge work:/home/bk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql
2002-12-20 19:11:33 +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