Commit 607b8e5e authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21215 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
client/mysqldump.c:
  Manual merge
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Manual merge
parents 3c8150b7 a08a1108

client/mysql.cc

+3 −0
Original line number Diff line number Diff line
@@ -3725,6 +3725,9 @@ static const char* construct_prompt() 
      case 't':

	processed_prompt.append('\t');

	break;

      case 'l':

	processed_prompt.append(delimiter_str);

	break;

      default:

	processed_prompt.append(c);

      }

client/mysqldump.c

+152 −149

File changed.

Preview size limit exceeded, changes collapsed.

configure.in

+9 −6
Original line number Diff line number Diff line
@@ -1655,17 +1655,20 @@ AC_ARG_WITH(debug, 
if test "$with_debug" = "yes"

then

  # Medium debug.

  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DDBUG_ON -DSAFE_MUTEX $CXXFLAGS"

  AC_DEFINE([DBUG_ON], [1], [Use libdbug])

  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DSAFE_MUTEX $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"

elif test "$with_debug" = "full"

then

  # Full debug. Very slow in some cases

  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"

  AC_DEFINE([DBUG_ON], [1], [Use libdbug])

  CFLAGS="$DEBUG_CFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"

else

  # Optimized version. No debug

  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"

  CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"

  AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug])

  CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS"

  CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS"

fi



# Force static compilation to avoid linking problems/get more speed

dbug/dbug.c

+4 −1
Original line number Diff line number Diff line
@@ -66,10 +66,13 @@ 
 *	Check of malloc on entry/exit (option "S")

 */



#include <my_global.h>



/* This file won't compile unless DBUG_OFF is undefined locally */

#ifdef DBUG_OFF

#undef DBUG_OFF

#endif

#include <my_global.h>



#include <m_string.h>

#include <errno.h>

#if defined(MSDOS) || defined(__WIN__)

mysql-test/r/cast.result

+11 −0
Original line number Diff line number Diff line
@@ -381,3 +381,14 @@ DROP TABLE t1; 
select cast(NULL as decimal(6)) as t1;

t1

NULL

set names latin1;

select hex(cast('a' as char(2) binary));

hex(cast('a' as char(2) binary))

61

select hex(cast('a' as binary(2)));

hex(cast('a' as binary(2)))

6100

select hex(cast('a' as char(2) binary));

hex(cast('a' as char(2) binary))

61

End of 5.0 tests