Commit graph

9153 commits

Author SHA1 Message Date
unknown
a2813df5ed Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-07-18 10:13:41 +02:00
unknown
f4e07b861e CASE optimization 2003-07-18 13:11:47 +05:00
unknown
a975548b53 Some fixes in CASE.
Test suit was extended to conver various arguments mixes.
2003-07-18 12:42:35 +05:00
unknown
995fe9f13a Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-07-18 04:38:05 +03:00
unknown
a25c63ce74 Removed wrong "Found lock of type # that is write and read locked" warnings. 2003-07-18 04:37:37 +03:00
unknown
02f5cbfe63 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.(none):/home/my/mysql-4.1
2003-07-18 04:33:46 +03:00
unknown
06517dfed3 Fixed memory overrun when doing REPAIR on table with multi-part auto_increment key where one part was a packed CHAR
myisam/mi_check.c:
  Fixed memory overrun in _mi_put_key_in_record
myisam/mi_key.c:
  Fixed unnecessary memory allocation
mysql-test/r/insert_select.result:
  Added test case for memory corruption
mysql-test/t/insert_select.test:
  Added test case for memory corruption
mysys/safemalloc.c:
  Removed compiler warnings
sql/sql_acl.cc:
  Fixed core dump when running with --debug
2003-07-18 04:04:24 +03:00
unknown
9942e0c7c6 my_strnncoll_latin1_de rewritten from scratch. Bug with overlapping combos went away.
mysql-test/r/ctype_latin1_de.result:
  testing overlapping combos
mysql-test/t/ctype_latin1_de.test:
  testing overlapping combos
2003-07-17 20:17:46 +02:00
unknown
926b05ed0e Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Users/paul/mysql-4.1
2003-07-17 12:58:06 -05:00
unknown
102bfc9ee8 CASE now aggregates all argument types instead of using the only one argument 2003-07-17 22:58:05 +05:00
unknown
8283a01f24 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-17 22:58:04 +05:00
unknown
e431b9faca Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
2003-07-17 13:58:03 -04:00
unknown
ed8be699fe new optimisation for ref_null (SCRUM) (WL#818)
mysql-test/r/subselect.result:
  results of new optimisation
mysql-test/t/subselect.test:
  results of new optimisation
sql/item_cmpfunc.h:
  function type
sql/item_func.h:
  function type
sql/item_subselect.cc:
  new optimisation for ref_or_null
sql/item_subselect.h:
  new optimisation for ref_or_null
sql/sql_select.cc:
  new optimisation for ref_or_null
sql/sql_select.h:
  item_subselect.cc need safe_index_read
2003-07-17 19:39:31 +03:00
unknown
96627521e8 fixed bug with location of mysql_create_sytem_tables 2003-07-17 12:15:41 -04:00
unknown
d5a6d17707 CASE stores first_expr and else_expr in args[] array now.
This allowed to reuse a lot of code.
2003-07-17 16:07:56 +05:00
unknown
85cc122794 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-17 10:22:18 +05:00
unknown
35262eebdc ctype-utf8.c:
Stupid bug fix


strings/ctype-utf8.c:
  Stupid bug fix
2003-07-17 10:21:30 +05:00
unknown
7a3a6aebc7 Fix openssl_2 test so it passes or fails. (It was being reported
as [skipped], even when run explicitly.)


mysql-test/include/have_openssl_2.inc:
  There is no such variable as SSL_get_cipher.
mysql-test/r/have_openssl_2.require:
  Require file required garbage. Fix to require something sensible.
mysql-test/r/openssl_2.result:
  Add output of SHOW STATUS to test result.
mysql-test/t/openssl_2.test:
  Use actual lettercase of SSL status variables.
  (Test will work with uppercase, but there's no
  reason not to use the actual lettercase.)
2003-07-16 23:47:48 -05:00
unknown
a9da5a8d8c Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-07-17 00:21:57 +02:00
unknown
88534d0063 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_683/mysql-4.0
2003-07-16 18:21:56 -04:00
unknown
1793513891 fixed bug Bug #683 (Prompt for password doesn't go to console for Windows) 2003-07-16 18:15:35 -04:00
unknown
7770c16770 Error message consistency edits + updates to affected test results.
mysql-test/r/innodb.result:
  Fix test result to correspond to error message edits.
mysql-test/r/repair_part2.result:
  Fix test result to correspond to error message edits.
mysql-test/r/type_blob.result:
  Fix test result to correspond to error message edits.
sql/share/czech/errmsg.txt:
  Error message consistency edits.
sql/share/dutch/errmsg.txt:
  Error message consistency edits.
sql/share/estonian/errmsg.txt:
  Error message consistency edits.
sql/share/french/errmsg.txt:
  Error message consistency edits.
sql/share/german/errmsg.txt:
  Error message consistency edits.
sql/share/greek/errmsg.txt:
  Error message consistency edits.
sql/share/hungarian/errmsg.txt:
  Error message consistency edits.
sql/share/italian/errmsg.txt:
  Error message consistency edits.
sql/share/norwegian-ny/errmsg.txt:
  Error message consistency edits.
sql/share/norwegian/errmsg.txt:
  Error message consistency edits.
sql/share/danish/errmsg.txt:
  Error message consistency edits.
sql/share/polish/errmsg.txt:
  Error message consistency edits.
sql/share/portuguese/errmsg.txt:
  Error message consistency edits.
sql/share/romanian/errmsg.txt:
  Error message consistency edits.
sql/share/serbian/errmsg.txt:
  Error message consistency edits.
sql/share/slovak/errmsg.txt:
  Error message consistency edits.
sql/share/spanish/errmsg.txt:
  Error message consistency edits.
sql/share/swedish/errmsg.txt:
  Error message consistency edits.
sql/share/ukrainian/errmsg.txt:
  Error message consistency edits.
sql/share/english/errmsg.txt:
  Error message consistency edits.
2003-07-16 14:37:00 -05:00
unknown
3ea4fb3812 - heavily reworked the comments and layout of the new sample my.cnf file
as requested by PeterZ


support-files/my-innodb-heavy-4G.cnf.sh:
   - heavily reworked the comments and layout as requested by PeterZ
2003-07-16 17:13:45 +02:00
unknown
6976474705 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Users/paul/mysql-4.1
2003-07-16 09:19:14 -05:00
unknown
04c6e88c0e Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-07-16 14:12:18 +03:00
unknown
c55142d9bd fixed memory leak
sql/item_sum.h:
  fixed initialization
2003-07-16 14:11:35 +03:00
unknown
eba0a3aaad merge
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-07-16 13:58:11 +03:00
unknown
dc4e41dcae - fixed the automatic generation of support-files/MacOSX/ReadMe.txt -
a node name was changed in manual.texi which resulted in a very large
   ReadMe.txt file, as the generating script could not find the (renamed)
   ending node. Fixed the ending node name in Docs/Makefile.am and the 
   Docs/Support/generate-text-files.pl Perl script to make sure this does
   not happen again (I only discovered this because the Do-pkg script was
   not able to add the ReadMe.txt to the Apple Disk image because it ran out
   of disk space due to the size of the file)


Docs/Makefile.am:
   - Fixed a node name that was changed in manual.texi and resulted in
     the generation of a _very_ large ReadMe.txt file (down to the very end
     of the manual, since the ending node was not found)
Docs/Support/generate-text-files.pl:
   - added a safeguard: if the ending node was not found, abort with an error
     to indicate that the generated text file might be too large (as it would
     contain the whole manual, down from the starting node)
   - made some cosmetical changes
2003-07-16 12:06:55 +02:00
unknown
a41a43f99d Item_func_null doesn't have a separate Item for the first argument anymore.
args[0] is used instead. This allowed to resuse a lot of code.
2003-07-16 11:29:16 +05:00
unknown
d9145e3964 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Users/paul/mysql-4.1
2003-07-15 15:06:14 -05:00
unknown
6b52f58255 Update openssl_1 test. 2003-07-15 14:37:22 -05:00
unknown
47d9c95f9c Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0


sql/handler.cc:
  Auto merged
2003-07-15 20:44:29 +02:00
unknown
b40895f9d2 bug #702 - ALTER TABLE tm UNION=(t1,t2) doesn't work if t1.MYD is compressed
myisammrg/myrg_open.c:
  never mark merge table as readonly even if all underlying myisam tables are readonly,
  otherwise ALTER TABLE merge UNION=(t1,t2,t3,...) will not work
sql/handler.cc:
  map EACCES to ER_OPEN_AS_READONLY.
  can only happen on modifying merge table that has (some) read-only myisam tables
2003-07-15 20:43:57 +02:00
unknown
2caf4612f3 Modifications to error messages, and affected test results.
mysql-test/r/merge.result:
  Sync to modified error message.
sql/share/danish/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/dutch/errmsg.txt:
  Remove extraneous periods.
sql/share/english/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/estonian/errmsg.txt:
  Remove extraneous periods.
sql/share/french/errmsg.txt:
  Remove extraneous periods.
sql/share/german/errmsg.txt:
  Remove extraneous periods.
sql/share/greek/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/hungarian/errmsg.txt:
  Remove extraneous periods.
sql/share/italian/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/japanese/errmsg.txt:
  Remove extraneous periods.
sql/share/korean/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/norwegian-ny/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/norwegian/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/polish/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/romanian/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/russian/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/serbian/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/slovak/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/spanish/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
sql/share/swedish/errmsg.txt:
  Ellipses are three dots, not four or five.
  Remove other extraneous periods.
2003-07-15 11:33:01 -05:00
unknown
bf3af8eeac Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-07-15 20:06:27 +05:00
unknown
ac392bb27b cut&paste fixed 2003-07-15 15:20:22 +02:00
unknown
cb8e29cb43 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-15 18:12:27 +05:00
unknown
db9b5f333e ELT passes the first argument in args[0] instead of having a separate Item. 2003-07-15 18:11:49 +05:00
unknown
f01a95386d Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-15 15:04:39 +02:00
unknown
5aa330863b Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_func.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-07-15 14:58:04 +02:00
unknown
42eb7b3fe4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1
2003-07-15 17:56:20 +05:00
unknown
b478c41d20 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.(none):/home/my/mysql-4.1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-07-15 15:53:20 +03:00
unknown
79f26f7e35 bugfix for the bugfix for the bug #539 2003-07-15 17:38:01 +05:00
unknown
4b3eecf46b Item_func_field doesn't have a separate Item to store the first argument.
It's now passed as args[0]. This fix allowed to resuse a lot of code.
2003-07-15 17:33:00 +05:00
unknown
b1646502dd - removed options sort_buffer and key_buffer from calls to (my)isamchk
in mysqld_safe (commented out by default), to not override any options
   defined in my.cnf (thanks to Axel Schwenke from Jobpilot.de for the
   suggestion)
2003-07-15 12:50:17 +02:00
unknown
6159cd27bf Portability fixes
acinclude.m4:
  Made test for compress more reliable (for Solaris)
sql/item_strfunc.cc:
  Portability fix (for Linux Alpha)
2003-07-15 13:10:20 +03:00
unknown
54fe4c542e mysql should ignore ' " ` symbols inside comments (Bug #539). 2003-07-15 14:38:48 +05:00
unknown
5c0075496e Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-15 10:47:45 +02:00
unknown
a1f92f0d12 Fix bug: mysqld crashes on func_sapdb test. 2003-07-15 12:55:29 +05:00
unknown
c458a78a83 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-07-15 11:15:03 +05:00