Commit f5340f8c authored by unknown's avatar unknown
Browse files

Merge bodhi.local:/opt/local/work/mysql-5.0-root 

into  bodhi.local:/opt/local/work/mysql-5.0-runtime


sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_update.cc:
  Manual merge.
parents 5ac016a8 685ccf85

include/my_base.h

+10 −1
Original line number Diff line number Diff line
@@ -152,7 +152,16 @@ enum ha_extra_function { 
    other fields intact. When this is off (by default) InnoDB will use memcpy

    to overwrite entire row.

  */

  HA_EXTRA_KEYREAD_PRESERVE_FIELDS

  HA_EXTRA_KEYREAD_PRESERVE_FIELDS,

  /*

    Informs handler that write_row() which tries to insert new row into the

    table and encounters some already existing row with same primary/unique

    key can replace old row with new row instead of reporting error (basically

    it informs handler that we do REPLACE instead of simple INSERT).

    Off by default.

  */

  HA_EXTRA_WRITE_CAN_REPLACE,

  HA_EXTRA_WRITE_CANNOT_REPLACE

};



	/* The following is parameter to ha_panic() */

mysql-test/Makefile.am

+5 −5
Original line number Diff line number Diff line
@@ -101,15 +101,15 @@ uninstall-local: 
	@RM@ -f -r $(DESTDIR)$(testdir)



std_data/client-key.pem: $(top_srcdir)/SSL/$(@F)

	@CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

	@CP@ -f $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

std_data/client-cert.pem: $(top_srcdir)/SSL/$(@F)

	@CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

	@CP@ -f $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

std_data/cacert.pem: $(top_srcdir)/SSL/$(@F)

	@CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

	@CP@ -f $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

std_data/server-cert.pem: $(top_srcdir)/SSL/$(@F)

	@CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

	@CP@ -f $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

std_data/server-key.pem: $(top_srcdir)/SSL/$(@F)

	@CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

	@CP@ -f $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data



SUFFIXES = .sh

mysql-test/r/federated.result

+28 −0
Original line number Diff line number Diff line
@@ -1689,6 +1689,34 @@ id c1 c2 
9	abc	ppc

drop table federated.t1, federated.t2;

drop table federated.t1, federated.t2;

drop table if exists federated.t1;

create table federated.t1 (a int, b int, c int);

drop table if exists federated.t1;

drop table if exists federated.t2;

create table federated.t1 (a int,  b int, c int) engine=federated connection='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1';

create trigger federated.t1_bi before insert on federated.t1 for each row set new.c= new.a * new.b;

create table federated.t2 (a int, b int);

insert into federated.t2 values (13, 17), (19, 23);

insert into federated.t1 (a, b) values (1, 2), (3, 5), (7, 11);

select * from federated.t1;

a	b	c

1	2	2

3	5	15

7	11	77

delete from federated.t1;

insert into federated.t1 (a, b) select * from federated.t2;

select * from federated.t1;

a	b	c

13	17	221

19	23	437

delete from federated.t1;

load data infile '../std_data_ln/loaddata5.dat' into table federated.t1 fields terminated by '' enclosed by '' ignore 1 lines (a, b);

select * from federated.t1;

a	b	c

3	4	12

5	6	30

drop tables federated.t1, federated.t2;

drop table federated.t1;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

DROP TABLE IF EXISTS federated.t1;

mysql-test/r/init_connect.result

+114 −0
Original line number Diff line number Diff line
@@ -22,3 +22,117 @@ set GLOBAL init_connect="adsfsdfsdfs"; 
select @a;

Got one of the listed errors

drop table t1;

End of 4.1 tests

create table t1 (x int);

insert into t1 values (3), (5), (7);

create table t2 (y int);

create user mysqltest1@localhost;

grant all privileges on test.* to mysqltest1@localhost;

set global init_connect="create procedure p1() select * from t1";

call p1();

x

3

5

7

drop procedure p1;

set global init_connect="create procedure p1(x int)\

begin\

  select count(*) from t1;\

  select * from t1;\

  set @x = x;

end";

call p1(42);

count(*)

3

x

3

5

7

select @x;

@x

42

set global init_connect="call p1(4711)";

select @x;

@x

4711

set global init_connect="drop procedure if exists p1";

call p1();

ERROR 42000: PROCEDURE test.p1 does not exist

create procedure p1(out sum int)

begin

declare n int default 0;

declare c cursor for select * from t1;

declare exit handler for not found

begin

close c;

set sum = n;

end;

open c;

loop

begin

declare x int;

fetch c into x;

if x > 3 then

set n = n + x;

end if;

end;

end loop;

end|

set global init_connect="call p1(@sum)";

select @sum;

@sum

12

drop procedure p1;

create procedure p1(tbl char(10), v int)

begin

set @s = concat('insert into ', tbl, ' values (?)');

set @v = v;

prepare stmt1 from @s;

execute stmt1 using @v;

deallocate prepare stmt1;

end|

set global init_connect="call p1('t1', 11)";

select * from t1;

x

3

5

7

11

drop procedure p1;

create function f1() returns int

begin

declare n int;

select count(*) into n from t1;

return n;

end|

set global init_connect="set @x = f1()";

select @x;

@x

4

set global init_connect="create view v1 as select f1()";

select * from v1;

f1()

4

set global init_connect="drop view v1";

select * from v1;

ERROR 42S02: Table 'test.v1' doesn't exist

drop function f1;

create trigger trg1

after insert on t2

for each row

insert into t1 values (new.y);

set global init_connect="insert into t2 values (13), (17), (19)";

select * from t1;

x

3

5

7

11

13

17

19

drop trigger trg1;

set global init_connect=default;

revoke all privileges, grant option from mysqltest1@localhost;

drop user mysqltest1@localhost;

drop table t1, t2;

mysql-test/r/init_file.result

+15 −0
Original line number Diff line number Diff line 
ok

end of 4.1 tests

select * from t1;

x

3

5

7

11

13

select * from t2;

y

30

3

11

13

drop table t1, t2;