Commit 382ec3e2 authored by unknown's avatar unknown
Browse files

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 

into  zim.(none):/home/brian/mysql/cleanup-5.1


BitKeeper/deleted/.del-partition_innodb.result:
  Delete: mysql-test/r/partition_innodb.result
BitKeeper/deleted/.del-partition_innodb.test:
  Delete: mysql-test/t/partition_innodb.test
include/config-win.h:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
parents 705c73b6 e605df8c

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ bkpush.log 
bkpush.log*

build.log

build_tags.sh

client/#mysql.cc#

client/*.ds?

client/*.vcproj

client/completion_hash.cpp
@@ -1181,7 +1182,9 @@ sql/pack.c 
sql/safe_to_cache_query.txt

sql/share/*.sys

sql/share/charsets/gmon.out

sql/share/fixerrmsg.pl

sql/share/gmon.out

sql/share/iso639-2.txt

sql/share/mysql

sql/share/norwegian-ny/errmsg.sys

sql/share/norwegian/errmsg.sys

client/mysql.cc

+1 −0
Original line number Diff line number Diff line
@@ -852,6 +852,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
  case OPT_NOPAGER:

    printf("WARNING: option deprecated; use --disable-pager instead.\n");

    opt_nopager= 1;

    break;

  case OPT_MYSQL_PROTOCOL:

  {

    if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)

client/mysqlimport.c

+25 −20
Original line number Diff line number Diff line
@@ -35,9 +35,10 @@ 




/* Global Thread counter */

int counter= 0;

int counter;

#ifdef HAVE_LIBPTHREAD

pthread_mutex_t counter_mutex;

pthread_cond_t count_threshhold;

#endif



static void db_error_with_table(MYSQL *mysql, char *table);
@@ -556,6 +557,7 @@ pthread_handler_t worker_thread(void *arg) 


  pthread_mutex_lock(&counter_mutex);

  counter--;

  pthread_cond_signal(&count_threshhold);

  pthread_mutex_unlock(&counter_mutex);

  my_thread_end();
@@ -584,28 +586,26 @@ int main(int argc, char **argv) 
  {

    pthread_t mainthread;            /* Thread descriptor */

    pthread_attr_t attr;          /* Thread attributes */

    pthread_attr_init(&attr);

    pthread_attr_setdetachstate(&attr,

                                PTHREAD_CREATE_DETACHED);



    VOID(pthread_mutex_init(&counter_mutex, NULL));

    VOID(pthread_cond_init(&count_threshhold, NULL));



    for (; *argv != NULL; argv++) /* Loop through tables */

    for (counter= 0; *argv != NULL; argv++) /* Loop through tables */

    {

      /*

        If we hit thread count limit we loop until some threads exit.

        We sleep for a second, so that we don't chew up a lot of 

        CPU in the loop.

      */

sanity_label:

      if (counter == opt_use_threads)

      pthread_mutex_lock(&counter_mutex);

      while (counter == opt_use_threads)

      {

        sleep(1);

        goto sanity_label;

        struct timespec abstime;



        set_timespec(abstime, 3);

        pthread_cond_timedwait(&count_threshhold, &counter_mutex, &abstime);

      }

      pthread_mutex_lock(&counter_mutex);

      /* Before exiting the lock we set ourselves up for the next thread */

      counter++;

      pthread_mutex_unlock(&counter_mutex);

      pthread_attr_init(&attr);

      pthread_attr_setdetachstate(&attr,

                                   PTHREAD_CREATE_DETACHED);



      /* now create the thread */

      if (pthread_create(&mainthread, &attr, worker_thread, 

                         (void *)*argv) != 0)
@@ -621,13 +621,18 @@ int main(int argc, char **argv) 
    /*

      We loop until we know that all children have cleaned up.

    */

loop_label:

    if (counter)

    pthread_mutex_lock(&counter_mutex);

    while (counter)

    {

      sleep(1);

      goto loop_label;

      struct timespec abstime;



      set_timespec(abstime, 3);

      pthread_cond_timedwait(&count_threshhold, &counter_mutex, &abstime);

    }

    pthread_mutex_unlock(&counter_mutex);

    VOID(pthread_mutex_destroy(&counter_mutex));

    VOID(pthread_cond_destroy(&count_threshhold));

    pthread_attr_destroy(&attr);

  }

  else

#endif

extra/yassl/README

+13 −3
Original line number Diff line number Diff line 
yaSSL Release notes, version 1.3.0 (04/26/06)

yaSSL Release notes, version 1.3.5 (06/01/06)





    This release of yaSSL contains bug fixes, portability enhancements,

    better libcurl support, and improved non-blocking I/O.



See normal  build instructions below under 1.0.6.

See libcurl build instructions below under 1.3.0.





********************yaSSL Release notes, version 1.3.0 (04/26/06)





    This release of yaSSL contains minor bug fixes, portability enhancements,
@@ -17,8 +27,8 @@ See normal build instructions below under 1.0.6. 
    make

    make openssl-links



    (then go to your libcurl home and tell libcurl about yaSSL)

    ./configure --with-ssl=/yaSSL-HomeDir

    (then go to your libcurl home and tell libcurl about yaSSL build dir)

    ./configure --with-ssl=/yaSSL-BuildDir LDFLAGS=-lm

    make

extra/yassl/include/openssl/engine.h

0 → 100644
+5 −0
Original line number Diff line number Diff line 
/* engine.h for libcurl */



#undef HAVE_OPENSSL_ENGINE_H