Commit 4c19f0e9 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/bk/mysql-5.0 

into  mysql.com:/home/pem/work/mysql-5.0
parents a5925a90 66eec84f

BUILD/SETUP.sh

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ prefix_configs="--prefix=/usr/local/mysql" 
just_print=

just_configure=

full_debug=

if test -n $MYSQL_BUILD_PREFIX

if test -n "$MYSQL_BUILD_PREFIX"

then

  prefix_configs="--prefix=$MYSQL_BUILD_PREFIX"

fi

Makefile.am

+13 −8
Original line number Diff line number Diff line
@@ -109,13 +109,18 @@ MYSQL_TEST_RUN_ARGS = --manager-port=$(MYSQL_TEST_MANAGER_PORT) \ 
				--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)

test:

	cd mysql-test ; \

	./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) && \

	./mysql-test-run.pl --ps-protocol $(MYSQL_TEST_RUN_ARGS)

	./mysql-test-run \

		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

		--master_port=$(MYSQL_TEST_MASTER_PORT) \

		--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

		--ndbcluster_port=$(MYSQL_TEST_NDB_PORT) && \

	./mysql-test-run --ps-protocol \

		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

		--master_port=$(MYSQL_TEST_MASTER_PORT) \

		--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

		--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)



test-force:

	cd mysql-test; \

	./mysql-test-run --force $(MYSQL_TEST_RUN_ARGS) ; \

	./mysql-test-run --ps-protocol --force $(MYSQL_TEST_RUN_ARGS)



# Don't update the files from bitkeeper

%::SCCS/s.%
 
	./mysql-test-run --force ;\

	./mysql-test-run --ps-protocol --force

client/mysql.cc

+2 −2
Original line number Diff line number Diff line
@@ -1014,13 +1014,13 @@ static int read_and_execute(bool interactive) 
      unsigned long clen;

      do

      {

        line= my_cgets(tmpbuf.c_ptr(), tmpbuf.alloced_length(), &clen);

        line= my_cgets(tmpbuf.ptr(), tmpbuf.alloced_length()-1, &clen);

        buffer.append(line, clen);

        /* 

           if we got buffer fully filled than there is a chance that

           something else is still in console input buffer

        */

      } while (tmpbuf.alloced_length() <= clen + 1);

      } while (tmpbuf.alloced_length() <= clen);

      line= buffer.c_ptr();

#else /* OS2 */

      buffer.length(0);

client/mysqldump.c

+173 −110
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ 
/* Size of buffer for dump's select query */

#define QUERY_LENGTH 1536



/* ignore table flags */

#define IGNORE_NONE 0x00 /* no ignore */

#define IGNORE_DATA 0x01 /* don't dump data for this table */

#define IGNORE_INSERT_DELAYED 0x02 /* table doesn't support INSERT DELAYED */



static char *add_load_option(char *ptr, const char *object,

			     const char *statement);

static ulong find_set(TYPELIB *lib, const char *x, uint length,
@@ -209,9 +214,7 @@ static struct my_option my_long_options[] = 
  {"default-character-set", OPT_DEFAULT_CHARSET,

   "Set the default character set.", (gptr*) &default_charset,

   (gptr*) &default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"delayed-insert", OPT_DELAYED, "Insert rows with INSERT DELAYED; "

   "currently ignored because of http://bugs.mysql.com/bug.php?id=7815 "

   "but will be re-enabled later",

  {"delayed-insert", OPT_DELAYED, "Insert rows with INSERT DELAYED; ",

   (gptr*) &opt_delayed, (gptr*) &opt_delayed, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,

   0, 0},

  {"delete-master-logs", OPT_DELETE_MASTER_LOGS,
@@ -411,7 +414,7 @@ static int init_dumping(char *); 
static int dump_databases(char **);

static int dump_all_databases();

static char *quote_name(const char *name, char *buff, my_bool force);

static const char *check_if_ignore_table(const char *table_name);

char check_if_ignore_table(const char *table_name, char *table_type);

static char *primary_key_fields(const char *table_name);

static my_bool get_view_structure(char *table, char* db);

static my_bool dump_all_views_in_db(char *database);
@@ -720,25 +723,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      }

      break;

    }

#ifndef REMOVE_THIS_CODE_WHEN_FIX_BUG_7815

  case (int) OPT_DELAYED:

    /*

      Because of http://bugs.mysql.com/bug.php?id=7815, we disable

      --delayed-insert; when the bug gets fixed by checking the storage engine

      (using the table definition cache) before printing INSERT DELAYED, we

      can correct the option's description and re-enable it again (scheduled

      for later 5.0 or 5.1 versions).

      It's ok to do the if() below as get_one_option is called after

      opt_delayed is set.

    */

    if (opt_delayed)

    {

      fprintf(stderr, "Warning: ignoring --delayed-insert (as explained "

	      "in the output of 'mysqldump --help').\n");

      opt_delayed= 0;

    }

    break;

#endif

  }

  return 0;

}
@@ -1280,19 +1264,27 @@ static uint dump_routines_for_db (char *db) 
}



/*

  getTableStructure -- retrievs database structure, prints out corresponding

  CREATE statement and fills out insert_pat.

  get_table_structure -- retrievs database structure, prints out corresponding

  CREATE statement and fills out insert_pat if the table is the type we will

  be dumping.



  ARGS

    table       - table name

    db          - db name

    table_type  - table type ie "InnoDB"

    ignore_flag - what we must particularly ignore - see IGNORE_ defines above



  RETURN

    number of fields in table, 0 if error

*/



static uint get_table_structure(char *table, char *db)

static uint get_table_structure(char *table, char *db, char *table_type,

                                char *ignore_flag)

{

  MYSQL_RES  *tableRes;

  MYSQL_ROW  row;

  my_bool    init=0;

  uint       numFields;

  uint       num_fields;

  char	     *result_table, *opt_quoted_table;

  const char *insert_option;

  char	     name_buff[NAME_LEN+3],table_buff[NAME_LEN*2+3];
@@ -1300,18 +1292,30 @@ static uint get_table_structure(char *table, char *db) 
  char       query_buff[512];

  FILE       *sql_file = md_result_file;

  int        len;



  DBUG_ENTER("get_table_structure");

  DBUG_PRINT("enter", ("db: %s, table: %s", db, table));



  if (!insert_pat_inited)

  *ignore_flag= check_if_ignore_table(table, table_type);



  if (opt_delayed && (*ignore_flag & IGNORE_INSERT_DELAYED))

    if (verbose)

      fprintf(stderr,

	      "-- Unable to use delayed inserts for table '%s' because it's of\

 type %s\n", table, table_type);



  if (!(*ignore_flag & IGNORE_DATA))

  {

    if (!insert_pat_inited)

      insert_pat_inited= init_dynamic_string(&insert_pat, "", 1024, 1024);

  }

    else

      dynstr_set(&insert_pat, "");

  }



  insert_option= ((opt_delayed && opt_ignore) ? " DELAYED IGNORE " : 

                  opt_delayed ? " DELAYED " :

  insert_option= ((opt_delayed && opt_ignore &&

                   !(*ignore_flag & IGNORE_INSERT_DELAYED)) ?

                  " DELAYED IGNORE " :

                  opt_delayed && !(*ignore_flag & IGNORE_INSERT_DELAYED) ? " DELAYED " :

                  opt_ignore ? " IGNORE " : "");



  if (verbose)
@@ -1321,7 +1325,8 @@ static uint get_table_structure(char *table, char *db) 
                   "SET OPTION SQL_QUOTE_SHOW_CREATE=%d",

                   (opt_quoted || opt_keywords));

  if (!create_options)

    strmov(query_buff+len, "/*!40102 ,SQL_MODE=concat(@@sql_mode, _utf8 ',NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS') */");

    strmov(query_buff+len,

           "/*!40102 ,SQL_MODE=concat(@@sql_mode, _utf8 ',NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS') */");



  result_table=     quote_name(table, table_buff, 1);

  opt_quoted_table= quote_name(table, table_buff2, 0);
@@ -1442,6 +1447,13 @@ static uint get_table_structure(char *table, char *db) 
      DBUG_RETURN(0);

    }



    /*

      if *ignore_flag & IGNORE_DATA is true, then we don't build up insert statements 

      for the table's data. Note: in subsequent lines of code, this test will 

      have to be performed each time we are appending to insert_pat.

    */

    if (!(*ignore_flag & IGNORE_DATA))

    {

      dynstr_append_mem(&insert_pat, "INSERT ", 7);

      dynstr_append(&insert_pat, insert_option);

      dynstr_append_mem(&insert_pat, "INTO ", 5);
@@ -1456,20 +1468,21 @@ static uint get_table_structure(char *table, char *db) 
        if (!extended_insert)

          dynstr_append_mem(&insert_pat, "(", 1);

      }

    }



    while ((row=mysql_fetch_row(tableRes)))

    {

      if (init)

      {

        if (opt_complete_insert)

        if (opt_complete_insert && !(*ignore_flag & IGNORE_DATA))

          dynstr_append_mem(&insert_pat, ", ", 2);

      }

      init=1;

      if (opt_complete_insert)

      if (opt_complete_insert && !(*ignore_flag & IGNORE_DATA))

        dynstr_append(&insert_pat,

                      quote_name(row[SHOW_FIELDNAME], name_buff, 0));

    }

    numFields = (uint) mysql_num_rows(tableRes);

    num_fields= (uint) mysql_num_rows(tableRes);

    mysql_free_result(tableRes);

  }

  else
@@ -1515,20 +1528,21 @@ static uint get_table_structure(char *table, char *db) 
      check_io(sql_file);

    }



    if (!(*ignore_flag & IGNORE_DATA))

    {

      dynstr_append_mem(&insert_pat, "INSERT ", 7);

      dynstr_append(&insert_pat, insert_option);

      dynstr_append_mem(&insert_pat, "INTO ", 5);

      dynstr_append(&insert_pat, result_table);

      if (opt_complete_insert)

    {

        dynstr_append_mem(&insert_pat, " (", 2);

    }

      else

      {

        dynstr_append_mem(&insert_pat, " VALUES ", 8);

        if (!extended_insert)

          dynstr_append_mem(&insert_pat, "(", 1);

      }

    }



    while ((row=mysql_fetch_row(tableRes)))

    {
@@ -1540,11 +1554,11 @@ static uint get_table_structure(char *table, char *db) 
	  fputs(",\n",sql_file);

	  check_io(sql_file);

	}

        if (opt_complete_insert)

        if (opt_complete_insert && !(*ignore_flag & IGNORE_DATA))

          dynstr_append_mem(&insert_pat, ", ", 2);

      }

      init=1;

      if (opt_complete_insert)

      if (opt_complete_insert && !(*ignore_flag & IGNORE_DATA))

        dynstr_append(&insert_pat,

                      quote_name(row[SHOW_FIELDNAME], name_buff, 0));

      if (!tFlag)
@@ -1575,7 +1589,7 @@ static uint get_table_structure(char *table, char *db) 
	check_io(sql_file);

      }

    }

    numFields = (uint) mysql_num_rows(tableRes);

    num_fields = (uint) mysql_num_rows(tableRes);

    mysql_free_result(tableRes);

    if (!tFlag)

    {
@@ -1684,9 +1698,7 @@ static uint get_table_structure(char *table, char *db) 
        else

        {

	  if (opt_xml)

	  {

	    print_xml_row(sql_file, "options", tableRes, &row);

	  }

	  else

	  {

	    fputs("/*!",sql_file);
@@ -1707,7 +1719,7 @@ static uint get_table_structure(char *table, char *db) 
      check_io(sql_file);

    }

  }

  if (opt_complete_insert)

  if (opt_complete_insert && !(*ignore_flag & IGNORE_DATA))

  {

    dynstr_append_mem(&insert_pat, ") VALUES ", 9);

    if (!extended_insert)
@@ -1719,7 +1731,7 @@ static uint get_table_structure(char *table, char *db) 
    write_footer(sql_file);

    my_fclose(sql_file, MYF(MY_WME));

  }

  DBUG_RETURN(numFields);

  DBUG_RETURN(num_fields);

} /* get_table_structure */
@@ -1844,20 +1856,40 @@ static char *alloc_query_str(ulong size) 




/*

** dump_table saves database contents as a series of INSERT statements.



 SYNOPSIS

  dump_table()



  dump_table saves database contents as a series of INSERT statements.



  ARGS

   table - table name

   db    - db name



   RETURNS

    void

*/



static void dump_table(uint numFields, char *table)

static void dump_table(char *table, char *db)

{

  char ignore_flag;

  char query_buf[QUERY_LENGTH], *end, buff[256],table_buff[NAME_LEN+3];

  char    table_type[NAME_LEN];

  char *result_table, table_buff2[NAME_LEN*2+3], *opt_quoted_table;

  char *query= query_buf;

  int error= 0;

  ulong		rownr, row_break, total_length, init_length;

  uint num_fields;

  MYSQL_RES	*res;

  MYSQL_FIELD	*field;

  MYSQL_ROW	row;

  ulong		rownr, row_break, total_length, init_length;

  const char    *table_type;

  int error= 0;

  DBUG_ENTER("dump_table");



  /*

    Make sure you get the create table info before the following check for

    --no-data flag below. Otherwise, the create table info won't be printed.

  */

  num_fields= get_table_structure(table, db, (char *)&table_type, &ignore_flag);



  /* Check --no-data flag */

  if (dFlag)
@@ -1866,31 +1898,35 @@ static void dump_table(uint numFields, char *table) 
      fprintf(stderr,

              "-- Skipping dump data for table '%s', --no-data was used\n",

	      table);

    return;

    DBUG_VOID_RETURN;

  }



  DBUG_PRINT("info", ("ignore_flag %x num_fields %d", ignore_flag, num_fields));

  /*

    If the table type is a merge table or any type that has to be

     _completely_ ignored and no data dumped

  */

  if (ignore_flag & IGNORE_DATA)

  {

    if (verbose)

      fprintf(stderr,

	      "-- Skipping data for table '%s' because it's of type %s\n",

	      table, table_type);

    DBUG_VOID_RETURN;

  }

  /* Check that there are any fields in the table */

  if (numFields == 0)

  if (num_fields == 0)

  {

    if (verbose)

      fprintf(stderr,

	      "-- Skipping dump data for table '%s', it has no fields\n",

	      table);

    return;

    DBUG_VOID_RETURN;

  }



  result_table= quote_name(table,table_buff, 1);

  opt_quoted_table= quote_name(table, table_buff2, 0);



  /* Check table type */

  if ((table_type= check_if_ignore_table(table)))

  {

    if (verbose)

      fprintf(stderr,

	      "-- Skipping data for table '%s' because it's of type %s\n",

	      table, table_type);

    return;

  }



  if (verbose)

    fprintf(stderr, "-- Sending SELECT query...\n");
@@ -1934,7 +1970,7 @@ static void dump_table(uint numFields, char *table) 
    if (mysql_real_query(sock, query, (uint) (end - query)))

    {

      DB_error(sock, "when executing 'SELECT INTO OUTFILE'");

      return;

      DBUG_VOID_RETURN;

    }

  }

  else
@@ -1989,7 +2025,7 @@ static void dump_table(uint numFields, char *table) 
      DB_error(sock, "when retrieving data from server");

    if (verbose)

      fprintf(stderr, "-- Retrieving rows...\n");

    if (mysql_num_fields(res) != numFields)

    if (mysql_num_fields(res) != num_fields)

    {

      fprintf(stderr,"%s: Error in field count for table: %s !  Aborting.\n",

	      my_progname, result_table);
@@ -2288,13 +2324,13 @@ static void dump_table(uint numFields, char *table) 
    if (query != query_buf)

      my_free(query, MYF(MY_ALLOW_ZERO_PTR));

  }

  return;

  DBUG_VOID_RETURN;



err:

  if (query != query_buf)

    my_free(query, MYF(MY_ALLOW_ZERO_PTR));

  safe_exit(error);

  return;

  DBUG_VOID_RETURN;

} /* dump_table */
@@ -2495,8 +2531,7 @@ static int dump_all_tables_in_db(char *database) 
    char *end= strmov(afterdot, table);

    if (include_table(hash_key, end - hash_key))

    {

      numrows = get_table_structure(table, database);

      dump_table(numrows,table);

      dump_table(table,database);

      my_free(order_by, MYF(MY_ALLOW_ZERO_PTR));

      order_by= 0;

      if (opt_dump_triggers && ! opt_xml &&
@@ -2630,7 +2665,7 @@ static int get_actual_table_name(const char *old_table_name, 


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

{

  uint numrows, i;

  uint i;

  char table_buff[NAME_LEN*+3];

  char new_table_name[NAME_LEN];

  DYNAMIC_STRING lock_tables_query;
@@ -2699,8 +2734,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables) 
  {

    table_name= hash_element(&dump_tables, i);

    DBUG_PRINT("info",("Dumping table %s", table_name));

    numrows= get_table_structure(table_name, db);

    dump_table(numrows, table_name);

    dump_table(table_name,db);

    if (opt_dump_triggers &&

        mysql_get_server_version(sock) >= 50009)

      dump_triggers_for_table(table_name, db);
@@ -2899,28 +2933,37 @@ static void print_value(FILE *file, MYSQL_RES *result, MYSQL_ROW row, 




/*

  Check if we the table is one of the table types that should be ignored:

  MRG_ISAM, MRG_MYISAM



  SYNOPSIS



  Check if we the table is one of the table types that should be ignored:

  MRG_ISAM, MRG_MYISAM, if opt_delayed, if that table supports delayed inserts.

  If the table should be altogether ignored, it returns a TRUE, FALSE if it

  should not be ignored. If the user has selected to use INSERT DELAYED, it 

  sets the value of the bool pointer supports_delayed_inserts to 0 if not 

  supported, 1 if it is supported.



  ARGS



    check_if_ignore_table()

    table_name			Table name to check

    table_type                  Type of table



  GLOBAL VARIABLES

    sock			MySQL socket

    verbose			Write warning messages



  RETURN

    0	Table should be backuped

    #	Type of table (that should be skipped)

    char (bit value)            See IGNORE_ values at top

*/



static const char *check_if_ignore_table(const char *table_name)

char check_if_ignore_table(const char *table_name, char *table_type)

{

  char result= IGNORE_NONE;

  char buff[FN_REFLEN+80], show_name_buff[FN_REFLEN];

  MYSQL_RES *res;

  MYSQL_ROW row;

  const char *result= 0;

  DBUG_ENTER("check_if_ignore_table");



  /* Check memory for quote_for_like() */

  DBUG_ASSERT(2*sizeof(table_name) < sizeof(show_name_buff));
@@ -2934,7 +2977,7 @@ static const char *check_if_ignore_table(const char *table_name) 
	fprintf(stderr,

		"-- Warning: Couldn't get status information for table %s (%s)\n",

		table_name,mysql_error(sock));

      return 0;					/* assume table is ok */

      DBUG_RETURN(result);                       /* assume table is ok */

    }

  }

  if (!(row= mysql_fetch_row(res)))
@@ -2943,18 +2986,38 @@ static const char *check_if_ignore_table(const char *table_name) 
	    "Error: Couldn't read status information for table %s (%s)\n",

	    table_name, mysql_error(sock));

    mysql_free_result(res);

    return 0;					/* assume table is ok */

    DBUG_RETURN(result);                         /* assume table is ok */

  }

  if (!(row[1]))

      result= "VIEW";

      strmake(table_type,"VIEW", NAME_LEN-1);

  else

  {

    if (strcmp(row[1], (result= "MRG_MyISAM")) &&

        strcmp(row[1], (result= "MRG_ISAM")))

      result= 0;

    /*

      If the table type matches any of these, we do support delayed inserts.

      Note: we do not want to skip dumping this table if if is not one of

      these types, but we do want to use delayed inserts in the dump if

      the table type is _NOT_ one of these types

    */

    strmake(table_type, row[1], NAME_LEN-1);

    if (opt_delayed)

    {

      if (strcmp(table_type,"MyISAM") &&

          strcmp(table_type,"ISAM") &&

          strcmp(table_type,"ARCHIVE") &&

          strcmp(table_type,"HEAP") &&

          strcmp(table_type,"MEMORY"))

        result= IGNORE_INSERT_DELAYED;

    }



    /*

      If these two types, we do want to skip dumping the table

    */

    if (!dFlag &&

        (!strcmp(table_type,"MRG_MyISAM") || !strcmp(table_type,"MRG_ISAM")))

      result= IGNORE_DATA;

  }

  mysql_free_result(res);

  return result;

  DBUG_RETURN(result);

}



/*

client/mysqltest.c

+44 −35
Original line number Diff line number Diff line
@@ -59,13 +59,17 @@ 
#include <stdarg.h>

#include <sys/stat.h>

#include <violite.h>

#include <regex.h>                        /* Our own version of lib */

#include "my_regex.h"                     /* Our own version of lib */

#ifdef HAVE_SYS_WAIT_H

#include <sys/wait.h>

#endif

#ifndef WEXITSTATUS

# ifdef __WIN__

#  define WEXITSTATUS(stat_val) (stat_val)

# else

#  define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)

# endif

#endif

/* MAX_QUERY is 256K -- there is a test in sp-big that is >128K */

#define MAX_QUERY     (256*1024)

#define MAX_VAR_NAME	256
@@ -208,7 +212,7 @@ static int got_end_timer= FALSE; 
static void timer_output(void);

static ulonglong timer_now(void);



static regex_t ps_re; /* Holds precompiled re for valid PS statements */

static my_regex_t ps_re; /* Holds precompiled re for valid PS statements */

static void ps_init_re(void);

static int ps_match_re(char *);

static char *ps_eprint(int);
@@ -609,6 +613,7 @@ static void die(const char *fmt, ...) 
    if (cur_file && cur_file != file_stack)

      fprintf(stderr, "In included file \"%s\": ",

              cur_file->file_name);

    if (start_lineno != 0)

      fprintf(stderr, "At line %u: ", start_lineno);

    vfprintf(stderr, fmt, args);

    fprintf(stderr, "\n");
@@ -642,7 +647,9 @@ static void verbose_msg(const char *fmt, ...) 


  va_start(args, fmt);



  fprintf(stderr, "mysqltest: At line %u: ", start_lineno);

  fprintf(stderr, "mysqltest: ");

  if (start_lineno > 0)

    fprintf(stderr, "At line %u: ", start_lineno);

  vfprintf(stderr, fmt, args);

  fprintf(stderr, "\n");

  va_end(args);
@@ -1097,8 +1104,8 @@ static void do_exec(struct st_query *query) 
          (query->expected_errno[i].code.errnum == status))

      {

        ok= 1;

        verbose_msg("command \"%s\" failed with expected error: %d",

                    cmd, status);

        DBUG_PRINT("info", ("command \"%s\" failed with expected error: %d",

                            cmd, status));

      }

    }

    if (!ok)
@@ -1383,9 +1390,7 @@ int do_sync_with_master2(long offset) 
  int rpl_parse;



  if (!master_pos.file[0])

  {

    die("Line %u: Calling 'sync_with_master' without calling 'save_master_pos'", start_lineno);

  }

    die("Calling 'sync_with_master' without calling 'save_master_pos'");

  rpl_parse= mysql_rpl_parse_enabled(mysql);

  mysql_disable_rpl_parse(mysql);
@@ -1395,14 +1400,13 @@ int do_sync_with_master2(long offset) 
wait_for_position:



  if (mysql_query(mysql, query_buf))

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

	mysql_errno(mysql), mysql_error(mysql));

    die("failed in %s: %d: %s", query_buf, mysql_errno(mysql),

        mysql_error(mysql));



  if (!(last_result= res= mysql_store_result(mysql)))

    die("line %u: mysql_store_result() returned NULL for '%s'", start_lineno,

	query_buf);

    die("mysql_store_result() returned NULL for '%s'", query_buf);

  if (!(row= mysql_fetch_row(res)))

    die("line %u: empty result in %s", start_lineno, query_buf);

    die("empty result in %s", query_buf);

  if (!row[0])

  {

    /*
@@ -1410,10 +1414,7 @@ int do_sync_with_master2(long offset) 
      SLAVE has been issued ?

    */

    if (tries++ == 3)

    {

      die("line %u: could not sync with master ('%s' returned NULL)", 

          start_lineno, query_buf);

    }

      die("could not sync with master ('%s' returned NULL)", query_buf);

    sleep(1); /* So at most we will wait 3 seconds and make 4 tries */

    mysql_free_result(res);

    goto wait_for_position;
@@ -1459,10 +1460,9 @@ int do_save_master_pos() 
	mysql_errno(mysql), mysql_error(mysql));



  if (!(last_result =res = mysql_store_result(mysql)))

    die("line %u: mysql_store_result() retuned NULL for '%s'", start_lineno,

	query);

    die("mysql_store_result() retuned NULL for '%s'", query);

  if (!(row = mysql_fetch_row(res)))

    die("line %u: empty result in show master status", start_lineno);

    die("empty result in show master status");

  strnmov(master_pos.file, row[0], sizeof(master_pos.file)-1);

  master_pos.pos = strtoul(row[1], (char**) 0, 10);

  mysql_free_result(res); last_result=0;
@@ -2768,7 +2768,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      fn_format(buff, argument, "", "", 4);

      DBUG_ASSERT(cur_file == file_stack && cur_file->file == 0);

      if (!(cur_file->file=

            my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(MY_WME))))

            my_fopen(buff, O_RDONLY | FILE_BINARY, MYF(0))))

	die("Could not open %s: errno = %d", buff, errno);

      cur_file->file_name= my_strdup(buff, MYF(MY_FAE));

      break;
@@ -3767,12 +3767,13 @@ static void ps_init_re(void) 
    "[[:space:]]*UPDATE[[:space:]]+MULTI[[:space:]]|"

    "[[:space:]]*INSERT[[:space:]]+SELECT[[:space:]])";



  int err= regcomp(&ps_re, ps_re_str, (REG_EXTENDED | REG_ICASE | REG_NOSUB),

  int err= my_regcomp(&ps_re, ps_re_str,

                      (REG_EXTENDED | REG_ICASE | REG_NOSUB),

                      &my_charset_latin1);

  if (err)

  {

    char erbuf[100];

    int len= regerror(err, &ps_re, erbuf, sizeof(erbuf));

    int len= my_regerror(err, &ps_re, erbuf, sizeof(erbuf));

    fprintf(stderr, "error %s, %d/%d `%s'\n",

            ps_eprint(err), len, (int)sizeof(erbuf), erbuf);

    exit(1);
@@ -3782,7 +3783,7 @@ static void ps_init_re(void) 


static int ps_match_re(char *stmt_str)

{

  int err= regexec(&ps_re, stmt_str, (size_t)0, NULL, 0);

  int err= my_regexec(&ps_re, stmt_str, (size_t)0, NULL, 0);



  if (err == 0)

    return 1;
@@ -3791,7 +3792,7 @@ static int ps_match_re(char *stmt_str) 
  else

  {

    char erbuf[100];

    int len= regerror(err, &ps_re, erbuf, sizeof(erbuf));

    int len= my_regerror(err, &ps_re, erbuf, sizeof(erbuf));

    fprintf(stderr, "error %s, %d/%d `%s'\n",

            ps_eprint(err), len, (int)sizeof(erbuf), erbuf);

    exit(1);
@@ -3801,7 +3802,7 @@ static int ps_match_re(char *stmt_str) 
static char *ps_eprint(int err)

{

  static char epbuf[100];

  size_t len= regerror(REG_ITOA|err, (regex_t *)NULL, epbuf, sizeof(epbuf));

  size_t len= my_regerror(REG_ITOA|err, (my_regex_t *)NULL, epbuf, sizeof(epbuf));

  assert(len <= sizeof(epbuf));

  return(epbuf);

}
@@ -3809,7 +3810,7 @@ static char *ps_eprint(int err) 


static void ps_free_reg(void)

{

  regfree(&ps_re);

  my_regfree(&ps_re);

}



/****************************************************************************/
@@ -4304,13 +4305,21 @@ int main(int argc, char **argv) 
    if (res_info.st_size)

      error|= (RESULT_CONTENT_MISMATCH | RESULT_LENGTH_MISMATCH);

  }

  if (result_file && ds_res.length && !error)

  if (ds_res.length && !error)

  {

    if (result_file)

    {

      if (!record)

        error |= check_result(&ds_res, result_file, q->require_file);

      else

        str_to_file(result_file, ds_res.str, ds_res.length);

    }

    else

    {

      /* Print the result to stdout */

      printf("%s", ds_res.str);

    }

  }

  dynstr_free(&ds_res);



  if (!silent)