Commit graph

32609 commits

Author SHA1 Message Date
unknown
2b3633c7bd Fix for bug #22271: data casting may affect data stored in the next column(s?)
Using wrong filling value may cause unneeded extra bit rewriting.

Fix: use proper value to fill uneven bits.


mysql-test/r/type_bit.result:
  Fix for bug #22271: data casting may affect data stored in the next column(s?)
    - test case.
mysql-test/t/type_bit.test:
  Fix for bug #22271: data casting may affect data stored in the next column(s?)
    - test result.
sql/field.cc:
  Fix for bug #22271: data casting may affect data stored in the next column(s?)
    - use ((1 << bit_len) - 1) instead of 0xff to fill uneven bits 
      in order not to change other's bits.
2006-09-28 17:00:29 +05:00
unknown
d165736b8d Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_string.cc:
  Auto merged
strings/strtod.c:
  Auto merged
client/mysql.cc:
  Manual merge.
mysql-test/r/ctype_utf8.result:
  Manual merge.
2006-09-28 07:30:24 -04:00
unknown
47424c1547 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-09-28 13:20:40 +02:00
unknown
1f9b959166 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into  chilla.local:/home/mydev/mysql-4.1-bug20719-m
2006-09-28 12:20:17 +02:00
unknown
24a1e6f605 Bug#22384 - DELETE FROM table causes "Incorrect key file for table"
Deletes on a big index could crash the index when it needs to
shrink.

Put a forgotten negation operator in.

No test case. It is too big for the test suite. And it does not
work with 4.0, only with higher versions. It is attached to the
bug report.


myisam/mi_delete.c:
  Bug#22384 - DELETE FROM table causes "Incorrect key file for table"
  Put a negation operator ('!') before _mi_get_last_key() in del().
  It returns NULL on error, non-NULL on success.
2006-09-28 11:41:38 +02:00
unknown
d9f1d36074 Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware_libmysql_imp
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
2006-09-28 11:05:28 +02:00
unknown
d30536dc9d Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


sql/sql_select.cc:
  Auto merged
2006-09-28 10:37:21 +02:00
unknown
70255e8509 Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2006-09-28 10:36:04 +02:00
unknown
b8fe620615 Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt


sql/sql_select.cc:
  Auto merged
2006-09-28 10:19:25 +02:00
unknown
b7fcc913b4 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-28 09:32:49 +02:00
unknown
3f01b5df81 Increase test suite timeout to 3 hours 2006-09-28 09:30:24 +02:00
unknown
9825da7617 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21081
2006-09-28 11:04:49 +04:00
unknown
4bbca0b6bf Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mockturtle.local:/home/dlenev/src/mysql-4.1-runtime
2006-09-28 11:02:10 +04:00
unknown
792ad914f3 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-28 08:55:44 +02:00
unknown
56cfda333c Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  chilla.local:/home/mydev/mysql-5.0-bug20719-m
2006-09-28 08:55:01 +02:00
unknown
9c95543828 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0-maint.b22227
2006-09-28 10:41:09 +05:00
unknown
d6d786a07e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my50-bug21476
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-27 20:08:44 -04:00
unknown
033db2d038 Bug #20778: strange characters in warning message 1366 when called in SP
The function receives an exactly-sized buffer (not a C NUL-terminated string)
and passes it into a printf function to be interpreted with "%s".

Instead, create an intermediate String object, and copy the data into it, 
and pass in a pointer to the String's NUL-terminated buffer.


mysql-test/r/warnings.result:
  Test that warnings do not read outside its intended memory space.
mysql-test/t/warnings.test:
  Test that warnings do not read outside its intended memory space.
sql/field.cc:
  Create a new String object and use a pointer to its data instead of the 
  exactly-sized buffer to be interpreted as a C string deep within the 
  errmsg.txt list via printf.
2006-09-27 19:26:25 -04:00
unknown
8e72d7dba3 Merge mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint
into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint-gca
2006-09-27 17:28:31 -04:00
unknown
6930d9d269 Temporary fix for bug#22268 (official patch will come soon)
Don't cap threads at 1000 on Windows any more.
2006-09-27 17:13:58 -04:00
unknown
ca48feceee Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  example.com:/work/mysql-5.0-runtime


mysql-test/t/sp.test:
  Auto merged
sql/sp.cc:
  Auto merged
mysql-test/r/sp.result:
  manual merge
2006-09-27 22:25:23 +02:00
unknown
fcb8687ad9 Fix for bug#21311: Possible stack overrun if SP has non-latin1 name
There was possible stack overrun in an edge case which handles invalid body of
a SP in mysql.proc . That should be case when mysql.proc has been changed
manually. Though, due to bug 21513, it can be exploited without having access
to mysql.proc only being able to create a stored routine.


mysql-test/r/sp.result:
  update result
mysql-test/t/sp.test:
  add a test case for the bug
sql/sp.cc:
  Fix stack overrun. This happen mostly when mysql.proc is damaged, though
  it's possible due to another bug which creates invalid SP body in mysql.proc
  (leading quote from a label being cut) to create stack overrun even without
  having direct access to mysql.proc
2006-09-27 21:23:17 +02:00
unknown
7efdc62f9d BUG#21081: SELECT inside stored procedure returns wrong results
Re-execution of a parametrized prepared statement or a stored routine
with a SELECT that use LEFT JOIN with second table having only one row
could yield incorrect result.

The problem appeared only for left joins with second table having only
one row (aka const table) and equation conditions in ON or WHERE clauses
that depend on the argument passed.  Once the condition was false for
second const table, a NULL row was created for it, and any field involved
got NULL-value flag, which then was never reset.

The cause of the problem was that Item_field::null_value could be set
without being reset for re-execution.  The solution is to reset
Item_field::null_value in Item_field::cleanup().


mysql-test/r/ps.result:
  Add result for bug#21081: SELECT inside stored procedure returns wrong
  results.
mysql-test/t/ps.test:
  Add test case for bug#21081: SELECT inside stored procedure returns wrong
  results.
sql/item.cc:
  Reset Item_field::null_value flag for re-execution.
2006-09-27 23:11:45 +04:00
unknown
7f221a1837 Bug#21476: (Thread stack overrun not caught, causing SEGV)
The STACK_MIN_SIZE is currently set to 8192, when we actually need 
(emperically discovered) 9236 bytes to raise an fatal error, on Ubuntu 
Dapper Drake, libc6 2.3.6-0ubuntu2, Linux kernel 2.6.15-27-686, on x86.

I'm taking that as a new lower bound, plus 100B of wiggle-room for sundry
word sizes and stack behaviors.

The added test verifies in a cross-platform way that there are no gaps 
between the space that we think we need and what we actually need to report 
an error.

DOCUMENTERS:  This also adds "let" to the mysqltest commands that evaluate
an argument to expand variables therein.  (Only right of the "=", of course.)


client/mysqltest.c:
  Add "let" to the list of mysqltest commands that evaluates its arguments (only
  the right-hand-side of the equals-sign expression).
mysql-test/r/mysqltest.result:
  Added test to show that mysqltest "let" will evaluate the RHS correctly (and 
  expand the backslash test).
mysql-test/t/mysqltest.test:
  Added test to show that mysqltest "let" will evaluate the RHS correctly (and 
  expand the backslash test).
sql/mysql_priv.h:
  Increase the amount we require to be available for the stack, since 
  experience told us that the previous amount was too little by at least
  1044 bytes.
mysql-test/r/execution_constants.result:
  New BitKeeper file ``mysql-test/r/execution_constants.result''
mysql-test/t/execution_constants.test:
  New BitKeeper file ``mysql-test/t/execution_constants.test''
2006-09-27 14:42:56 -04:00
unknown
cd9fd11fd4 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-27 18:39:01 +02:00
unknown
5454ca7582 Add suppressions seen on maint1, nothing new just a nother version of libc 2006-09-27 18:10:15 +02:00
unknown
478965e67d Build fixes for netware/ directory
- Create the file netware/libmysql.imp from libmysql/libmysql.def
 - Remove the outdated netware/libmysql.imp file from version control


BitKeeper/deleted/.del-libmysql.imp:
  Delete: netware/libmysql.imp
BitKeeper/etc/ignore:
  Added netware/libmysql.imp to the ignore list
netware/Makefile.am:
  Build libmysql.imp from libmysql/libmysql.def
2006-09-27 17:11:19 +02:00
unknown
c316933e60 additional 'after merge' fix 2006-09-27 20:11:11 +05:00
unknown
f7e3747960 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-27 17:00:25 +02:00
unknown
131d94f58c The mySTL directory has moved from yassl/mySTL to yassl/taocrypt/mySTL 2006-09-27 16:51:59 +02:00
unknown
4afea2482e Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-27 16:47:59 +02:00
unknown
a714c2cfb3 Fix compile failure on Sun C++ 5.7 in yaSSL code
- Trying to use unctions declared as static being used from another file, change them to be inline


extra/yassl/taocrypt/mySTL/helpers.hpp:
  Change 'GetMemory' and 'FreeMemory' function te be inline instead of static.
2006-09-27 16:45:44 +02:00
unknown
c1e264a5f5 after merge fix 2006-09-27 19:21:29 +05:00
unknown
d6d1176eed After merge fix. 2006-09-27 18:33:31 +05:00
unknown
6d77ba47e5 Merge mysql.com:/home/gluh/MySQL/Merge/4.1
into  mysql.com:/home/gluh/MySQL/Merge/5.0


sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/table.cc:
  Auto merged
include/mysql_com.h:
  manual merge
mysql-test/r/ctype_utf8.result:
  manual merge
mysql-test/t/ctype_utf8.test:
  manual merge
sql/sql_acl.cc:
  manual merge
2006-09-27 18:06:46 +05:00
unknown
abd883f4d0 Patch for bug#21432 is reverted 2006-09-27 17:49:16 +05:00
unknown
fa97f0faa1 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-27 14:44:06 +02:00
unknown
9f9e8dc660 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-09-27 14:41:29 +02:00
unknown
8d4ad17217 Import yaSSL version 1.4.3
extra/yassl/examples/echoserver/echoserver.cpp:
  Import patch yassl.diff
extra/yassl/examples/server/server.cpp:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/src/template_instnt.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/misc.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/test.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/crypto.cpp:
  Import patch yassl.diff
2006-09-27 14:36:12 +02:00
unknown
c47cab0b80 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2006-09-27 15:04:11 +03:00
unknown
9a00f96f21 When valgrinding add /usr/lib/debug" to LD_LIBRARY_PATH if available
mysql-test/mysql-test-run.pl:
  Rewrite the setup of LD_LIBRARY_PATH and DYLD_LIBRARY_PATH to make it easier to modify
  Valgrind need to be run with debug libraries  otherwise it's almost impossible to add
  correct supressions, that means if "/usr/lib/debug" is available, it should be added to
  LD_LIBRARY_PATH
2006-09-27 13:42:16 +02:00
unknown
97ee72c5a0 Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines


myisammrg/myrg_open.c:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Auto merged
mysql-test/r/repair.result:
  Use local.
sql/table.cc:
  Use local.
mysql-test/r/merge.result:
  Manual merge
2006-09-27 15:42:00 +05:00
unknown
30ffabad04 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-09-27 15:34:52 +05:00
unknown
31191b8573 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into  chilla.local:/home/mydev/mysql-4.0-bug20719
2006-09-27 12:29:12 +02:00
unknown
f7316a9eb8 Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-27 15:25:00 +05:00
unknown
e3bdaddfff Merge chilla.local:/home/mydev/mysql-4.1-bug20719-m
into  chilla.local:/home/mydev/mysql-5.0-bug20719-m


myisam/mi_dynrec.c:
  Auto merged
2006-09-27 12:03:49 +02:00
unknown
8948564e0d Bug#20719 - Reading dynamic records with write buffer could fail
After merge fix.
2006-09-27 11:55:30 +02:00
unknown
ca5e29475c Bug #21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
- reversed the patch for 5.0 and moved to 5.1


mysql-test/r/group_by.result:
  Bug #21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
   - reversed the patch for 5.0
mysql-test/t/group_by.test:
  Bug #21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
   - reversed the patch for 5.0
sql/sql_select.cc:
  Bug #21174: Index degrades sort performance and optimizer does not honor IGNORE INDEX
   - reversed the patch for 5.0
2006-09-27 12:53:53 +03:00
unknown
afedaa1089 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21414


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2006-09-27 11:46:29 +04:00
unknown
850b668869 Merge chilla.local:/home/mydev/mysql-4.1-bug20719
into  chilla.local:/home/mydev/mysql-4.1-bug20719-m


myisam/mi_dynrec.c:
  Auto merged
2006-09-27 09:30:54 +02:00