Commit 330795c3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 6c29439b 3c8c62ca

mysql-test/r/create.result

+4 −4
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ drop table if exists t1; 
SET SESSION storage_engine="heap";

SELECT @@storage_engine;

@@storage_engine

HEAP

MEMORY

CREATE TABLE t1 (a int not null);

show create table t1;

Table	Create Table
@@ -222,7 +222,7 @@ SET SESSION storage_engine="gemini"; 
ERROR 42000: Unknown table engine 'gemini'

SELECT @@storage_engine;

@@storage_engine

HEAP

MEMORY

CREATE TABLE t1 (a int not null);

show create table t1;

Table	Create Table
@@ -371,7 +371,7 @@ drop database mysqltest; 
SET SESSION storage_engine="heap";

SELECT @@storage_engine;

@@storage_engine

HEAP

MEMORY

CREATE TABLE t1 (a int not null);

show create table t1;

Table	Create Table
@@ -383,7 +383,7 @@ SET SESSION storage_engine="gemini"; 
ERROR 42000: Unknown table engine 'gemini'

SELECT @@storage_engine;

@@storage_engine

HEAP

MEMORY

CREATE TABLE t1 (a int not null);

show create table t1;

Table	Create Table

mysql-test/r/ndb_database.result

0 → 100644
+27 −0
Original line number Diff line number Diff line 
drop table if exists t1;

drop database if exists mysqltest;

drop table if exists t1;

drop database if exists mysqltest;

create database mysqltest;

create database mysqltest;

create table mysqltest.t1 (a int primary key, b int) engine=ndb;

use mysqltest;

show tables;

Tables_in_mysqltest

t1

drop database mysqltest;

use mysqltest;

show tables;

Tables_in_mysqltest

create database mysqltest;

create table mysqltest.t1 (c int, d int primary key) engine=ndb;

use mysqltest;

show tables;

Tables_in_mysqltest

t1

drop database mysqltest;

use mysqltest;

show tables;

Tables_in_mysqltest

drop table if exists t1;

drop database if exists mysqltest;

mysql-test/r/ps_1general.result

+1 −1
Original line number Diff line number Diff line
@@ -322,8 +322,8 @@ prepare stmt4 from ' show storage engines '; 
execute stmt4;

Engine	Support	Comment

MyISAM	YES/NO	Default engine as of MySQL 3.23 with great performance

HEAP	YES/NO	Alias for MEMORY

MEMORY	YES/NO	Hash based, stored in memory, useful for temporary tables

HEAP	YES/NO	Alias for MEMORY

MERGE	YES/NO	Collection of identical MyISAM tables

MRG_MYISAM	YES/NO	Alias for MERGE

ISAM	YES/NO	Obsolete storage engine, now replaced by MyISAM

mysql-test/r/sp.result

+31 −0
Original line number Diff line number Diff line
@@ -667,6 +667,8 @@ delete from t1| 
drop table if exists t3|

create table t3 ( s char(16), d int)|

call into_test4()|

Warnings:

Warning	1329	No data to FETCH

select * from t3|

s	d

into4	NULL
@@ -1792,7 +1794,12 @@ end if; 
insert into t4 values (2, rc, t3);

end|

call bug1863(10)|

Warnings:

Note	1051	Unknown table 'temp_t1'

Warning	1329	No data to FETCH

call bug1863(10)|

Warnings:

Warning	1329	No data to FETCH

select * from t4|

f1	rc	t3

2	0	NULL
@@ -2090,7 +2097,11 @@ begin 
end|

call bug4579_1()|

call bug4579_1()|

Warnings:

Warning	1329	No data to FETCH

call bug4579_1()|

Warnings:

Warning	1329	No data to FETCH

drop procedure bug4579_1|

drop procedure bug4579_2|

drop table t3|
@@ -3010,4 +3021,24 @@ select @x| 
@x

2005

drop function bug8861|

drop procedure if exists bug9004_1|

drop procedure if exists bug9004_2|

create procedure bug9004_1(x char(16))

begin

insert into t1 values (x, 42);

insert into t1 values (x, 17);

end|

create procedure bug9004_2(x char(16))

call bug9004_1(x)|

call bug9004_1('12345678901234567')|

Warnings:

Warning	1265	Data truncated for column 'id' at row 1

Warning	1265	Data truncated for column 'id' at row 2

call bug9004_2('12345678901234567890')|

Warnings:

Warning	1265	Data truncated for column 'id' at row 1

Warning	1265	Data truncated for column 'id' at row 2

delete from t1|

drop procedure bug9004_1|

drop procedure bug9004_2|

drop table t1,t2;

mysql-test/r/variables.result

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ timed_mutexes OFF 
set storage_engine=MYISAM, storage_engine="HEAP", global storage_engine="MERGE";

show local variables like 'storage_engine';

Variable_name	Value

storage_engine	HEAP

storage_engine	MEMORY

show global variables like 'storage_engine';

Variable_name	Value

storage_engine	MERGE
@@ -254,7 +254,7 @@ set storage_engine=MERGE, big_tables=2; 
ERROR 42000: Variable 'big_tables' can't be set to the value of '2'

show local variables like 'storage_engine';

Variable_name	Value

storage_engine	HEAP

storage_engine	MEMORY

set SESSION query_cache_size=10000;

ERROR HY000: Variable 'query_cache_size' is a GLOBAL variable and should be set with SET GLOBAL

set GLOBAL storage_engine=DEFAULT;