Commit c0612e45 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 33fc8d50 0184996b

Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ bin-dist: all 
# Remove BK's "SCCS" subdirectories from source distribution

dist-hook:

	rm -rf `find $(distdir) -type d -name SCCS -print`

	rm -f  `find $(distdir) -type l -print`



tags:

	support-files/build-tags

client/mysqltest.c

+2 −0
Original line number Diff line number Diff line
@@ -222,11 +222,13 @@ struct st_connection 
  char *name;

  MYSQL_STMT* stmt;



#ifdef EMBEDDED_LIBRARY

  const char *cur_query;

  int cur_query_len;

  pthread_mutex_t mutex;

  pthread_cond_t cond;

  int query_done;

#endif /*EMBEDDED_LIBRARY*/

};

struct st_connection connections[128];

struct st_connection* cur_con, *next_con, *connections_end;

libmysql/libmysql.c

+9 −5
Original line number Diff line number Diff line
@@ -2496,6 +2496,8 @@ static my_bool execute(MYSQL_STMT *stmt, char *packet, ulong length) 
  NET	*net= &mysql->net;

  char buff[4 /* size of stmt id */ +

            5 /* execution flags */];

  my_bool res;



  DBUG_ENTER("execute");

  DBUG_PRINT("enter",("packet: %s, length :%d",packet ? packet :" ", length));
@@ -2503,15 +2505,17 @@ static my_bool execute(MYSQL_STMT *stmt, char *packet, ulong length) 
  int4store(buff, stmt->stmt_id);		/* Send stmt id to server */

  buff[4]= (char) 0;                            /* no flags */

  int4store(buff+5, 1);                         /* iteration count */

  if (cli_advanced_command(mysql, COM_EXECUTE, buff, sizeof(buff),



  res= test(cli_advanced_command(mysql, COM_EXECUTE, buff, sizeof(buff),

                                 packet, length, 1, NULL) ||

      (*mysql->methods->read_query_result)(mysql))

            (*mysql->methods->read_query_result)(mysql));

  stmt->affected_rows= mysql->affected_rows;

  stmt->insert_id= mysql->insert_id;

  if (res)

  {

    set_stmt_errmsg(stmt, net->last_error, net->last_errno, net->sqlstate);

    DBUG_RETURN(1);

  }

  stmt->affected_rows= mysql->affected_rows;

  stmt->insert_id= mysql->insert_id;

  DBUG_RETURN(0);

}

libmysqld/lib_sql.cc

+9 −5
Original line number Diff line number Diff line
@@ -224,20 +224,24 @@ static int emb_stmt_execute(MYSQL_STMT *stmt) 
{

  DBUG_ENTER("emb_stmt_execute");

  char header[4];

  my_bool res;



  int4store(header, stmt->stmt_id);

  THD *thd= (THD*)stmt->mysql->thd;

  thd->client_param_count= stmt->param_count;

  thd->client_params= stmt->params;

  if (emb_advanced_command(stmt->mysql, COM_EXECUTE,0,0,



  res= test(emb_advanced_command(stmt->mysql, COM_EXECUTE,0,0,

                                 header, sizeof(header), 1, stmt) ||

      emb_mysql_read_query_result(stmt->mysql))

            emb_mysql_read_query_result(stmt->mysql));

  stmt->affected_rows= stmt->mysql->affected_rows;

  stmt->insert_id= stmt->mysql->insert_id;

  if (res)

  {

    NET *net= &stmt->mysql->net;

    set_stmt_errmsg(stmt, net->last_error, net->last_errno, net->sqlstate);

    DBUG_RETURN(1);

  }

  stmt->affected_rows= stmt->mysql->affected_rows;

  stmt->insert_id= stmt->mysql->insert_id;

  DBUG_RETURN(0);

}

mysql-test/lib/mtr_process.pl

+1 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ sub sleep_until_file_created ($$$) { 


    # Print extra message every 60 seconds

    my $seconds= ($loop * $sleeptime) / 1000;

    if ( $seconds > 1 and int($seconds) % 60 == 0 )

    if ( $seconds > 1 and int($seconds * 10) % 600 == 0 )

    {

      my $left= $timeout - $seconds;

      mtr_warning("Waited $seconds seconds for $pidfile to be created, " .