Commit a2b3fa5e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new 

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
parents fbb5bfc1 c9841352

BUILD/SETUP.sh

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ valgrind_flags="$valgrind_flags -DMYSQL_SERVER_SUFFIX=-valgrind-max" 
# Used in -debug builds

debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS "

debug_cflags="$debug_cflags -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX"

error_inject="--with-error-inject "

#

# Base C++ flags for all builds

base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"

BUILD/compile-pentium-debug-max

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ path=`dirname $0` 
. "$path/SETUP.sh" "$@" --with-debug=full



extra_flags="$pentium_cflags $debug_cflags"

extra_configs="$pentium_configs $debug_configs $max_configs"

extra_configs="$pentium_configs $debug_configs $max_configs $error_inject"



. "$path/FINISH.sh"

client/mysql.cc

+10 −8
Original line number Diff line number Diff line
@@ -2241,8 +2241,10 @@ print_table_data(MYSQL_RES *result) 
  MYSQL_ROW	cur;

  MYSQL_FIELD	*field;

  bool		*num_flag;

  bool		*not_null_flag;



  num_flag=(bool*) my_alloca(sizeof(bool)*mysql_num_fields(result));

  not_null_flag=(bool*) my_alloca(sizeof(bool)*mysql_num_fields(result));

  if (info_flag)

  {

    print_field_types(result);
@@ -2260,7 +2262,7 @@ print_table_data(MYSQL_RES *result) 
      length=max(length,field->max_length);

    if (length < 4 && !IS_NOT_NULL(field->flags))

      length=4;					// Room for "NULL"

    field->max_length=length+1;

    field->max_length=length;

    separator.fill(separator.length()+length+2,'-');

    separator.append('+');

  }
@@ -2276,6 +2278,7 @@ print_table_data(MYSQL_RES *result) 
                                            MAX_COLUMN_LENGTH),

		  field->name);

      num_flag[off]= IS_NUM(field->type);

      not_null_flag[off]= IS_NOT_NULL(field->flags);

    }

    (void) tee_fputs("\n", PAGER);

    tee_puts((char*) separator.ptr(), PAGER);
@@ -2295,7 +2298,8 @@ print_table_data(MYSQL_RES *result) 
      uint visible_length;

      uint extra_padding;



      if (lengths[off] == 0) 

      /* If this column may have a null value, use "NULL" for empty.  */

      if (! not_null_flag[off] && (lengths[off] == 0))

      {

        buffer= "NULL";

        data_length= 4;
@@ -2335,6 +2339,7 @@ print_table_data(MYSQL_RES *result) 
  }

  tee_puts((char*) separator.ptr(), PAGER);

  my_afree((gptr) num_flag);

  my_afree((gptr) not_null_flag);

}
@@ -2349,11 +2354,8 @@ tee_print_sized_data(const char *data, unsigned int data_length, unsigned int to 
  unsigned int i;

  const char *p;



  total_bytes_to_send -= 1;  

  /* Off by one, perhaps mistakenly accounting for a terminating NUL. */



  if (right_justified) 

    for (i= 0; i < (total_bytes_to_send - data_length); i++)

    for (i= data_length; i < total_bytes_to_send; i++)

      tee_putc((int)' ', PAGER);



  for (i= 0, p= data; i < data_length; i+= 1, p+= 1)
@@ -2365,7 +2367,7 @@ tee_print_sized_data(const char *data, unsigned int data_length, unsigned int to 
  }



  if (! right_justified) 

    for (i= 0; i < (total_bytes_to_send - data_length); i++)

    for (i= data_length; i < total_bytes_to_send; i++)

      tee_putc((int)' ', PAGER);

}

client/mysqldump.c

+3 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include "mysql.h"

#include "mysql_version.h"

#include "mysqld_error.h"

#include "sql/ha_ndbcluster_tables.h"



/* Exit codes */
@@ -134,7 +135,6 @@ static CHARSET_INFO *charset_info= &my_charset_latin1; 
const char *default_dbug_option="d:t:o,/tmp/mysqldump.trace";

/* do we met VIEWs during tables scaning */

my_bool was_views= 0;



const char *compatible_mode_names[]=

{

  "MYSQL323", "MYSQL40", "POSTGRESQL", "ORACLE", "MSSQL", "DB2",
@@ -2937,6 +2937,8 @@ static int dump_all_tables_in_db(char *database) 
  afterdot= strmov(hash_key, database);

  *afterdot++= '.';



  if (!strcmp(database, NDB_REP_DB)) /* Skip cluster internal database */

    return 0;

  if (init_dumping(database))

    return 1;

  if (opt_xml)

config/ac-macros/misc.m4

+4 −1
Original line number Diff line number Diff line
@@ -361,7 +361,8 @@ AC_CACHE_VAL(mysql_cv_termcap_lib, 
[AC_CHECK_LIB(ncurses, tgetent, mysql_cv_termcap_lib=libncurses,

    [AC_CHECK_LIB(curses, tgetent, mysql_cv_termcap_lib=libcurses,

	[AC_CHECK_LIB(termcap, tgetent, mysql_cv_termcap_lib=libtermcap,

	    mysql_cv_termcap_lib=NOT_FOUND)])])])

          [AC_CHECK_LIB(tinfo, tgetent, mysql_cv_termcap_lib=libtinfo,

	    mysql_cv_termcap_lib=NOT_FOUND)])])])])

AC_MSG_CHECKING(for termcap functions library)

if test "$mysql_cv_termcap_lib" = "NOT_FOUND"; then

AC_MSG_ERROR([No curses/termcap library found])
@@ -369,6 +370,8 @@ elif test "$mysql_cv_termcap_lib" = "libtermcap"; then 
TERMCAP_LIB=-ltermcap

elif test "$mysql_cv_termcap_lib" = "libncurses"; then

TERMCAP_LIB=-lncurses

elif test "$mysql_cv_termcap_lib" = "libtinfo"; then

TERMCAP_LIB=-ltinfo

else

TERMCAP_LIB=-lcurses

fi