Commit 0de78e66 authored by unknown's avatar unknown
Browse files

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

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1


storage/ndb/src/cw/cpcd/Process.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/Makefile.am:
  Auto merged
storage/ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parents beaedea1 edcdc57b

BUILD/check-cpu

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ case "$cpu_family--$model_name" in 
  *Pentium*III*CPU*)

    cpu_flag="pentium3";

  ;;

  *Pentium*M*pro*)

    cpu_flag="pentium-m";

  ;;

  *Athlon*64*)

    cpu_flag="athlon64";

    cpu_flag_old="athlon";

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ tonu@x3.internalnet 
tsmith@build.mysql.com

tulin@build.mysql.com

tulin@dl145b.mysql.com

tulin@dl145c.mysql.com

tulin@mysql.com

ulli@morbus.(none)

venu@hundin.mysql.fi

mysql-test/r/information_schema_db.result

0 → 100644
+28 −0
Original line number Diff line number Diff line 
use INFORMATION_SCHEMA;

show tables;

Tables_in_INFORMATION_SCHEMA

SCHEMATA

TABLES

COLUMNS

CHARACTER_SETS

COLLATIONS

COLLATION_CHARACTER_SET_APPLICABILITY

ROUTINES

STATISTICS

VIEWS

USER_PRIVILEGES

SCHEMA_PRIVILEGES

TABLE_PRIVILEGES

COLUMN_PRIVILEGES

TABLE_CONSTRAINTS

KEY_COLUMN_USAGE

show tables from INFORMATION_SCHEMA like 'T%';

Tables_in_INFORMATION_SCHEMA (T%)

TABLES

TABLE_PRIVILEGES

TABLE_CONSTRAINTS

create database `inf%`;

use `inf%`;

show tables;

Tables_in_inf%

drop database `inf%`;

mysql-test/r/rpl_sp.result

+29 −6
Original line number Diff line number Diff line
@@ -158,9 +158,6 @@ a 
select * from t2;

a

3

select if(compte<>3,"this is broken but documented","this unexpectedly works?") from (select count(*) as compte from t2) as aggreg;

if(compte<>3,"this is broken but documented","this unexpectedly works?")

this is broken but documented

select * from mysql.proc where name="foo4" and db='mysqltest1';

db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment

mysqltest1	foo4	PROCEDURE	foo4	SQL	CONTAINS_SQL	YES	INVOKER			begin
@@ -197,9 +194,6 @@ a 
select * from t1;

a

21

select if(compte<>1,"this is broken but documented","this unexpectedly works?") from (select count(*) as compte from t1 where a=20) as aggreg;

if(compte<>1,"this is broken but documented","this unexpectedly works?")

this is broken but documented

select * from t2;

a

23
@@ -230,6 +224,35 @@ db name type specific_name language sql_data_access is_deterministic security_ty 
mysqltest1	fn1	FUNCTION	fn1	SQL	CONTAINS_SQL	YES	DEFINER		int(11)	begin

return unix_timestamp();

end	@	#	#		

create trigger trg before insert on t1 for each row set new.a= 10;

ERROR 42000: Access denied; you need the SUPER privilege for this operation

flush logs;

delete from t1;

create trigger trg before insert on t1 for each row set new.a= 10;

insert into t1 values (1);

select * from t1;

a

10

select * from t1;

a

10

delete from t1;

drop trigger t1.trg;

insert into t1 values (1);

select * from t1;

a

1

show binlog events in 'master-bin.000002' from 98;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000002	#	Query	1	#	use `mysqltest1`; delete from t1

master-bin.000002	#	Query	1	#	use `mysqltest1`; create trigger trg before insert on t1 for each row set new.a= 10

master-bin.000002	#	Query	1	#	use `mysqltest1`; insert into t1 values (1)

master-bin.000002	#	Query	1	#	use `mysqltest1`; delete from t1

master-bin.000002	#	Query	1	#	use `mysqltest1`; drop trigger t1.trg

master-bin.000002	#	Query	1	#	use `mysqltest1`; insert into t1 values (1)

select * from t1;

a

1

drop function fn1;

drop database mysqltest1;

drop user "zedjzlcsjhd"@127.0.0.1;

mysql-test/r/type_newdecimal.result

+13 −0
Original line number Diff line number Diff line
@@ -863,3 +863,16 @@ select 0.190287977636363637 + 0.040372670 * 0 - 0; 
select -0.123 * 0;

-0.123 * 0

0.000

CREATE TABLE t1 (f1 DECIMAL (12,9), f2 DECIMAL(2,2));

INSERT INTO t1 VALUES (10.5, 0);

UPDATE t1 SET f1 = 4.5;

SELECT * FROM t1;

f1	f2

4.500000000	0.00

DROP TABLE t1;

CREATE TABLE t1 (f1 DECIMAL (64,20), f2 DECIMAL(2,2));

INSERT INTO t1 VALUES (9999999999999999999999999999999999, 0);

SELECT * FROM t1;

f1	f2

9999999999999999999999999999999999.00000000000000000000	0.00

DROP TABLE t1;