Commit 7d6d4c83 authored by unknown's avatar unknown
Browse files

Fixed problems found by valgrind 

Fixed problems in test suite where some test failed
Fixed access to not initialized memory in federated
Fixed access to not initialized memory when using BIT fields in internal temporary tables


BitKeeper/etc/ignore:
  added libmysqld/sql_cursor.h
mysql-test/r/information_schema.result:
  Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middlecd
mysql-test/r/information_schema_inno.result:
  Remove used tables at start
mysql-test/r/multi_statement.result:
  Remove used tables at start
mysql-test/r/temp_table.result:
  Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle
mysql-test/r/type_bit.result:
  More tests
mysql-test/t/information_schema.test:
  Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle
mysql-test/t/information_schema_inno.test:
  Remove used tables at start
mysql-test/t/multi_statement.test:
  Remove used tables at start
mysql-test/t/temp_table.test:
  Change view names to 'v#' to not cause massive conflict with other tests if test dies in the middle
mysql-test/t/type_bit.test:
  More tests
mysql-test/valgrind.supp:
  Removed some valgrind warnings that isn't errors
sql/ha_federated.cc:
  Fixed errors discovered by valgrind:
  - Socket was not initialized
  - share->scheme was deleted while there was still pointer into it from the hash
sql/item_func.h:
  Remove access to table object from cleanup() as the table object may have been dropped earlier (In case of temporary tables or of close_thread_tables() is run before cleanup())
  This fixed a bug with access to already freed memory
sql/sql_base.cc:
  Reset variables used by fulltext
sql/sql_select.cc:
  Fixed various problems with bit fields when used in internal temporary tables.
  Calculate space needed for bit fields correctly (previously we allocated more space than needed for rows in heap/myisam tables)
parent 813fc410

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1125,3 +1125,5 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl

libmysqld/sql_cursor.cc

libmysqld/sql_cursor.h

mysql-test/r/information_schema.result

+12 −11
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t0,t1,t2,t3,t5;

DROP TABLE IF EXISTS t0,t1,t2,t3,t4,t5;

DROP VIEW IF EXISTS v1;

show variables where variable_name like "skip_show_database";

Variable_name	Value

skip_show_database	OFF
@@ -638,8 +639,8 @@ use test; 
create function sub1(i int) returns int

return i+1;

create table t1(f1 int);

create view t2 (c) as select f1 from t1;

create view t3 (c) as select sub1(1);

create view v2 (c) as select f1 from t1;

create view v3 (c) as select sub1(1);

create table t4(f1 int, KEY f1_key (f1));

drop table t1;

drop function sub1;
@@ -647,29 +648,29 @@ select table_name from information_schema.views 
where table_schema='test';

table_name

Warnings:

Warning	1356	View 'test.t2' references invalid table(s) or column(s) or function(s)

Warning	1356	View 'test.t3' references invalid table(s) or column(s) or function(s)

Warning	1356	View 'test.v2' references invalid table(s) or column(s) or function(s)

Warning	1356	View 'test.v3' references invalid table(s) or column(s) or function(s)

select table_name from information_schema.views

where table_schema='test';

table_name

Warnings:

Warning	1356	View 'test.t2' references invalid table(s) or column(s) or function(s)

Warning	1356	View 'test.t3' references invalid table(s) or column(s) or function(s)

Warning	1356	View 'test.v2' references invalid table(s) or column(s) or function(s)

Warning	1356	View 'test.v3' references invalid table(s) or column(s) or function(s)

select column_name from information_schema.columns

where table_schema='test';

column_name

f1

Warnings:

Warning	1356	View 'test.t2' references invalid table(s) or column(s) or function(s)

Warning	1356	View 'test.t3' references invalid table(s) or column(s) or function(s)

Warning	1356	View 'test.v2' references invalid table(s) or column(s) or function(s)

Warning	1356	View 'test.v3' references invalid table(s) or column(s) or function(s)

select index_name from information_schema.statistics where table_schema='test';

index_name

f1_key

select constraint_name from information_schema.table_constraints

where table_schema='test';

constraint_name

drop view t2;

drop view t3;

drop view v2;

drop view v3;

drop table t4;

select * from information_schema.table_names;

ERROR 42S02: Unknown table 'table_names' in information_schema

mysql-test/r/information_schema_inno.result

+1 −1
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1,t2;

DROP TABLE IF EXISTS t1,t2,t3;

CREATE TABLE t1 (id INT NOT NULL, PRIMARY KEY (id)) ENGINE=INNODB;

CREATE TABLE t2 (id INT PRIMARY KEY, t1_id INT, INDEX par_ind (t1_id, id),

FOREIGN KEY (t1_id) REFERENCES t1(id)  ON DELETE CASCADE,

mysql-test/r/multi_statement.result

+1 −0
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1;

select 1;

1

1

mysql-test/r/temp_table.result

+15 −14
Original line number Diff line number Diff line 
drop table if exists t1,t2;

drop view if exists v1;

CREATE TABLE t1 (c int not null, d char (10) not null);

insert into t1 values(1,""),(2,"a"),(3,"b");

CREATE TEMPORARY TABLE t1 (a int not null, b char (10) not null);
@@ -99,32 +100,32 @@ Variable_name Value 
Created_tmp_disk_tables	0

Created_tmp_tables	2

drop table t1;

create temporary table t1 as select 'This is temp. table' A;

create view t1 as select 'This is view' A;

select * from t1;

create temporary table v1 as select 'This is temp. table' A;

create view v1 as select 'This is view' A;

select * from v1;

A

This is temp. table

show create table t1;

show create table v1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

v1	CREATE TEMPORARY TABLE `v1` (

  `A` varchar(19) NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

show create view t1;

show create view v1;

View	Create View

t1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `t1` AS select _latin1'This is view' AS `A`

drop view t1;

select * from t1;

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select _latin1'This is view' AS `A`

drop view v1;

select * from v1;

A

This is temp. table

create view t1 as select 'This is view again' A;

select * from t1;

create view v1 as select 'This is view again' A;

select * from v1;

A

This is temp. table

drop table t1;

select * from t1;

drop table v1;

select * from v1;

A

This is view again

drop view t1;

drop view v1;

create table t1 (a int, b int, index(a), index(b));

create table t2 (c int auto_increment, d varchar(255), primary key (c));

insert into t1 values (3,1),(3,2);