Commit 66bea0de authored by unknown's avatar unknown
Browse files

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

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


sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
parents e9cc39c4 ac82a2d5

client/mysqladmin.cc

+1 −1
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
      void (*func) (MYSQL_RES*, MYSQL_ROW, uint);



      new_line = 1;

      if (mysql_query(mysql, "show status") ||

      if (mysql_query(mysql, "show /*!50002 GLOBAL */ status") ||

	  !(res = mysql_store_result(mysql)))

      {

	my_printf_error(0, "unable to show status; error: '%s'", MYF(ME_BELL),

mysql-test/r/bigint.result

+17 −0
Original line number Diff line number Diff line
@@ -128,3 +128,20 @@ t2.value64=t1.value64; 
value64	value32	value64	value32

9223372036854775807	2	9223372036854775807	4

drop table t1, t2;

create table t1 select 1 as 'a';

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` bigint(1) NOT NULL default '0'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1 select 9223372036854775809 as 'a';

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` bigint(19) unsigned NOT NULL default '0'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

select * from t1;

a

9223372036854775809

drop table t1;

mysql-test/r/user_var.result

+41 −0
Original line number Diff line number Diff line
@@ -182,3 +182,44 @@ coercibility(@v1) coercibility(@v2) coercibility(@v3) coercibility(@v4) 
set session @honk=99;

set one_shot @honk=99;

ERROR HY000: The 'SET ONE_SHOT' syntax is reserved for purposes internal to the MySQL server

set @first_var= NULL;

create table t1 select @first_var;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `@first_var` longblob

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

set @first_var= cast(NULL as signed integer);

create table t1 select @first_var;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `@first_var` bigint(20) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

set @first_var= NULL;

create table t1 select @first_var;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `@first_var` bigint(20) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

set @first_var= concat(NULL);

create table t1 select @first_var;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `@first_var` longblob

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

set @first_var=1;

set @first_var= cast(NULL as CHAR);

create table t1 select @first_var;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `@first_var` longtext

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

mysql-test/t/bigint.test

+10 −0
Original line number Diff line number Diff line
@@ -104,3 +104,13 @@ t2.value64=t1.value64; 


drop table t1, t2;



#

# Test of CREATE ... SELECT and unsigned integers

#

create table t1 select 1 as 'a';

show create table t1;

drop table t1;

create table t1 select 9223372036854775809 as 'a';

show create table t1;

select * from t1;

drop table t1;

mysql-test/t/user_var.test

+26 −0
Original line number Diff line number Diff line
@@ -119,3 +119,29 @@ select coercibility(@v1),coercibility(@v2),coercibility(@v3),coercibility(@v4); 
set session @honk=99;

--error 1382

set one_shot @honk=99;



#

# Bug #6598: problem with cast(NULL as signed integer);

#



set @first_var= NULL;

create table t1 select @first_var;

show create table t1;

drop table t1;

set @first_var= cast(NULL as signed integer);

create table t1 select @first_var;

show create table t1;

drop table t1;

set @first_var= NULL;

create table t1 select @first_var;

show create table t1;

drop table t1;

set @first_var= concat(NULL);

create table t1 select @first_var;

show create table t1;

drop table t1;

set @first_var=1;

set @first_var= cast(NULL as CHAR);

create table t1 select @first_var;

show create table t1;

drop table t1;