Commit 5218a03a authored by monty@donna.mysql.com's avatar monty@donna.mysql.com
Browse files

Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql

parents e2a8a99d 877845dd

Docs/manual.texi

+5 −4
Original line number Diff line number Diff line
@@ -40776,12 +40776,13 @@ not yet 100 % confident in this code. 
@itemize @bullet

@item

Changed code to get around compiler bug in Compaq C++ on OSF1, that broke

@code{BACKUP, RESTORE, CHECK, REPAIR, and ANALYZE TABLE}.

@code{BACKUP}, @code{RESTORE}, @code{CHECK}, @code{REPAIR}, and

@code{ANALYZE TABLE}.

@item

Added option @code{FULL} to @code{SHOW COLUMNS}. Now we only show the

privilege list for the columns if this option is given.

@item

Fixed bug in @code{SHOW LOGS} when there wheren't any BDB logs.

Fixed bug in @code{SHOW LOGS} when there weren't any BDB logs.

@item

Fixed a timing problem in replication that could delay sending an update

to the client until a new update was done.
@@ -40791,13 +40792,13 @@ to keep this code compatible with @code{SHOW FIELDS}. 
@item

@code{MERGE} tables didn't work on windows.

@item

Fixed problem with @code{SET PASSWORD=...} on windows.

Fixed problem with @code{SET PASSWORD=...} on Windows.

@item

Added missing @file{my_config.h} to RPM distribution.

@item

@code{TRIM("foo" from "foo")} didn't return an empty string.

@item

Added @code{--with-version-suffix} to configure.

Added @code{--with-version-suffix} to @code{configure}.

@item

Fixed coredump when client aborted connection without @code{mysql_close()}.

@item

client/mysqltest.c

+8 −3
Original line number Diff line number Diff line
@@ -485,14 +485,19 @@ int do_echo(struct st_query* q) 
  return 0;

}



int do_sync_with_master()

int do_sync_with_master(struct st_query* q)

{

  MYSQL_RES* res;

  MYSQL_ROW row;

  MYSQL* mysql = &cur_con->mysql;

  char query_buf[FN_REFLEN+128];

  int offset = 0;

  char* p = q->first_argument;

  if(*p)

    offset = atoi(p);

  

  sprintf(query_buf, "select master_pos_wait('%s', %ld)", master_pos.file,

	  master_pos.pos);

	  master_pos.pos + offset);

  if(mysql_query(mysql, query_buf))

    die("At line %u: failed in %s: %d: %s", start_lineno, query_buf,

	mysql_errno(mysql), mysql_error(mysql));
@@ -1458,7 +1463,7 @@ int main(int argc, char** argv) 
	  q->require_file=require_file;

	  save_file[0]=0;

	}

	error |= run_query(&cur_con->mysql, q, QUERY_SEND|QUERY_REAP);

	error |= run_query(&cur_con->mysql, q, flags);

	break;

      }

      case Q_SEND:

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ extern int my_printf_error _VARARGS((uint my_err, const char *format, 
				    __attribute__ ((format (printf, 2, 4))));

extern int my_vsnprintf( char *str, size_t n,

                                const char *format, va_list ap );



extern int my_snprintf(char* to, size_t n, const char* fmt, ...);

extern int my_message(uint my_err, const char *str,myf MyFlags);

extern int my_message_no_curses(uint my_err, const char *str,myf MyFlags);

extern int my_message_curses(uint my_err, const char *str,myf MyFlags);

include/mysqld_error.h

+6 −1
Original line number Diff line number Diff line
@@ -198,4 +198,9 @@ 
#define ER_CRASHED_ON_REPAIR 1195

#define ER_WARNING_NOT_COMPLETE_ROLLBACK 1196

#define ER_TRANS_CACHE_FULL 1197

#define ER_ERROR_MESSAGES 198
 
#define ER_SLAVE_MUST_STOP 1198

#define ER_SLAVE_NOT_RUNNING 1199

#define ER_BAD_SLAVE 1200

#define ER_MASTER_INFO 1201

#define ER_SLAVE_THREAD 1202

#define ER_ERROR_MESSAGES 203

mysql-test/mysql-test-run.sh

+15 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ cd .. 
BASEDIR=`pwd`

cd $CWD

MYSQL_TEST_DIR=$BASEDIR/mysql-test

export MYSQL_TEST_DIR

STD_DATA=$MYSQL_TEST_DIR/std_data

hostname=`hostname`		# Installed in the mysql privilege table
@@ -336,6 +337,11 @@ gcov_collect () { 
start_master()

{

    [ x$MASTER_RUNNING = 1 ] && return

    #run master initialization shell script if one exists

    if [ -f "$master_init_script" ] ;

    then

        /bin/sh $master_init_script

    fi

    cd $BASEDIR # for gcov

    # Remove old berkeley db log files that can confuse the server

    $RM -f $MASTER_MYDDIR/log.*
@@ -375,6 +381,13 @@ start_slave() 
{

    [ x$SKIP_SLAVE = x1 ] && return

    [ x$SLAVE_RUNNING = 1 ] && return

    

    #run slave initialization shell script if one exists

    if [ -f "$slave_init_script" ] ;

    then

	  /bin/sh $slave_init_script

    fi

    

    if [ -z "$SLAVE_MASTER_INFO" ] ; then

      master_info="--master-user=root \

	    --master-connect-retry=1 \
@@ -502,6 +515,8 @@ run_testcase () 
 tname=`$BASENAME $tf .test`

 master_opt_file=$TESTDIR/$tname-master.opt

 slave_opt_file=$TESTDIR/$tname-slave.opt

 master_init_script=$TESTDIR/$tname-master.sh

 slave_init_script=$TESTDIR/$tname-slave.sh

 slave_master_info_file=$TESTDIR/$tname-slave-master-info.opt

 SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`