Commit 474a4d5d authored by unknown's avatar unknown
Browse files

Merge 


BUILD/FINISH.sh:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_heap.cc:
  Auto merged
mysql-test/r/create.result:
  Merge changes
mysql-test/r/temp_table.result:
  SCCS merged
mysql-test/t/temp_table.test:
  Merge new tests
sql/item.cc:
  Merge from 4.1
sql/sql_select.cc:
  Merge from 4.1
parents de275d94 29fcd4b3

BUILD/FINISH.sh

+0 −6
Original line number Diff line number Diff line
@@ -2,12 +2,6 @@ cflags="$c_warnings $extra_flags" 
cxxflags="$cxx_warnings $base_cxxflags $extra_flags"

extra_configs="$extra_configs $local_infile_configs"

configure="./configure $base_configs $extra_configs"

for arg

do

  # Escape special characters so they don't confuse eval

  configure="$configure "`echo "$arg" | \

  		sed -e 's,\([^a-zA-Z0-9_.=-]\),\\\\\1,g'`

done



commands="\

$make -k distclean || true

client/mysql.cc

+2 −1
Original line number Diff line number Diff line
@@ -962,7 +962,8 @@ static int read_lines(bool execute_commands) 
    }

    else

    {

      char *prompt= (char*) (glob_buffer.is_empty() ? construct_prompt() :

      char *prompt= (char*) (ml_comment ? "   /*> " :

                             glob_buffer.is_empty() ?  construct_prompt() :

			     !in_string ? "    -> " :

			     in_string == '\'' ?

			     "    '> " : (in_string == '`' ?

mysql-test/r/create.result

+3 −3
Original line number Diff line number Diff line
@@ -448,11 +448,11 @@ Table Create Table 
t2	CREATE TABLE `t2` (

  `ifnull(a,a)` tinyint(4) default NULL,

  `ifnull(b,b)` smallint(6) default NULL,

  `ifnull(c,c)` mediumint(9) default NULL,

  `ifnull(c,c)` mediumint(8) default NULL,

  `ifnull(d,d)` int(11) default NULL,

  `ifnull(e,e)` bigint(20) default NULL,

  `ifnull(f,f)` float(3,2) default NULL,

  `ifnull(g,g)` double(4,3) default NULL,

  `ifnull(f,f)` float(24,2) default NULL,

  `ifnull(g,g)` double(53,3) default NULL,

  `ifnull(h,h)` decimal(5,4) default NULL,

  `ifnull(i,i)` year(4) default NULL,

  `ifnull(j,j)` date default NULL,

mysql-test/r/innodb.result

+6 −0
Original line number Diff line number Diff line
@@ -2391,3 +2391,9 @@ drop table t1; 
set storage_engine=MyISAM;

create table t1 (v varchar(16384)) engine=innodb;

drop table t1;

create table t1(a int(1) , b int(1)) engine=innodb;

insert into t1 values ('1111', '3333');

select distinct concat(a, b) from t1;

concat(a, b)

11113333

drop table t1;

mysql-test/r/temp_table.result

+9 −0
Original line number Diff line number Diff line
@@ -123,3 +123,12 @@ select * from t1; 
A

This is view again

drop view t1;

create table t1 (a int, b int, index(a), index(b));

create table t2 (c int auto_increment, d varchar(255), primary key (c));

insert into t1 values (3,1),(3,2);

insert into t2 values (NULL, 'foo'), (NULL, 'bar');

select d, c from t1 left join t2 on b = c where a = 3 order by d;

d	c

bar	2

foo	1

drop table t1, t2;