Commit 3e085bd8 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/gluh/MySQL/Merge/5.0-kt


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents 4c2db1be 8703b22e

mysql-test/r/sp_notembedded.result

+14 −0
Original line number Diff line number Diff line
@@ -206,3 +206,17 @@ drop procedure bug10100pd| 
drop procedure bug10100pc|

drop view v1|

drop table t3|

drop procedure if exists bug15298_1;

drop procedure if exists bug15298_2;

grant all privileges on test.* to 'mysqltest_1'@'localhost';

create procedure 15298_1 () sql security definer show grants for current_user;

create procedure 15298_2 () sql security definer show grants;

call 15298_1();

Grants for root@localhost

GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION

call 15298_2();

Grants for root@localhost

GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION

drop user mysqltest_1@localhost;

drop procedure 15298_1;

drop procedure 15298_2;

mysql-test/r/strict.result

+46 −0
Original line number Diff line number Diff line
@@ -1298,3 +1298,49 @@ t2 CREATE TABLE `t2` ( 
) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t2,t1;

set @@sql_mode= @org_mode;

set @@sql_mode='traditional';

create table t1 (i int)

comment '123456789*123456789*123456789*123456789*123456789*

         123456789*123456789*123456789*123456789*123456789*';

ERROR HY000: Too long comment for table 't1'

create table t1 (

i int comment

'123456789*123456789*123456789*123456789*

 123456789*123456789*123456789*123456789*

 123456789*123456789*123456789*123456789*

 123456789*123456789*123456789*123456789*

 123456789*123456789*123456789*123456789*

 123456789*123456789*123456789*123456789*

 123456789*123456789*123456789*123456789*');

ERROR HY000: Too long comment for field 'i'

set @@sql_mode= @org_mode;

create table t1

(i int comment

'123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*');

Warnings:

Warning	1105	Unknown error

select column_name, column_comment from information_schema.columns where

table_schema = 'test' and table_name = 't1';

column_name	column_comment

i	123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*

drop table t1;

set names utf8;

create table t1 (i int)

comment '123456789*123456789*123456789*123456789*123456789*123456789*';

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='123456789*123456789*123456789*123456789*123456789*123456789*'

drop table t1;

mysql-test/t/sp_notembedded.test

+20 −0
Original line number Diff line number Diff line
@@ -265,3 +265,23 @@ drop view v1| 
drop table t3|



delimiter ;|



#

# Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context

#

--disable_warnings

drop procedure if exists bug15298_1;

drop procedure if exists bug15298_2;

--enable_warnings

grant all privileges on test.* to 'mysqltest_1'@'localhost';

create procedure 15298_1 () sql security definer show grants for current_user;

create procedure 15298_2 () sql security definer show grants;



connect (con1,localhost,mysqltest_1,,test);

call 15298_1();

call 15298_2();



connection default;

drop user mysqltest_1@localhost;

drop procedure 15298_1;

drop procedure 15298_2;

mysql-test/t/strict.test

+39 −0
Original line number Diff line number Diff line
@@ -1155,3 +1155,42 @@ create table t2 select date from t1; 
show create table t2;

drop table t2,t1;

set @@sql_mode= @org_mode;



#

# Bug #13934 Silent truncation of table comments

#

set @@sql_mode='traditional';

--error 1105

create table t1 (i int)

comment '123456789*123456789*123456789*123456789*123456789*

         123456789*123456789*123456789*123456789*123456789*';

--error 1105

create table t1 (

i int comment

'123456789*123456789*123456789*123456789*

 123456789*123456789*123456789*123456789*

 123456789*123456789*123456789*123456789*

 123456789*123456789*123456789*123456789*

 123456789*123456789*123456789*123456789*

 123456789*123456789*123456789*123456789*

 123456789*123456789*123456789*123456789*');

set @@sql_mode= @org_mode;

create table t1

(i int comment

 '123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*

  123456789*123456789*123456789*123456789*');



select column_name, column_comment from information_schema.columns where

table_schema = 'test' and table_name = 't1';

drop table t1;



set names utf8;

create table t1 (i int)

comment '123456789*123456789*123456789*123456789*123456789*123456789*';

show create table t1;

drop table t1;

sql/handler.h

+2 −1
Original line number Diff line number Diff line
@@ -428,7 +428,8 @@ typedef struct st_ha_create_information 
{

  CHARSET_INFO *table_charset, *default_table_charset;

  LEX_STRING connect_string;

  const char *comment,*password;

  LEX_STRING comment;

  const char *password;

  const char *data_file_name, *index_file_name;

  const char *alias;

  ulonglong max_rows,min_rows;