Commit e6ed39b4 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into  mysql.com:/home/my/mysql-4.1
parents 97988099 b1067014

client/mysql.cc

+1 −4
Original line number Diff line number Diff line
@@ -1563,11 +1563,8 @@ You can turn off this feature to get a quicker startup with -A\n\n"); 
      mysql_free_result(fields);

    }

    else

    {

      tee_fprintf(stdout,

		  "Didn't find any fields in table '%s'\n",table_row[0]);

      field_names[i]= 0;

    }



    i++;

  }

  mysql_free_result(tables);

mysql-test/r/bigint.result

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,15 @@ select 9223372036854775808+1; 
select -(0-3),round(-(0-3)), round(9999999999999999999);

-(0-3)	round(-(0-3))	round(9999999999999999999)

3	3	10000000000000000000

select 1,11,101,1001,10001,100001,1000001,10000001,100000001,1000000001,10000000001,100000000001,1000000000001,10000000000001,100000000000001,1000000000000001,10000000000000001,100000000000000001,1000000000000000001,10000000000000000001;

1	11	101	1001	10001	100001	1000001	10000001	100000001	1000000001	10000000001	100000000001	1000000000001	10000000000001	100000000000001	1000000000000001	10000000000000001	100000000000000001	1000000000000000001	10000000000000000001

1	11	101	1001	10001	100001	1000001	10000001	100000001	1000000001	10000000001	100000000001	1000000000001	10000000000001	100000000000001	1000000000000001	10000000000000001	100000000000000001	1000000000000000001	10000000000000000001

select -1,-11,-101,-1001,-10001,-100001,-1000001,-10000001,-100000001,-1000000001,-10000000001,-100000000001,-1000000000001,-10000000000001,-100000000000001,-1000000000000001,-10000000000000001,-100000000000000001,-1000000000000000001,-10000000000000000001;

-1	-11	-101	-1001	-10001	-100001	-1000001	-10000001	-100000001	-1000000001	-10000000001	-100000000001	-1000000000001	-10000000000001	-100000000000001	-1000000000000001	-10000000000000001	-100000000000000001	-1000000000000000001	-10000000000000000001

-1	-11	-101	-1001	-10001	-100001	-1000001	-10000001	-100000001	-1000000001	-10000000001	-100000000001	-1000000000001	-10000000000001	-100000000000001	-1000000000000001	-10000000000000001	-100000000000000001	-1000000000000000001	-10000000000000000000

select conv(1,10,16),conv((1<<2)-1,10,16),conv((1<<10)-2,10,16),conv((1<<16)-3,10,16),conv((1<<25)-4,10,16),conv((1<<31)-5,10,16),conv((1<<36)-6,10,16),conv((1<<47)-7,10,16),conv((1<<48)-8,10,16),conv((1<<55)-9,10,16),conv((1<<56)-10,10,16),conv((1<<63)-11,10,16);

conv(1,10,16)	conv((1<<2)-1,10,16)	conv((1<<10)-2,10,16)	conv((1<<16)-3,10,16)	conv((1<<25)-4,10,16)	conv((1<<31)-5,10,16)	conv((1<<36)-6,10,16)	conv((1<<47)-7,10,16)	conv((1<<48)-8,10,16)	conv((1<<55)-9,10,16)	conv((1<<56)-10,10,16)	conv((1<<63)-11,10,16)

1	3	3FE	FFFD	1FFFFFC	7FFFFFFB	FFFFFFFFA	7FFFFFFFFFF9	FFFFFFFFFFF8	7FFFFFFFFFFFF7	FFFFFFFFFFFFF6	7FFFFFFFFFFFFFF5

create table t1 (a bigint unsigned not null, primary key(a));

insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612);

select * from t1;

mysql-test/r/func_str.result

+117 −0
Original line number Diff line number Diff line
@@ -45,6 +45,123 @@ www. .se 
select substring_index('.tcx.se','.',-2),substring_index('.tcx.se','.tcx',-1);

substring_index('.tcx.se','.',-2)	substring_index('.tcx.se','.tcx',-1)

tcx.se	.se

select substring_index('aaaaaaaaa1','a',1);

substring_index('aaaaaaaaa1','a',1)



select substring_index('aaaaaaaaa1','aa',1);

substring_index('aaaaaaaaa1','aa',1)



select substring_index('aaaaaaaaa1','aa',2);

substring_index('aaaaaaaaa1','aa',2)

aa

select substring_index('aaaaaaaaa1','aa',3);

substring_index('aaaaaaaaa1','aa',3)

aaaa

select substring_index('aaaaaaaaa1','aa',4);

substring_index('aaaaaaaaa1','aa',4)

aaaaaa

select substring_index('aaaaaaaaa1','aa',5);

substring_index('aaaaaaaaa1','aa',5)

aaaaaaaaa1

select substring_index('aaaaaaaaa1','aaa',1);

substring_index('aaaaaaaaa1','aaa',1)



select substring_index('aaaaaaaaa1','aaa',2);

substring_index('aaaaaaaaa1','aaa',2)

aaa

select substring_index('aaaaaaaaa1','aaa',3);

substring_index('aaaaaaaaa1','aaa',3)

aaaaaa

select substring_index('aaaaaaaaa1','aaa',4);

substring_index('aaaaaaaaa1','aaa',4)

aaaaaaaaa1

select substring_index('aaaaaaaaa1','aaaa',1);

substring_index('aaaaaaaaa1','aaaa',1)



select substring_index('aaaaaaaaa1','aaaa',2);

substring_index('aaaaaaaaa1','aaaa',2)

aaaa

select substring_index('aaaaaaaaa1','1',1);

substring_index('aaaaaaaaa1','1',1)

aaaaaaaaa

select substring_index('aaaaaaaaa1','a',-1);

substring_index('aaaaaaaaa1','a',-1)

1

select substring_index('aaaaaaaaa1','aa',-1);

substring_index('aaaaaaaaa1','aa',-1)

1

select substring_index('aaaaaaaaa1','aa',-2);

substring_index('aaaaaaaaa1','aa',-2)

aa1

select substring_index('aaaaaaaaa1','aa',-3);

substring_index('aaaaaaaaa1','aa',-3)

aaaa1

select substring_index('aaaaaaaaa1','aa',-4);

substring_index('aaaaaaaaa1','aa',-4)

aaaaaa1

select substring_index('aaaaaaaaa1','aa',-5);

substring_index('aaaaaaaaa1','aa',-5)

aaaaaaaaa1

select substring_index('aaaaaaaaa1','aaa',-1);

substring_index('aaaaaaaaa1','aaa',-1)

1

select substring_index('aaaaaaaaa1','aaa',-2);

substring_index('aaaaaaaaa1','aaa',-2)

aaa1

select substring_index('aaaaaaaaa1','aaa',-3);

substring_index('aaaaaaaaa1','aaa',-3)

aaaaaa1

select substring_index('aaaaaaaaa1','aaa',-4);

substring_index('aaaaaaaaa1','aaa',-4)



select substring_index('the king of thethe hill','the',-2);

substring_index('the king of thethe hill','the',-2)

the hill

select substring_index('the king of the the hill','the',-2);

substring_index('the king of the the hill','the',-2)

 the hill

select substring_index('the king of the  the hill','the',-2);

substring_index('the king of the  the hill','the',-2)

  the hill

select substring_index('the king of the  the hill',' the ',-1);

substring_index('the king of the  the hill',' the ',-1)

hill

select substring_index('the king of the  the hill',' the ',-2);

substring_index('the king of the  the hill',' the ',-2)

 the hill

select substring_index('the king of the  the hill',' ',-1);

substring_index('the king of the  the hill',' ',-1)

hill

select substring_index('the king of the  the hill',' ',-2);

substring_index('the king of the  the hill',' ',-2)

the hill

select substring_index('the king of the  the hill',' ',-3);

substring_index('the king of the  the hill',' ',-3)

 the hill

select substring_index('the king of the  the hill',' ',-4);

substring_index('the king of the  the hill',' ',-4)

the  the hill

select substring_index('the king of the  the hill',' ',-5);

substring_index('the king of the  the hill',' ',-5)

of the  the hill

select substring_index('the king of the.the hill','the',-2);

substring_index('the king of the.the hill','the',-2)

.the hill

select substring_index('the king of thethethe.the hill','the',-3);

substring_index('the king of thethethe.the hill','the',-3)

the.the hill

select substring_index('the king of thethethe.the hill','the',-1);

substring_index('the king of thethethe.the hill','the',-1)

 hill

select substring_index('the king of the the hill','the',1);

substring_index('the king of the the hill','the',1)



select substring_index('the king of the the hill','the',2);

substring_index('the king of the the hill','the',2)

the king of 

select substring_index('the king of the the hill','the',3);

substring_index('the king of the the hill','the',3)

the king of the 

select concat(':',ltrim('  left  '),':',rtrim('  right  '),':');

concat(':',ltrim('  left  '),':',rtrim('  right  '),':')

:left  :  right:

mysql-test/r/grant.result

+3 −0
Original line number Diff line number Diff line
@@ -440,3 +440,6 @@ insert into tables_priv values ('','test_db','mysqltest_1','test_table','test_gr 
flush privileges;

delete from tables_priv where host = '' and user = 'mysqltest_1';

flush privileges;

set @user123="non-existent";

select * from mysql.db where user=@user123;

Host	Db	User	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Create_tmp_table_priv	Lock_tables_priv

mysql-test/t/bigint.test

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ select +9999999999999999999,-9999999999999999999; 
select cast(9223372036854775808 as unsigned)+1;

select 9223372036854775808+1;

select -(0-3),round(-(0-3)), round(9999999999999999999);

select 1,11,101,1001,10001,100001,1000001,10000001,100000001,1000000001,10000000001,100000000001,1000000000001,10000000000001,100000000000001,1000000000000001,10000000000000001,100000000000000001,1000000000000000001,10000000000000000001;

select -1,-11,-101,-1001,-10001,-100001,-1000001,-10000001,-100000001,-1000000001,-10000000001,-100000000001,-1000000000001,-10000000000001,-100000000000001,-1000000000000001,-10000000000000001,-100000000000000001,-1000000000000000001,-10000000000000000001;

select conv(1,10,16),conv((1<<2)-1,10,16),conv((1<<10)-2,10,16),conv((1<<16)-3,10,16),conv((1<<25)-4,10,16),conv((1<<31)-5,10,16),conv((1<<36)-6,10,16),conv((1<<47)-7,10,16),conv((1<<48)-8,10,16),conv((1<<55)-9,10,16),conv((1<<56)-10,10,16),conv((1<<63)-11,10,16);



#

# In 3.23 we have to disable the test of column to bigint as