Commit 355f7128 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/data0/mysqldev/my/mysql-4.1 

into mysql.com:/data0/mysqldev/my/mysql-4.1-build


configure.in:
  Auto merged
parents 7d355359 ad21db5e

client/mysqldump.c

+18 −18
Original line number Diff line number Diff line
@@ -2091,6 +2091,7 @@ static int dump_all_tables_in_db(char *database) 
  RETURN

    void

*/



static void get_actual_table_name(const char *old_table_name, 

                                  char *new_table_name, 

                                  int buf_size)
@@ -2098,7 +2099,6 @@ static void get_actual_table_name( const char *old_table_name, 
  MYSQL_RES  *tableRes;

  MYSQL_ROW  row;

  char query[ NAME_LEN + 50 ];



  DBUG_ENTER("get_actual_table_name");



  sprintf( query, "SHOW TABLES LIKE '%s'", old_table_name);
@@ -2109,9 +2109,9 @@ static void get_actual_table_name( const char *old_table_name, 


  tableRes= mysql_store_result( sock );

  row= mysql_fetch_row( tableRes );

	strncpy( new_table_name, row[0], buf_size );

  strmake(new_table_name, row[0], buf_size-1);

  mysql_free_result(tableRes);

} /* get_actual_table_name */

}





static int dump_selected_tables(char *db, char **table_names, int tables)

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -1677,8 +1677,8 @@ then 
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"

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

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

else

  # Optimized version. No debug

  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"

extra/perror.c

+8 −6
Original line number Diff line number Diff line
@@ -215,10 +215,12 @@ int main(int argc,char *argv[]) 
    */

    msg= strerror(10000);



    /* allocate a buffer for unknown_error since strerror always returns the same pointer 

      on some platforms such as Windows */

    /*

      Allocate a buffer for unknown_error since strerror always returns

      the same pointer on some platforms such as Windows

    */

    unknown_error= malloc(strlen(msg)+1);

    strcpy( unknown_error, msg );

    strmov(unknown_error, msg);



    for ( ; argc-- > 0 ; argv++)

    {

innobase/include/univ.i

+0 −4
Original line number Diff line number Diff line
@@ -80,10 +80,6 @@ memory is read outside the allocated blocks. */ 


/* Make a non-inline debug version */



#ifdef DBUG_ON

#define UNIV_DEBUG

#endif /* DBUG_ON */



/*

#define UNIV_DEBUG

#define UNIV_MEM_DEBUG

mysql-test/r/compare.result

+3 −0
Original line number Diff line number Diff line
@@ -39,3 +39,6 @@ DROP TABLE t1; 
SELECT CHAR(31) = '', '' = CHAR(31);

CHAR(31) = ''	'' = CHAR(31)

0	0

SELECT CHAR(30) = '', '' = CHAR(30);

CHAR(30) = ''	'' = CHAR(30)

0	0