Commit 8b8c9452 authored by unknown's avatar unknown
Browse files

Fixed wrong memory references found by purify 

(No really critical errors found, but a few possible wrong results)


innobase/dict/dict0dict.c:
  Replace memcmp with comparison of characters to avoid warnings from purify when 'sptr' points to a very short string
mysql-test/r/select_found.result:
  Add missing drop table
mysql-test/r/type_set.result:
  More tests
mysql-test/t/select_found.test:
  Add missing drop table
mysql-test/t/type_set.test:
  More tests
mysys/my_init.c:
  Avoid warning from purify (purify doesn't handle getrusage() properly)
sql/field.h:
  enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters
sql/filesort.cc:
  enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters
sql/item_cmpfunc.cc:
  Fixed warning from purify. (Not critical as the arguments are passed to a function but not used)
  Allocate Arg_comparator() with 'new' instead of sql_alloc() to ensure proper initialization
sql/mysqld.cc:
  Wait for signal handler to stop when running --bootstrap
  (Fixes warning from purify)
sql/sql_insert.cc:
  Initialize slot used by innodb.cc (not critical)
sql/sql_lex.h:
  Better comments
sql/sql_repl.cc:
  memcmp -> bcmp() to avoid warning from purify
sql/sql_select.cc:
  Fix for out-of-bound memory reference when doing DISTINCT on const expressions
strings/ctype-simple.c:
  Fixes to not access uninitialized memory
  (Not critical)
parent 54dadffc

innobase/dict/dict0dict.c

+2 −1
Original line number Diff line number Diff line
@@ -2671,7 +2671,8 @@ dict_strip_comments( 
			/* Starting quote: remember the quote character. */

			quote = *sptr;

		} else if (*sptr == '#'

		    || (0 == memcmp("-- ", sptr, 3))) {

                           || (sptr[0] == '-' && sptr[1] == '-' &&

                               sptr[2] == ' ')) {

			for (;;) {

				/* In Unix a newline is 0x0A while in Windows

				it is 0x0D followed by 0x0A */

mysql-test/r/select_found.result

+1 −0
Original line number Diff line number Diff line
@@ -254,3 +254,4 @@ a 
SELECT FOUND_ROWS();

FOUND_ROWS()

1

DROP TABLE t1;

mysql-test/r/type_set.result

+18 −0
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ a 
A

a,A

a,A

select s from t1 order by concat(s);

s

A

a

a,A

a,A

drop table t1;

CREATE TABLE t1 (c set('ae','oe','ue','ss') collate latin1_german2_ci);

INSERT INTO t1 VALUES (''),(''),(''),('');
@@ -47,4 +53,16 @@ ss 
ss

ae,oe,ue,ss

ae,oe,ue,ss

SELECT c FROM t1 ORDER BY concat(c);

c

ae

ae

ae,oe,ue,ss

ae,oe,ue,ss

oe

oe

ss

ss

ue

ue

DROP TABLE t1;

mysql-test/t/select_found.test

+1 −0
Original line number Diff line number Diff line
@@ -175,3 +175,4 @@ CREATE TABLE t1 (a int, b int); 
INSERT INTO t1 VALUES (1,2), (1,3), (1,4), (1,5);

SELECT SQL_CALC_FOUND_ROWS DISTINCT 'a' FROM t1 GROUP BY b LIMIT 2;

SELECT FOUND_ROWS();

DROP TABLE t1;

mysql-test/t/type_set.test

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ create table t1 (s set ('a','A') character set latin1 collate latin1_bin); 
show create table t1;

insert into t1 values ('a'),('a,A'),('A,a'),('A');

select s from t1 order by s;

select s from t1 order by concat(s);

drop table t1;



#
@@ -34,4 +35,5 @@ INSERT INTO t1 VALUES ('ae'),('oe'),('ue'),('ss'); 
INSERT INTO t1 VALUES (',,,');

INSERT INTO t1 VALUES ('ae,oe,ue,ss');

SELECT c FROM t1 ORDER BY c;

SELECT c FROM t1 ORDER BY concat(c);

DROP TABLE t1;