Commit a199cc20 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
parents c9659f0e b9a236a6

libmysql/libmysql.def

+2 −0
Original line number Diff line number Diff line
@@ -146,4 +146,6 @@ EXPORTS 
	mysql_rpl_query_type

	mysql_slave_query

	mysql_embedded

	mysql_server_init

	mysql_server_end

	get_defaults_files

mysql-test/README

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ http://dev.mysql.com/doc/mysql/en/MySQL_test_suite.html 


You can create your own test cases. To create a test case:



 xeamacs t/test_case_name.test

 xemacs t/test_case_name.test



 in the file, put a set of SQL commands that will create some tables,

 load test data, run some queries to manipulate it.

mysql-test/r/variables.result

+8 −0
Original line number Diff line number Diff line
@@ -520,3 +520,11 @@ SHOW VARIABLES LIKE 'table_cache'; 
Variable_name	Value

table_cache	1

SET GLOBAL table_cache=DEFAULT;

create table t1 (a int);

select a into @x from t1;

Warnings:

Warning	1329	No data to FETCH

show warnings;

Level	Code	Message

Warning	1329	No data to FETCH

drop table t1;

mysql-test/t/variables.test

+9 −0
Original line number Diff line number Diff line
@@ -388,3 +388,12 @@ SHOW VARIABLES LIKE 'MYISAM_DATA_POINTER_SIZE'; 
SET GLOBAL table_cache=-1;

SHOW VARIABLES LIKE 'table_cache';

SET GLOBAL table_cache=DEFAULT;



#

# Bug#6282 Packet error with SELECT INTO

# 

create table t1 (a int);

select a into @x from t1;

show warnings;

drop table t1;

ndb/src/ndbapi/DictCache.cpp

+3 −4
Original line number Diff line number Diff line
@@ -24,12 +24,11 @@ 
Ndb_local_table_info *

Ndb_local_table_info::create(NdbTableImpl *table_impl, Uint32 sz)

{

  if (sz % 8 != 0) // round to Uint64

    sz += 8 - sz % 8;

  void *data= malloc(sizeof(NdbTableImpl)+sz-8);

  Uint32 tot_size= sizeof(NdbTableImpl *) + ((sz+7)>>3)<<3; // round to Uint64

  void *data= malloc(tot_size);

  if (data == 0)

    return 0;

  memset(data,0,sizeof(NdbTableImpl)+sz-8);

  memset(data, 0, tot_size);

  new (data) Ndb_local_table_info(table_impl);

  return (Ndb_local_table_info *) data;

}