Commit bd3de2b1 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
parents 3b1a93bf 742ca412

mysql-test/r/mysqldump.result

+30 −5
Original line number Diff line number Diff line
@@ -54,7 +54,10 @@ CREATE TABLE `t1` ( 
);

INSERT INTO `t1` VALUES ('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456),('1.23450',2.3456);



/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT, CHARACTER_SET_CLIENT=utf8 */;

/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;

/*!40101 SET NAMES utf8 */;

/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE="NO_AUTO_VALUE_ON_ZERO" */;
@@ -75,6 +78,8 @@ UNLOCK TABLES; 
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;



/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
@@ -138,7 +143,10 @@ DROP TABLE t1; 
CREATE TABLE t1 (a  VARCHAR(255)) DEFAULT CHARSET koi8r;

INSERT INTO t1  VALUES (_koi8r x'C1C2C3C4C5');



/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT, CHARACTER_SET_CLIENT=utf8 */;

/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;

/*!40101 SET NAMES utf8 */;

/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE="NO_AUTO_VALUE_ON_ZERO" */;
@@ -158,6 +166,8 @@ UNLOCK TABLES; 
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;



DROP TABLE t1;

CREATE TABLE t1 (a int) ENGINE=MYISAM;
@@ -208,7 +218,10 @@ CREATE TABLE ```a` ( 
drop table ```a`;

create table t1(a int);



/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT, CHARACTER_SET_CLIENT=utf8 */;

/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;

/*!40101 SET NAMES utf8 */;

/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE="NO_AUTO_VALUE_ON_ZERO" */;
@@ -227,6 +240,8 @@ UNLOCK TABLES; 
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;



/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
@@ -248,7 +263,10 @@ UNLOCK TABLES; 


set global sql_mode='ANSI_QUOTES';



/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT, CHARACTER_SET_CLIENT=utf8 */;

/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;

/*!40101 SET NAMES utf8 */;

/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE="NO_AUTO_VALUE_ON_ZERO" */;
@@ -267,6 +285,8 @@ UNLOCK TABLES; 
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;



/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;

/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
@@ -291,7 +311,10 @@ drop table t1; 
create table t1(a int);

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



/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT, CHARACTER_SET_CLIENT=utf8 */;

/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;

/*!40101 SET NAMES utf8 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE="" */;

DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (
@@ -301,6 +324,8 @@ CREATE TABLE `t1` ( 


/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;



1

2

mysql-test/r/ps.result

0 → 100644
+115 −0
Original line number Diff line number Diff line 
drop table if exists t1,t2;

create table t1

(

a int primary key,

b char(10)

);

insert into t1 values (1,'one');

insert into t1 values (2,'two');

insert into t1 values (3,'three');

insert into t1 values (4,'four');

set @a=2;

prepare stmt1 from 'select * from t1 where a <= ?';

execute stmt1 using @a;

a	b

1	one

2	two

set @a=3;

execute stmt1 using @a;

a	b

1	one

2	two

3	three

deallocate prepare no_such_statement;

ERROR HY000: Unknown prepared statement handler (no_such_statement) given to DEALLOCATE PREPARE

execute stmt1;

ERROR HY000: Wrong arguments to EXECUTE

prepare stmt2 from 'prepare nested_stmt from "select 1"';

ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '"select 1"' at line 1

prepare stmt2 from 'execute stmt1';

ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'stmt1' at line 1

prepare stmt2 from 'deallocate prepare z';

ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'z' at line 1

prepare stmt3 from 'insert into t1 values (?,?)';

set @arg1=5, @arg2='five';

execute stmt3 using @arg1, @arg2;

select * from t1 where a>3;

a	b

4	four

5	five

prepare stmt4 from 'update t1 set a=? where b=?';

set @arg1=55, @arg2='five';

execute stmt4 using @arg1, @arg2;

select * from t1 where a>3;

a	b

4	four

55	five

prepare stmt4 from 'create table t2 (a int)';

execute stmt4;

prepare stmt4 from 'drop table t2';

execute stmt4;

execute stmt4;

ERROR 42S02: Unknown table 't2'

prepare stmt5 from 'select ? + a from t1';

set @a=1;

execute stmt5 using @a;

? + a

2

3

4

5

56

execute stmt5 using @no_such_var;

? + a

NULL

NULL

NULL

NULL

NULL

set @nullvar=1;

set @nullvar=NULL;

execute stmt5 using @nullvar;

? + a

NULL

NULL

NULL

NULL

NULL

set @nullvar2=NULL;

execute stmt5 using @nullvar2;

? + a

NULL

NULL

NULL

NULL

NULL

prepare stmt6 from 'select 1; select2';

ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '; select2' at line 1

prepare stmt6 from 'insert into t1 values (5,"five"); select2';

ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '; select2' at line 1

explain prepare stmt6 from 'insert into t1 values (5,"five"); select2';

ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'from 'insert into t1 values (5,"five"); select2'' at line 1

create table t2

(

a int

);

insert into t2 values (0);

set @arg00=NULL ;

prepare stmt1 from 'select 1 FROM t2 where a=?' ;

execute stmt1 using @arg00 ;

1

prepare stmt1 from @nosuchvar;

ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'NULL' at line 1

set @ivar= 1234;

prepare stmt1 from @ivar;

ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '1234' at line 1

set @fvar= 123.4567;

prepare stmt1 from @fvar;

ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '123.4567' at line 1

set @str1 = 'select ?';

set @str2 = convert(@str1 using ucs2);

prepare stmt1 from @str2;

execute stmt1 using @ivar;

?

1234

drop table t1,t2;

mysql-test/r/rpl_ps.result

0 → 100644
+28 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

drop table if exists t1;

create table t1(n char(30));

prepare stmt1 from 'insert into t1 values (?)';

set @var1= "from-master-1";

execute stmt1 using @var1;

set @var1= "from-master-2-'',";

execute stmt1 using @var1;

select * from t1;

n

from-master-1

from-master-2-'',

set @var2= 'insert into t1 values (concat("from-var-", ?))';

prepare stmt2 from @var2;

set @var1='from-master-3';

execute stmt2 using @var1;

select * from t1;

n

from-master-1

from-master-2-'',

from-var-from-master-3

drop table t1;

stop slave;

mysql-test/t/ps.test

0 → 100644
+119 −0
Original line number Diff line number Diff line 
#

# SQL Syntax for Prepared Statements test

#

--disable_warnings

drop table if exists t1,t2;

--enable_warnings



create table t1

(

  a int primary key,

  b char(10)

);

insert into t1 values (1,'one');

insert into t1 values (2,'two');

insert into t1 values (3,'three');

insert into t1 values (4,'four');



# basic functionality

set @a=2;

prepare stmt1 from 'select * from t1 where a <= ?';

execute stmt1 using @a;

set @a=3;

execute stmt1 using @a;



# non-existant statement

--error 1243

deallocate prepare no_such_statement;



--error 1210

execute stmt1;



# Nesting ps commands is not allowed: 

--error 1064

prepare stmt2 from 'prepare nested_stmt from "select 1"';



--error 1064

prepare stmt2 from 'execute stmt1';



--error 1064

prepare stmt2 from 'deallocate prepare z';



# PS insert 

prepare stmt3 from 'insert into t1 values (?,?)';

set @arg1=5, @arg2='five';

execute stmt3 using @arg1, @arg2;

select * from t1 where a>3;



# PS update 

prepare stmt4 from 'update t1 set a=? where b=?';

set @arg1=55, @arg2='five';

execute stmt4 using @arg1, @arg2;

select * from t1 where a>3;



# PS create/delete

prepare stmt4 from 'create table t2 (a int)';

execute stmt4;

prepare stmt4 from 'drop table t2';

execute stmt4;



# Do something that will cause error

--error 1051

execute stmt4;



# placeholders in result field names.

prepare stmt5 from 'select ? + a from t1';

set @a=1;

execute stmt5 using @a;



execute stmt5 using @no_such_var;



set @nullvar=1;

set @nullvar=NULL;

execute stmt5 using @nullvar;



set @nullvar2=NULL;

execute stmt5 using @nullvar2;



# Check that multiple SQL statements are disabled inside PREPARE

--error 1064

prepare stmt6 from 'select 1; select2';



--error 1064

prepare stmt6 from 'insert into t1 values (5,"five"); select2';



# This shouldn't parse

--error 1064

explain prepare stmt6 from 'insert into t1 values (5,"five"); select2';



create table t2

(

  a int

);



insert into t2 values (0);



# parameter is NULL

set @arg00=NULL ;

prepare stmt1 from 'select 1 FROM t2 where a=?' ;

execute stmt1 using @arg00 ;



# prepare using variables:

--error 1064

prepare stmt1 from @nosuchvar;



set @ivar= 1234;

--error 1064

prepare stmt1 from @ivar;



set @fvar= 123.4567;

--error 1064

prepare stmt1 from @fvar;



set @str1 = 'select ?';

set @str2 = convert(@str1 using ucs2);

prepare stmt1 from @str2;

execute stmt1 using @ivar;



drop table t1,t2;

mysql-test/t/rpl_ps.test

0 → 100644
+43 −0
Original line number Diff line number Diff line 
#

# Test of replicating user variables

#

source include/master-slave.inc;



#save_master_pos;

#connection slave;

#sync_with_master;

#reset master;

#connection master;



--disable_warnings

drop table if exists t1;

--enable_warnings



create table t1(n char(30));



prepare stmt1 from 'insert into t1 values (?)';

set @var1= "from-master-1";

execute stmt1 using @var1;

set @var1= "from-master-2-'',";

execute stmt1 using @var1;

select * from t1;



set @var2= 'insert into t1 values (concat("from-var-", ?))';

prepare stmt2 from @var2;

set @var1='from-master-3';

execute stmt2 using @var1;



save_master_pos;

connection slave;

sync_with_master;

select * from t1;



connection master;



drop table t1;



save_master_pos;

connection slave;

sync_with_master;

stop slave;