Commit eb3a9091 authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 

into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0


sql/sql_class.h:
  Auto merged
parents 2460a01b d34e2ccb

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ AC_SUBST(CXXFLAGS) 
AC_SUBST(LD)

AC_SUBST(INSTALL_SCRIPT)



export CC CXX CFLAGS LD LDFLAGS AR

export CC CXX CFLAGS LD LDFLAGS AR ARFLAGS



if test "$GCC" = "yes"

then

innobase/configure.in

+7 −0
Original line number Diff line number Diff line
@@ -117,6 +117,13 @@ case "$target" in 
	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;

esac



# must go in pair with AR as set by MYSQL_CHECK_AR

if test -z "$ARFLAGS"

then

  ARFLAGS="cru"

fi

AC_SUBST(ARFLAGS)



AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile dnl

		buf/Makefile data/Makefile dnl

		dict/Makefile dyn/Makefile dnl

mysql-test/mysql-test-run.pl

+8 −8
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ sub mysqld_arguments ($$$$$); 
sub stop_masters_slaves ();

sub stop_masters ();

sub stop_slaves ();

sub run_mysqltest ($$);

sub run_mysqltest ($);

sub usage ($);



######################################################################
@@ -1342,10 +1342,11 @@ sub run_testcase ($) { 


  if ( ! $glob_use_running_server and ! $glob_use_embedded_server )

  {

    if ( $tinfo->{'master_restart'} or $master->[0]->{'uses_special_flags'} )

    if ( $tinfo->{'master_restart'} or

         $master->[0]->{'running_master_is_special'} )

    {

      stop_masters();

      $master->[0]->{'uses_special_flags'}= 0; # Forget about why we stopped

      $master->[0]->{'running_master_is_special'}= 0; # Forget why we stopped

    }



    # ----------------------------------------------------------------------
@@ -1423,9 +1424,9 @@ sub run_testcase ($) { 
        }

      }



      if ( @{$tinfo->{'master_opt'}} )

      if ( $tinfo->{'master_restart'} )

      {

        $master->[0]->{'uses_special_flags'}= 1;

        $master->[0]->{'running_master_is_special'}= 1;

      }

    }
@@ -1472,7 +1473,7 @@ sub run_testcase ($) { 
    }

    unlink($path_timefile);



    my $res= run_mysqltest($tinfo, $tinfo->{'master_opt'});

    my $res= run_mysqltest($tinfo);



    if ( $res == 0 )

    {
@@ -1973,9 +1974,8 @@ sub stop_slaves () { 
}





sub run_mysqltest ($$) {

sub run_mysqltest ($) {

  my $tinfo=       shift;

  my $master_opts= shift;



  my $cmdline_mysqldump= "$exe_mysqldump --no-defaults -uroot " .

                         "--socket=$master->[0]->{'path_mysock'} --password=";

mysql-test/r/case.result

+15 −0
Original line number Diff line number Diff line
@@ -160,6 +160,21 @@ t1 CREATE TABLE `t1` ( 
  `COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) character set latin1 collate latin1_bin NOT NULL default ''

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE t1;

SELECT 'case+union+test'

UNION 

SELECT CASE LOWER('1') WHEN LOWER('2') THEN 'BUG' ELSE 'nobug' END;

case+union+test

case+union+test

nobug

SELECT CASE LOWER('1') WHEN LOWER('2') THEN 'BUG' ELSE 'nobug' END;

CASE LOWER('1') WHEN LOWER('2') THEN 'BUG' ELSE 'nobug' END

nobug

SELECT 'case+union+test'

UNION 

SELECT CASE '1' WHEN '2' THEN 'BUG' ELSE 'nobug' END;

case+union+test

case+union+test

nobug

CREATE TABLE t1 (EMPNUM INT);

INSERT INTO t1 VALUES (0), (2);

CREATE TABLE t2 (EMPNUM DECIMAL (4, 2));

mysql-test/t/case.test

+11 −0
Original line number Diff line number Diff line
@@ -111,6 +111,17 @@ explain extended SELECT 
SHOW CREATE TABLE t1;

DROP TABLE t1;



# Test for BUG#10151

SELECT 'case+union+test'

UNION 

SELECT CASE LOWER('1') WHEN LOWER('2') THEN 'BUG' ELSE 'nobug' END;



SELECT CASE LOWER('1') WHEN LOWER('2') THEN 'BUG' ELSE 'nobug' END;



SELECT 'case+union+test'

UNION 

SELECT CASE '1' WHEN '2' THEN 'BUG' ELSE 'nobug' END;



#

# Tests for bug #9939: conversion of the arguments for COALESCE and IFNULL

#