Commit 5b6016c1 authored by unknown's avatar unknown
Browse files

Merge bodhi.local:/opt/local/work/tmp_merge 

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Auto merged
BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/federated.result:
  Use local.
mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/federated.test:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
sql/Makefile.am:
  Manual merge.
sql/set_var.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_update.cc:
  Manual merge.
storage/myisam/mi_create.c:
  Manual merge.
parents a920f554 a7dddd3b

.bzrignore

+8 −0
Original line number Diff line number Diff line 
*-t

*.Plo

*.Po

*.a

*.bb

*.bbg
@@ -12,6 +14,7 @@ 
*.gcov

*.idb

*.la

*.lai

*.lib

*.lo

*.map
@@ -23,6 +26,7 @@ 
*.res

*.sbr

*.so

*.so.*

*.spec

*/*_pure_*warnings

*/.pure
@@ -283,6 +287,7 @@ build_tags.sh 
client/#mysql.cc#

client/*.ds?

client/*.vcproj

client/.libs -prune

client/completion_hash.cpp

client/decimal.c

client/insert_test
@@ -578,6 +583,7 @@ libmysqld/sql_insert.cc 
libmysqld/sql_lex.cc

libmysqld/sql_list.cc

libmysqld/sql_load.cc

libmysqld/sql_locale.cc

libmysqld/sql_manager.cc

libmysqld/sql_map.cc

libmysqld/sql_olap.cc
@@ -1755,6 +1761,7 @@ test1/* 
test_xml

tests/*.ds?

tests/*.vcproj

tests/.libs -prune

tests/client_test

tests/connect_test

tests/mysql_client_test
@@ -1762,6 +1769,7 @@ thr_insert_test/* 
thr_test/*

thread_test

tmp/*

tools/.libs -prune

tools/my_vsnprintf.c

tools/mysqlmanager

tools/mysqlmngd

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	key.cc lock.cc log.cc log_event.cc sql_state.c \

	protocol.cc net_serv.cc opt_range.cc \

	opt_sum.cc procedure.cc records.cc sql_acl.cc \

	sql_load.cc discover.cc \

	sql_load.cc discover.cc sql_locale.cc \

	sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \

	sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \

	sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc sql_parse.cc \

mysql-test/r/date_formats.result

+16 −0
Original line number Diff line number Diff line
@@ -498,6 +498,22 @@ f1 f2 
Warnings:

Warning	1292	Truncated incorrect date value: '2003-04-05  g'

Warning	1292	Truncated incorrect datetime value: '2003-04-05 10:11:12.101010234567'

set names latin1;

select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');

date_format('2004-01-01','%W (%a), %e %M (%b) %Y')

Thursday (Thu), 1 January (Jan) 2004

set lc_time_names=ru_RU;

set names koi8r;

select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');

date_format('2004-01-01','%W (%a), %e %M (%b) %Y')

 (), 1  () 2004

set lc_time_names=de_DE;

set names latin1;

select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');

date_format('2004-01-01','%W (%a), %e %M (%b) %Y')

Donnerstag (Do), 1 Januar (Jan) 2004

set names latin1;

set lc_time_names=en_US;

create table t1 (f1 datetime);

insert into t1 (f1) values ("2005-01-01");

insert into t1 (f1) values ("2005-02-01");

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;