Commit 6fd718df authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-clean 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/create.test:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/table.cc:
  Resolve conflict
sql/unireg.cc:
  Resolve conflict
parents fb006284 a4217760

mysql-test/r/create.result

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ Note 1051 Unknown table 't1' 
create table t1 (ordid int(8) not null auto_increment, ord  varchar(50) not null, primary key (ord,ordid)) engine=heap;

ERROR 42000: Incorrect table definition; there can be only one auto column and it must be defined as a key

create table not_existing_database.test (a int);

Got one of the listed errors

ERROR 42000: Unknown database 'not_existing_database'

create table `a/a` (a int);

ERROR 42000: Incorrect table name 'a/a'

create table `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa int);
@@ -358,7 +358,7 @@ create table t3 like t1; 
create table t3 like mysqltest.t3;

ERROR 42S01: Table 't3' already exists

create table non_existing_database.t1 like t1;

Got one of the listed errors

ERROR 42000: Unknown database 'non_existing_database'

create table t3 like non_existing_table;

ERROR 42S02: Unknown table 'non_existing_table'

create temporary table t3 like t1;

mysql-test/r/func_str.result

+15 −0
Original line number Diff line number Diff line
@@ -879,3 +879,18 @@ drop table t1; 
select hex(29223372036854775809), hex(-29223372036854775809);

hex(29223372036854775809)	hex(-29223372036854775809)

FFFFFFFFFFFFFFFF	FFFFFFFFFFFFFFFF

create table t1 (i int);

insert into t1 values (1000000000),(1);

select lpad(i, 7, ' ') as t from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					t	253	7	7	Y	128	31	63

t

1000000

      1

select rpad(i, 7, ' ') as t from t1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

def					t	253	7	7	Y	128	31	63

t

1000000

1      

drop table t1;

mysql-test/t/create.test

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ drop table if exists t1; 
--error 1075

create table t1 (ordid int(8) not null auto_increment, ord  varchar(50) not null, primary key (ord,ordid)) engine=heap;



-- error 1044,1

-- error 1049

create table not_existing_database.test (a int);

--error 1103

create table `a/a` (a int);
@@ -305,7 +305,7 @@ select * from t2; 
create table t3 like t1;

--error 1050

create table t3 like mysqltest.t3;

--error ER_DBACCESS_DENIED_ERROR,1

--error 1049

create table non_existing_database.t1 like t1;

--error 1051

create table t3 like non_existing_table;

mysql-test/t/func_str.test

+11 −0
Original line number Diff line number Diff line
@@ -613,3 +613,14 @@ drop table t1; 
# Bug #9854  hex() and out of range handling

#

select hex(29223372036854775809), hex(-29223372036854775809);



#

# Bug #11311: Incorrect length returned from LPAD() and RPAD()

#

create table t1 (i int);

insert into t1 values (1000000000),(1);

--enable_metadata

select lpad(i, 7, ' ') as t from t1;

select rpad(i, 7, ' ') as t from t1;

--disable_metadata

drop table t1;

sql/item_strfunc.cc

+0 −2
Original line number Diff line number Diff line
@@ -2076,7 +2076,6 @@ void Item_func_rpad::fix_length_and_dec() 
  {

    ulonglong length= ((ulonglong) args[1]->val_int() *

                       collation.collation->mbmaxlen);

    length= max((ulonglong) args[0]->max_length, length);

    if (length >= MAX_BLOB_WIDTH)

    {

      length= MAX_BLOB_WIDTH;
@@ -2164,7 +2163,6 @@ void Item_func_lpad::fix_length_and_dec() 
  {

    ulonglong length= ((ulonglong) args[1]->val_int() *

                       collation.collation->mbmaxlen);

    length= max((ulonglong) args[0]->max_length, length);

    if (length >= MAX_BLOB_WIDTH)

    {

      length= MAX_BLOB_WIDTH;