Commit 68b8daf2 authored by unknown's avatar unknown
Browse files

Use pushed fix for same problem I fixed

parents be7a2ac4 78c09205

libmysql/libmysql.c

+0 −19
Original line number Diff line number Diff line
@@ -1115,25 +1115,6 @@ mysql_fetch_field(MYSQL_RES *result) 
}





/**************************************************************************

  Get column lengths of the current row

  If one uses mysql_use_result, res->lengths contains the length information,

  else the lengths are calculated from the offset between pointers.

**************************************************************************/



ulong * STDCALL

mysql_fetch_lengths(MYSQL_RES *res)

{

  MYSQL_ROW column;



  if (!(column=res->current_row))

    return 0;					/* Something is wrong */

  if (res->data)

    (*res->methods->fetch_lengths)(res->lengths, column, res->field_count);

  return res->lengths;

}





/**************************************************************************

  Move to a specific row and column

**************************************************************************/

mysql-test/r/drop_temp_table.result

+0 −1
Original line number Diff line number Diff line
@@ -18,5 +18,4 @@ master-bin.000001 # Query 1 # use `drop-temp+table-test`; create temporary table 
master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; create temporary table `table:name` (a int)

master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; create temporary table shortn2 (a int)

master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`shortn2`,`drop-temp+table-test`.`table:name`,`drop-temp+table-test`.`shortn1`

master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; DO RELEASE_LOCK("a")

drop database `drop-temp+table-test`;

mysql-test/r/federated.result

+322 −185

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/r/mix_innodb_myisam_binlog.result

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ master-bin.000001 96 Query 1 # use `test`; BEGIN 
master-bin.000001	165	Query	1	#	use `test`; insert into t1 values(8)

master-bin.000001	253	Query	1	#	use `test`; insert into t2 select * from t1

master-bin.000001	348	Query	1	#	use `test`; ROLLBACK

master-bin.000001	420	Query	1	#	use `test`; DO RELEASE_LOCK("a")

delete from t1;

delete from t2;

reset master;

mysql-test/r/rpl000001.result

+2 −17
Original line number Diff line number Diff line
@@ -33,27 +33,12 @@ select sum(length(word)) from t1; 
sum(length(word))

1022

drop table t1,t3;

create table t1 (n int) engine=myisam;

reset master;

stop slave;

reset slave;

create table t1(n int);

select get_lock("hold_slave",10);

get_lock("hold_slave",10)

1

explain extended select get_lock("hold_slave",10);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used

Warnings:

Note	1003	select sql_no_cache get_lock(_latin1'hold_slave',10) AS `get_lock("hold_slave",10)`

lock tables t1 read;

start slave;

select release_lock("hold_slave");

release_lock("hold_slave")

1

explain extended select release_lock("hold_slave");

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used

Warnings:

Note	1003	select sql_no_cache release_lock(_latin1'hold_slave') AS `release_lock("hold_slave")`

unlock tables;

create table t2(id int);

insert into t2 values(connection_id());