Commit 6e84e11d authored by unknown's avatar unknown
Browse files

Merge siva.hindu.god:/usr/home/tim/m/bk/g51 

into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26


Makefile.am:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
configure.in:
  Auto merged
client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql.h:
  Auto merged
include/typelib.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_wincond.c:
  Auto merged
mysys/typelib.c:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
server-tools/instance-manager/instance.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/charsets/hebrew.xml:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
strings/conf_to_src.c:
  Auto merged
vio/viossl.c:
  Auto merged
sql/field.h:
  Manual merge
sql/log_event.cc:
  Manual merge
parents 4dabfa5d e87d593a

BitKeeper/etc/collapsed

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
45214442pBGT9KuZEGixBH71jTzbOA

45214a07hVsIGwvwa-WrO-jpeaSwVw

452a92d0-31-8wSzSfZi165fcGcXPA

452c6c6dAjuNghfc1ObZ_UQ5SCl85g

4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg

454a7ef8gdvE_ddMlJyghvOAkKPNOQ

454bb488ijVLOUK_GFjcoISE0GxPUA

454bb9a8AwlGRC_wWLS2sNMoRBMRGw
@@ -30,3 +32,4 @@ 
4561b2ecZbhuAc0TTDdCdultxUYaMw

4561bde4qWhz1I8tkItXKex5uniipA

4562ba016dYH0JzszOqZ8p6psbKfnQ

45771031yRCoM_ZfONdYchPvVEgLRg

Makefile.am

+9 −7
Original line number Diff line number Diff line
@@ -102,8 +102,10 @@ dist-hook: 
tags:

	support-files/build-tags



.PHONY:	init-db bin-dist test test-full test-ps test-nr \

	test-ns test-pr test-unit

.PHONY:	init-db bin-dist \

  test    test-force    test-full    test-force-full    test-force-mem \

  test-pl test-force-pl test-full-pl test-force-full-pl test-force-pl-mem \

  test-unit test-ps test-nr test-pr test-ns test-binlog-statement



# Target 'test' will run the regression test suite using the built server.

#
@@ -118,23 +120,23 @@ test-unit: 


test-ps:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=mixed

	@PERL@ ./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=mixed



test-nr:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --mysqld=--binlog-format=row

	@PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=row



test-pr:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=row

	@PERL@ ./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=row



test-ns:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --mysqld=--binlog-format=mixed

	@PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=mixed



test-binlog-statement:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement

	@PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement



test:	test-unit test-ns test-pr

client/mysqltest.c

+14 −5
Original line number Diff line number Diff line
@@ -1246,7 +1246,9 @@ void var_set(const char *var_name, const char *var_name_end, 
      v->int_dirty= 0;

      v->str_val_len= strlen(v->str_val);

    }

    strxmov(buf, v->name, "=", v->str_val, NullS);

    my_snprintf(buf, sizeof(buf), "%.*s=%.*s",

                v->name_len, v->name,

                v->str_val_len, v->str_val);

    if (!(v->env_s= my_strdup(buf, MYF(MY_WME))))

      die("Out of memory");

    putenv(v->env_s);
@@ -2974,7 +2976,12 @@ void safe_connect(MYSQL* mysql, const char *name, const char *host, 
    if ((mysql_errno(mysql) == CR_CONN_HOST_ERROR ||

         mysql_errno(mysql) == CR_CONNECTION_ERROR) &&

        failed_attempts < opt_max_connect_retries)

    {

      verbose_msg("Connect attempt %d/%d failed: %d: %s", failed_attempts,

                  opt_max_connect_retries, mysql_errno(mysql),

                  mysql_error(mysql));

      my_sleep(connection_retry_sleep);

    }

    else

    {

      if (failed_attempts > 0)
@@ -4691,10 +4698,9 @@ void run_query_normal(struct st_connection *cn, struct st_command *command, 
    }



    /*

      Store the result. If res is NULL, use mysql_field_count to

      determine if that was expected

      Store the result of the query if it will return any fields

    */

    if (!(res= mysql_store_result(mysql)) && mysql_field_count(mysql))

    if (mysql_field_count(mysql) && ((res= mysql_store_result(mysql)) == 0))

    {

      handle_error(command, mysql_errno(mysql), mysql_error(mysql),

		   mysql_sqlstate(mysql), ds);
@@ -4746,7 +4752,10 @@ void run_query_normal(struct st_connection *cn, struct st_command *command, 
    }



    if (res)

    {

      mysql_free_result(res);

      res= 0;

    }

    counter++;

  } while (!(err= mysql_next_result(mysql)));

  if (err > 0)

extra/yassl/src/ssl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ int read_file(SSL_CTX* ctx, const char* file, int format, CertType type) 
                EVP_BytesToKey(info.name, "MD5", info.iv, (byte*)password,

                               passwordSz, 1, key, iv);



                STL::auto_ptr<BulkCipher> cipher;

                mySTL::auto_ptr<BulkCipher> cipher;

                if (strncmp(info.name, "DES-CBC", 7) == 0)

                    cipher.reset(NEW_YS DES);

                else if (strncmp(info.name, "DES-EDE3-CBC", 13) == 0)
@@ -138,7 +138,7 @@ int read_file(SSL_CTX* ctx, const char* file, int format, CertType type) 
                    return SSL_BAD_FILE;

                }

                cipher->set_decryptKey(key, info.iv);

                STL::auto_ptr<x509> newx(NEW_YS x509(x->get_length()));   

                mySTL::auto_ptr<x509> newx(NEW_YS x509(x->get_length()));   

                cipher->decrypt(newx->use_buffer(), x->get_buffer(),

                                x->get_length());

                ysDelete(x);

include/config-win.h

+0 −1
Original line number Diff line number Diff line
@@ -248,7 +248,6 @@ inline double ulonglong2double(ulonglong value) 
#define tell(A) _telli64(A)

#endif



#define set_timespec(ABSTIME,SEC) { (ABSTIME).tv_sec=time((time_t*)0) + (time_t) (SEC); (ABSTIME).tv_nsec=0; }



#define STACK_DIRECTION -1