Commit graph

35864 commits

Author SHA1 Message Date
unknown
916245f9c4 Bug#27079 Crash while grouping empty ucs2 strings
Problem: GROUP BY on empty ucs2 strings crashed server.
Reason: sometimes mi_unique_hash() is executed with
ptr=null and length=0, which means "empty string".
The branch of code handling UCS2 character set
was not safe against ptr=null and fell into and
endless loop even if length=0 because of poiter
arithmetic overflow.
Fix: adding special check for length=0 to avoid pointer arithmetic
overflow.


mysql-test/r/ctype_uca.result:
  Adding test case
mysql-test/t/ctype_uca.test:
  Adding test case
strings/ctype-uca.c:
  Fix my_uca_scanner_init_ucs2 to be safe against
  strings with length=0 and ptr=0.
2007-03-27 12:20:20 +05:00
unknown
b339b30c55 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-26 21:02:14 +02:00
unknown
d24dab182f correct medium int printout
correct cit printout
    correct bit store retrieve


ndb/include/ndbapi/NdbRecAttr.hpp:
  correct medium int printout
ndb/src/ndbapi/NdbRecAttr.cpp:
  correct cit printout
sql/ha_ndbcluster.cc:
  correct bit store retrieve
2007-03-26 17:57:00 +02:00
unknown
6e93d2939d WL3527: 5.0 part:
enabled the optional FOR JOIN to all the three
clauses : USE, FORCE and IGNORE


mysql-test/r/select.result:
  WL3527: 5.0 part: test cases
mysql-test/t/select.test:
  WL3527: 5.0 part: test cases
2007-03-26 16:52:52 +03:00
unknown
05a352bb99 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-26 14:49:24 +02:00
unknown
e3f3c6f0b6 Bug #26986 BIT(33) for ndb is broken on solaris.
- always store lsw first in ndb
2007-03-26 14:48:52 +02:00
unknown
ec5051fff4 Merge magare.gmz:/home/kgeorge/mysql/work/B27164-4.1-opt
into  magare.gmz:/home/kgeorge/mysql/work/B27164-5.0-opt


mysql-test/t/gis.test:
  Auto merged
mysql-test/r/gis.result:
  merge 4.1-opt -> 5.0-opt
sql/field.h:
  merge 4.1-opt -> 5.0-opt
2007-03-26 14:14:23 +03:00
unknown
f28a7a0674 Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028
2007-03-26 12:50:40 +02:00
unknown
3335f68d89 Bug #27164: not reseting the data pointer
to 0 causes wrong (large) length to be read
 from the row in _mi_calc_blob_length() when 
 storing NULL values in (e.g) POINT columns.
 This large length is then used to allocate
 a block of memory that (on some OSes) causes
 trouble.
 Fixed by calling the base class's 
 Field_blob::reset() from Field_geom::reset()
 that is called when storing a NULL value into
 the column.


mysql-test/r/gis.result:
  Bug #27164: test case
mysql-test/t/gis.test:
  Bug #27164: test case
sql/field.h:
  Bug #27164: not reseting the data pointer
   to 0 causes wrong (large) length to be read
   from the row in _mi_calc_blob_length() when 
   storing NULL values in (e.g) POINT columns.
   This large length is then used to allocate
   a block of memory that (on some OSes) causes
   trouble.
2007-03-26 13:17:40 +03:00
unknown
3d90a07a06 Fix for bug #26844 "Memory allocation failures ignored by slave IO thread".
Pass ME_NOREFRESH flag to an error handler in my_malloc() and _mymalloc() in case of memory allocation failure, so that it gets logged to the error log.


mysys/my_malloc.c:
  Pass ME_NOREFRESH flag to an error handler in my_malloc() in case of memory allocation failure, so that it gets logged to the error log.
mysys/safemalloc.c:
  Pass ME_NOREFRESH flag to an error handler in _mymalloc() in case of memory allocation failure, so that it gets logged to the error log.
2007-03-26 13:31:23 +04:00
unknown
e77cdbe2c0 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/home/ram/work/b25301/b25301.4.1


sql-common/my_time.c:
  Auto merged
2007-03-26 13:45:02 +05:00
unknown
9dfe413a15 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b25301/b25301.5.0


sql-common/my_time.c:
  Auto merged
2007-03-26 13:43:20 +05:00
unknown
df4d3039c3 remove warning 2007-03-26 10:39:11 +02:00
unknown
d37fc3ce1f Bug #26900 ndb_restore printout option does not give structured data
- set sizes for data
2007-03-26 09:58:01 +02:00
unknown
9b2e0127f0 Fix for bug #25993: mysqldump crashes with merge table and -c option
opt_complete_insert was improperly used by accident.
Use complete_insert flag instead.


client/mysqldump.c:
  Fix for bug #25993: mysqldump crashes with merge table and -c option
    - use complete_insert instead of opt_complete_insert.
mysql-test/r/mysqldump.result:
  Fix for bug #25993: mysqldump crashes with merge table and -c option
    - test result.
mysql-test/t/mysqldump.test:
  Fix for bug #25993: mysqldump crashes with merge table and -c option
    - test case.
2007-03-26 12:56:41 +05:00
unknown
43afb278a3 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27229
2007-03-25 23:48:48 -07:00
unknown
d95c307f1d This is a fix for the memory corruption occurred in one of test cases
from func_group.test after the patch for bug #27229 had been applied.
The memory corruption happened because in some rare cases the function
count_field_types underestimated the number of elements in
in the array param->items_to_copy.


sql/item_sum.cc:
  The return value of the Item_sum::update_used_tables method
  should not depend on the place of aggregation of the set 
  function for which the Item_sum object has been created.
sql/sql_select.cc:
  This is a fix for the memory corruption occurred in one of test cases
  from func_group.test after the patch for bug #27229 had been applied.
  The memory corruption happened because in some rare cases the function
  count_field_types underestimated the number of elements in
  in the array param->items_to_copy.
  
  Currently it's not guaranteed that after JOIN::prepare() the 
  used_tables attribute is calculated for all items. For example
  for the expression SUM(outer_ref)+1 used_tables() must return
  OUTER_REF_TABLE_BIT. Yet by the moment when the used_tables
  attribute is calculated in JOIN::prepare SUM(outer_ref) has
  not been substituted for Item_aggregate_ref yet.
  By this reason additional calls of the method update_used_tables
  are needed for some items passed as parameters to the function
  create_tmp_table.
2007-03-25 23:44:06 -07:00
unknown
9f9a4556df Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2007-03-25 16:44:06 +02:00
unknown
03089d8977 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into  chilla.local:/home/mydev/mysql-4.1--team


sql/ha_myisam.cc:
  Auto merged
2007-03-25 15:13:22 +02:00
unknown
de1d7c23f6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  chilla.local:/home/mydev/mysql-4.1--main
2007-03-25 15:11:16 +02:00
unknown
578d29d6f3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  chilla.local:/home/mydev/mysql-5.0--team


sql/ha_myisam.cc:
  Auto merged
2007-03-25 14:44:16 +02:00
unknown
7910abf4b9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0--main


sql/ha_ndbcluster.cc:
  Auto merged
2007-03-25 14:40:25 +02:00
unknown
27f8c35760 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build


sql/mysqld.cc:
  Auto merged
2007-03-24 14:05:27 +02:00
unknown
a1e7490f41 nptl: typo fixed. sigaddset restored 2007-03-24 14:03:27 +02:00
unknown
92602369b0 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
2007-03-24 08:21:59 +01:00
unknown
eee28a267d Bug #24563: MBROverlaps does not seem to function propertly.
Fix is to rewrite the MBR::overlaps() function, to compute the dimension of both
arguments, and the dimension of the intersection; test that all three dimensions are the
same (e.g., all are Polygons).

Add tests for all MBR* functions for various combinations of shapes, lines and points.


mysql-test/include/gis_generic.inc:
  Add tests & checks for bug #24563 and bug #24588 - some GIS functions missing in
  5.1; many GIS functions not tested; Overlaps() function was incorrect when MBR shifted
  only along one axis; Overlaps() needs to take dimension of shape into account.
mysql-test/r/archive_gis.result:
  Update test results.
mysql-test/r/bdb_gis.result:
  Update test results.
mysql-test/r/gis.result:
  Update test results.
mysql-test/r/innodb_gis.result:
  Update test results.
mysql-test/r/ndb_gis.result:
  Update test results.
mysql-test/t/gis.test:
  Add tests & checks for bug #24563 and bug #24588 - some GIS functions missing in
  5.1; many GIS functions not tested; Overlaps() function was incorrect when MBR shifted
  only along one axis; Overlaps() needs to take dimension of shape into account.
sql/spatial.h:
  Add MBR::dimension() (map MBR to integral dimension: point -> 0, line -> 1,
  polygon -> 2, invalid -> -1)
  
  Fix MBR::overlaps() to handle MBRs which are shifted on one dimension only, and to
  take MBR dimension into account.  Also, test both within() and contains() predicates (so
  that overlaps(a, b) == overlaps(b, a)).
2007-03-23 16:28:07 -06:00
unknown
139c950f11 bug#26346
Added some fixes for an existing memory leak and unitilialized variables, both caught by gcc.
2007-03-23 18:15:11 -04:00
unknown
85e1718e00 bug in im* tests - missing --no-defaults in the mysql command line 2007-03-23 22:16:32 +02:00
unknown
1e92dcae89 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build


mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-03-23 20:39:34 +02:00
unknown
d89329c685 reverted linuxthreads thr_client_alarm fix (not future-proof)
fixed differently: wake up select_thread with THR_SERVER_ALARM instead


mysys/thr_alarm.c:
  reverted linuxthreads thr_client_alarm fix (not future-proof)
2007-03-23 20:37:20 +02:00
unknown
cec241f456 Merge naruto.:C:/cpp/bug20777/my50-bug20777
into  naruto.:C:/cpp/mysql-5.0-runtime


mysql-test/r/sp.result:
  manual merge
mysql-test/t/sp.test:
  manual merge
sql/item_func.cc:
  manual merge
2007-03-23 19:14:13 +01:00
unknown
24ce495a51 Bug#26837 Return value ignored for packet->append() call within Log_event::read_log_event
- Improve error handling for "out of memory" problems when master is
   sending logs to slave. If memory allocation fails the log should
   now  report error "memory allocation failed reading log event"  


sql/log_event.cc:
  Return LOG_READ_MEM from "Log_event::read_log_event" if memory
  allocation  fails.
2007-03-23 19:00:34 +01:00
unknown
2b52bc2a8e Merge damiendev.:C:/build/mysql-5.0
into  damiendev.:C:/build/dev50
2007-03-23 13:43:46 -04:00
unknown
7dc5c00453 enabled and extended single user test 2007-03-23 17:14:38 +01:00
unknown
1404365643 Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  abort on timeout if in single user mode
2007-03-23 17:07:33 +01:00
unknown
3f76fbfa72 Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 16:44:33 +01:00
unknown
37ef840f77 Import patch from yaSSL after fixing warnings upstream
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/testsuite.cpp:
  Import patch yassl.diff
2007-03-23 16:41:17 +01:00
unknown
18f50f1288 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work


BUILD/check-cpu:
  Auto merged
2007-03-23 16:04:45 +01:00
unknown
c62c0d9df8 Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build


mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  SCCS merged
2007-03-23 16:37:19 +02:00
unknown
29bf3ad4fb Merge bk-internal:/home/bk/mysql-5.0
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
2007-03-23 16:32:42 +02:00
unknown
cc72a835d6 Merge bk-internal:/home/bk/mysql-4.1-build
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2007-03-23 16:05:02 +02:00
unknown
06083cdc03 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  manual merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge
2007-03-23 14:09:30 +01:00
unknown
9a4b2e9081 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1


mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-03-23 14:57:55 +02:00
unknown
a80c9cced4 Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  add single user mode field in table definition
ndb/include/ndb_constants.h:
  new constants for single usermode option of tables
ndb/include/ndbapi/NdbDictionary.hpp:
  add single user mode field in table definition
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  add single user mode field in table definition
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  add single user mode field in table definition
  send this infor to TC
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  add single user mode field in table definition
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  single user table mode on table object
  merge some flags from uint8 to bits
  get allow transaction to also check single user mode
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  single user table mode on table object
  merge some flags from uint8 to bits
  get allow transaction to also check single user mode
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  set single user mode flag on system tables to make them always updatable
ndb/src/ndbapi/NdbDictionary.cpp:
  get/set functions for single user mode on tables
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  get/set functions for single user mode on tables
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  get/set functions for single user mode on tables
ndb/test/src/NDBT_Table.cpp:
  print single user mode
2007-03-23 13:52:03 +01:00
unknown
c80ac29ee2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1


sql/mysqld.cc:
  merged
2007-03-23 14:47:51 +02:00
unknown
df82efbdf8 Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 13:40:57 +01:00
unknown
201af2d8bd Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2007-03-23 13:10:58 +01:00
unknown
6e1f446ae1 move thr_client_alarm initialization to mysqld.cc
(in thr_alarm.cc it happened too late).


mysys/thr_alarm.c:
  move thr_client_alarm initialization to mysqld.cc
  (here it happened too late)
sql/mysqld.cc:
  move thr_client_alarm initialization to mysqld.cc
  (in thr_alarm.cc it happened too late).
  moved thr_kill_signal initialization to init_signals()
2007-03-23 13:38:42 +02:00
unknown
81a701cb9c Backport from 5.1, limit SHOW VARIABLES to "log_bin%" 2007-03-23 12:35:30 +01:00
unknown
45f2f76457 Import yassl 1.6.0
extra/yassl/README:
  Import patch yassl.diff
extra/yassl/include/buffer.hpp:
  Import patch yassl.diff
extra/yassl/include/crypto_wrapper.hpp:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/include/socket_wrapper.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl_imp.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl_int.hpp:
  Import patch yassl.diff
extra/yassl/src/crypto_wrapper.cpp:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/README:
  Import patch yassl.diff
extra/yassl/taocrypt/benchmark/benchmark.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/algebra.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/des.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/hash.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/hmac.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/misc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/modarith.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/modes.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/rsa.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/sha.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/type_traits.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/types.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/mySTL/list.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/aes.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/algebra.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/asn.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/hash.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/sha.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/testsuite.cpp:
  Import patch yassl.diff
2007-03-23 11:52:25 +01:00