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

WL#3475 (Threads for the embedded server in mysqltest) 

Necessary code added to mysqltest.c.
Disabled tests are available now.


client/mysqltest.c:
  do_send_query function implemented, so now 'send' command will be
  run in separate thread for the embedded server.
  Mutex and condition added to the 'connection' struct for syncronisation
  purposes. Yes it'd be easier if we had pthread_join() command
libmysql/libmysql.c:
  this isn't actually needed and causes problems in embedded server
mysql-test/t/bdb-deadlock.test:
  test is available for the embedded server now
mysql-test/t/flush.test:
  test is available for the embedded server now
mysql-test/t/flush_block_commit.test:
  test is available for the embedded server now
mysql-test/t/innodb-deadlock.test:
  test is available for the embedded server now
mysql-test/t/innodb-lock.test:
  test is available for the embedded server now
mysql-test/t/lock_multi.test:
  test is available for the embedded server now
mysql-test/t/rename.test:
  test is available for the embedded server now
mysql-test/t/show_check.test:
  test is available for the embedded server now
mysql-test/t/status.test:
  test is available for the embedded server now
parent 0153d67e

client/mysqltest.c

+89 −13
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 *   Matt Wagner  <matt@mysql.com>

 *   Monty

 *   Jani

 *   Holyfoot

 **/



/**********************************************************************
@@ -215,6 +216,12 @@ struct connection 
{

  MYSQL mysql;

  char *name;



  const char *cur_query;

  int cur_query_len;

  pthread_mutex_t mutex;

  pthread_cond_t cond;

  int query_done;

};



typedef struct
@@ -461,6 +468,57 @@ static void replace_dynstr_append_mem(DYNAMIC_STRING *ds, const char *val, 
				      int len);

static int handle_no_error(struct st_query *q);



#ifdef EMBEDDED_LIBRARY

/*

  send_one_query executes query in separate thread what is

  necessary in embedded library to run 'send' in proper way.

  This implementation doesn't handle errors returned

  by mysql_send_query. It's technically possible, though

  i don't see where it is needed.

*/

pthread_handler_decl(send_one_query, arg)

{

  struct connection *cn= (struct connection*)arg;



  mysql_thread_init();

  VOID(mysql_send_query(&cn->mysql, cn->cur_query, cn->cur_query_len));



  mysql_thread_end();

  pthread_mutex_lock(&cn->mutex);

  cn->query_done= 1;

  VOID(pthread_cond_signal(&cn->cond));

  pthread_mutex_unlock(&cn->mutex);

  pthread_exit(0);

  return 0;

}



static int do_send_query(struct connection *cn, const char *q, int q_len,

                         int flags)

{

  pthread_t tid;



  if (flags & QUERY_REAP)

    return mysql_send_query(&cn->mysql, q, q_len);



  if (pthread_mutex_init(&cn->mutex, NULL) ||

      pthread_cond_init(&cn->cond, NULL))

    die("Error in the thread library");



  cn->cur_query= q;

  cn->cur_query_len= q_len;

  cn->query_done= 0;

  if (pthread_create(&tid, NULL, send_one_query, (void*)cn))

    die("Cannot start new thread for query");



  return 0;

}



#else /*EMBEDDED_LIBRARY*/



#define do_send_query(cn,q,q_len,flags) mysql_send_query(&cn->mysql, q, q_len)



#endif /*EMBEDDED_LIBRARY*/



static void do_eval(DYNAMIC_STRING* query_eval, const char *query)

{

  const char *p;
@@ -1849,7 +1907,7 @@ int close_connection(struct st_query *q) 
#ifndef EMBEDDED_LIBRARY

      if (q->type == Q_DIRTY_CLOSE)

      {

	if (con->mysql.net.vio)

	while (con->mysql.net.vio)

	{

	  vio_delete(con->mysql.net.vio);

	  con->mysql.net.vio = 0;
@@ -2767,15 +2825,17 @@ static void append_result(DYNAMIC_STRING *ds, MYSQL_RES *res) 
* the result will be read - for regular query, both bits must be on

*/



static int run_query_normal(MYSQL *mysql, struct st_query *q, int flags);

static int run_query_stmt  (MYSQL *mysql, struct st_query *q, int flags);

static int run_query_normal(struct connection *cn, struct st_query *q,

                            int flags);

static int run_query_stmt  (struct connection *cn, struct st_query *q,

                            int flags);

static void run_query_stmt_handle_warnings(MYSQL *mysql, DYNAMIC_STRING *ds);

static int run_query_stmt_handle_error(char *query, struct st_query *q,

                                       MYSQL_STMT *stmt, DYNAMIC_STRING *ds);

static void run_query_display_metadata(MYSQL_FIELD *field, uint num_fields,

                                       DYNAMIC_STRING *ds);



static int run_query(MYSQL *mysql, struct st_query *q, int flags)

static int run_query(struct connection *cn, struct st_query *q, int flags)

{



  /*
@@ -2791,13 +2851,15 @@ static int run_query(MYSQL *mysql, struct st_query *q, int flags) 


  if (ps_protocol_enabled && disable_info &&

      (flags & QUERY_SEND) && (flags & QUERY_REAP) && ps_match_re(q->query))

    return run_query_stmt(mysql, q, flags);

  return run_query_normal(mysql, q, flags);

    return run_query_stmt(cn, q, flags);

  return run_query_normal(cn, q, flags);

}





static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)

static int run_query_normal(struct connection *cn, struct st_query* q,

                            int flags)

{

  MYSQL *mysql= &cn->mysql;

  MYSQL_RES* res= 0;

  uint i;

  int error= 0, err= 0, counter= 0;
@@ -2833,11 +2895,24 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) 


  if (flags & QUERY_SEND)

  {

    got_error_on_send= mysql_send_query(mysql, query, query_len);

    got_error_on_send= do_send_query(cn, query, query_len, flags);

    if (got_error_on_send && q->expected_errno[0].type == ERR_EMPTY)

      die("unable to send query '%s' (mysql_errno=%d , errno=%d)",

	  query, mysql_errno(mysql), errno);

  }

#ifdef EMBEDDED_LIBRARY

  /*

   Here we handle 'reap' command, so we need to check if the

   query's thread was finished and probably wait

  */

  else if (flags & QUERY_REAP)

  {

    pthread_mutex_lock(&cn->mutex);

    if (!cn->query_done)

      pthread_cond_wait(&cn->cond, &cn->mutex);

    pthread_mutex_unlock(&cn->mutex);

  }

#endif /*EMBEDDED_LIBRARY*/



  do

  {
@@ -3038,8 +3113,9 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) 
  complete SEND+REAP

*/



static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags)

static int run_query_stmt(struct connection *cn, struct st_query *q, int flags)

{

  MYSQL *mysql= &cn->mysql;

  int error= 0;             /* Function return code if "goto end;" */

  int err;                  /* Temporary storage of return code from calls */

  int query_len, got_error_on_execute;
@@ -3095,7 +3171,7 @@ static int run_query_stmt(MYSQL *mysql, struct st_query *q, int flags) 
    C API.

  */

  if ((err= mysql_stmt_prepare(stmt, query, query_len)) == CR_NO_PREPARE_STMT)

    return run_query_normal(mysql, q, flags);

    return run_query_normal(cn, q, flags);



  if (err != 0)

  {
@@ -3922,7 +3998,7 @@ int main(int argc, char **argv) 
	  q->require_file=require_file;

	  save_file[0]=0;

	}

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

	error|= run_query(cur_con, q, QUERY_REAP|QUERY_SEND);

	display_result_vertically= old_display_result_vertically;

        q->last_argument= q->end;

        query_executed= 1;
@@ -3949,7 +4025,7 @@ int main(int argc, char **argv) 
	  q->require_file=require_file;

	  save_file[0]=0;

	}

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

	error |= run_query(cur_con, q, flags);

	query_executed= 1;

        q->last_argument= q->end;

	break;
@@ -3970,7 +4046,7 @@ int main(int argc, char **argv) 
	  query and read the result some time later when reap instruction

	  is given on this connection.

	 */

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

	error |= run_query(cur_con, q, QUERY_SEND);

	query_executed= 1;

        q->last_argument= q->end;

	break;

libmysql/libmysql.c

+0 −7
Original line number Diff line number Diff line
@@ -4395,13 +4395,6 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt) 
    set_stmt_error(stmt, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);

    DBUG_RETURN(1);

  }

  if (result->data)

  {

    free_root(&result->alloc, MYF(MY_KEEP_PREALLOC));

    result->data= NULL;

    result->rows= 0;

    stmt->data_cursor= NULL;

  }



  if (stmt->update_max_length && !stmt->bind_result_done)

  {

mysql-test/t/bdb-deadlock.test

+0 −8
Original line number Diff line number Diff line 
# This test doesn't work with the embedded version as this code

# assumes that one query is running while we are doing queries on

# a second connection.

# This would work if mysqltest run would be threaded and handle each

# connection in a separate thread.

#



-- source include/not_embedded.inc

-- source include/have_bdb.inc



connect (con1,localhost,root,,);

mysql-test/t/flush.test

+0 −8
Original line number Diff line number Diff line 
# This test doesn't work with the embedded version as this code

# assumes that one query is running while we are doing queries on

# a second connection.

# This would work if mysqltest run would be threaded and handle each

# connection in a separate thread.

#

-- source include/not_embedded.inc



connect (con1,localhost,root,,);

connect (con2,localhost,root,,);

connection con1;

mysql-test/t/flush_block_commit.test

+0 −3
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ 
# We verify that we did not introduce a deadlock.

# This is intended to mimick how mysqldump and innobackup work.



# This test doesn't work with the embedded server

-- source include/not_embedded.inc



# And it requires InnoDB

-- source include/have_innodb.inc