Commit eff9369d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836 

into  mysql.com:/home/dlenev/src/mysql-5.1-merges


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Manual merge.
mysql-test/t/information_schema.test:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
parents 81ca1581 9ae226fe

extra/yassl/src/handshake.cpp

+5 −1
Original line number Diff line number Diff line
@@ -656,7 +656,11 @@ DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered) 
{

    ssl.getSocket().wait();                  // wait for input if blocking

    uint ready = ssl.getSocket().get_ready();

    if (!ready) return buffered;

    if (!ready) {

      // Nothing to receive after blocking wait => error

      ssl.SetError(receive_error);

      return buffered= null_buffer;

    }



    // add buffered data if its there

    uint buffSz = buffered.get() ? buffered.get()->get_size() : 0;

mysql-test/r/information_schema.result

+18 −0
Original line number Diff line number Diff line
@@ -1059,6 +1059,24 @@ where table_name="v1"; 
table_type

VIEW

drop view v1;

create temporary table t1(f1 int, index(f1));

show columns from t1;

Field	Type	Null	Key	Default	Extra

f1	int(11)	YES	MUL	NULL	

describe t1;

Field	Type	Null	Key	Default	Extra

f1	int(11)	YES	MUL	NULL	

show indexes from t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	1	f1	1	f1	A	NULL	NULL	NULL	YES	BTREE	

drop table t1;

create table t1(f1 binary(32), f2 varbinary(64));

select character_maximum_length, character_octet_length

from information_schema.columns where table_name='t1';

character_maximum_length	character_octet_length

32	32

64	64

drop table t1;

select * from information_schema.engines WHERE ENGINE="MyISAM";

ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS

MyISAM	ENABLED	Default engine as of MySQL 3.23 with great performance	NO	NO	NO

mysql-test/r/trigger.result

+6 −0
Original line number Diff line number Diff line
@@ -780,3 +780,9 @@ end// 
CALL p2();

drop procedure p2;

drop table t1;

create trigger t1_bi before insert on test.t1 for each row set @a:=0;

ERROR 3D000: No database selected

create trigger test.t1_bi before insert on t1 for each row set @a:=0;

ERROR 3D000: No database selected

drop trigger t1_bi;

ERROR 3D000: No database selected

mysql-test/r/view.result

+16 −0
Original line number Diff line number Diff line
@@ -2456,3 +2456,19 @@ f1() 
42

drop view v2,v1;

drop function f1;

create table t1 (id numeric, warehouse_id numeric);

create view v1 as select id from t1;

create view v2 as

select t1.warehouse_id, v1.id as receipt_id

from t1, v1 where t1.id = v1.id;

insert into t1 (id, warehouse_id) values(3, 2);

insert into t1 (id, warehouse_id) values(4, 2);

insert into t1 (id, warehouse_id) values(5, 1);

select v2.receipt_id as alias1, v2.receipt_id as alias2 from v2

order by v2.receipt_id;

alias1	alias2

3	3

4	4

5	5

drop view v2, v1;

drop table t1;

mysql-test/t/information_schema.test

+19 −0
Original line number Diff line number Diff line
@@ -749,6 +749,25 @@ select table_type from information_schema.tables 
where table_name="v1";

drop view v1;



#

# Bug #14387 SHOW COLUMNS doesn't work on temporary tables

# Bug #15224 SHOW INDEX from temporary table doesn't work

# Bug #12770 DESC cannot display the info. about temporary table

#

create temporary table t1(f1 int, index(f1));

show columns from t1;

describe t1;

show indexes from t1;

drop table t1;



#

# Bug#14271 I_S: columns has no size for (var)binary columns

#

create table t1(f1 binary(32), f2 varbinary(64));

select character_maximum_length, character_octet_length

from information_schema.columns where table_name='t1';

drop table t1;



#

# Show engines

#