Commit 9c782e6b authored by unknown's avatar unknown
Browse files

Bug#21297 rpl_insert fails randomly 

 - Add loop in mysqlslap that tries to connect up to 10 times if connect
   in thread fails.


client/mysqlslap.c:
  Add loop to retry connect 10 times with a small sleep in between.
mysql-test/t/disabled.def:
  Remove disabling of testcase
parent f2eabb87

client/mysqlslap.c

+18 −3
Original line number Diff line number Diff line
@@ -1113,6 +1113,7 @@ run_scheduler(stats *sptr, statement *stmts, uint concur, ulonglong limit) 
  DBUG_RETURN(0);

}





int

run_task(thread_context *con)

{
@@ -1137,13 +1138,27 @@ run_task(thread_context *con) 
  my_lock(lock_file, F_RDLCK, 0, F_TO_EOF, MYF(0));

  if (!opt_only_print)

  {

    if (!(mysql_real_connect(mysql, host, user, opt_password,

    /* Connect to server */

    static ulong connection_retry_sleep= 100000; /* Microseconds */

    int i, connect_error= 1;

    for (i= 0; i < 10; i++)

    {

      if (mysql_real_connect(mysql, host, user, opt_password,

                             create_schema_string,

                             opt_mysql_port,

                             opt_mysql_unix_port,

                             connect_flags)))

                             connect_flags))

      {

        /* Connect suceeded */

        connect_error= 0;

        break;

      }

      my_sleep(connection_retry_sleep);

    }

    if (connect_error)

    {

      fprintf(stderr,"%s: %s\n",my_progname,mysql_error(mysql));

      fprintf(stderr,"%s: Error when connecting to server: %d %s\n",

              my_progname, mysql_errno(mysql), mysql_error(mysql));

      goto end;

    }

  }

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ rpl_sp_effects : BUG#19862 2006-06-15 mkindahl 


# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open

#ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events

rpl_insert               : BUG#21297 2006-07-26 msvensson

rpl_ndb_idempotent       : BUG#21298 2006-07-27 msvensson

rpl_row_basic_7ndb       : BUG#21298 2006-07-27 msvensson

rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson