Commit 3d62df33 authored by unknown's avatar unknown
Browse files

Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41


sql/sql_show.cc:
  Auto merged
sql/sql_parse.cc:
  Manual merge
parents ecb637b4 3125781a

BUILD/check-cpu

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ check_cpu () { 
    fi



    # parse CPU flags

    for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //'`; do 

    for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //' -e 's/[^a-zA-Z0-9_ ]/_/g'`; do 

          eval cpu_flag_$flag=yes

    done

  else

BitKeeper/etc/collapsed

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ 
454f8960jsVT_kMKJtZ9OCgXoba0xQ

4554a95d7txO1DuO9G3nAizI3SkFAA

4554b3722d71SbPiI2Gx-RhbZjmuIQ

45ae6628gqKTsUFfnoNExadETVIkbA

Makefile.am

+26 −25
Original line number Diff line number Diff line
@@ -95,7 +95,11 @@ dist-hook: 


tags:

	support-files/build-tags

.PHONY:		init-db bin-dist



.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-ps test-ns



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

#
@@ -105,36 +109,33 @@ tags: 
# will then calculate the various port numbers it needs from this,

# making sure each user use different ports.



test:

test-ps:

	cd mysql-test ; \

	./mysql-test-run && \

	./mysql-test-run --ps-protocol

	@PERL@ ./mysql-test-run.pl $(force) --ps-protocol



test-force:

test-ns:

	cd mysql-test ; \

	./mysql-test-run --force && \

	./mysql-test-run --ps-protocol --force

	@PERL@ ./mysql-test-run.pl $(force)



test-force-mem:

	cd mysql-test; \

	./mysql-test-run --force --mem && \

	./mysql-test-run --ps-protocol --force --mem

test:	test-ns test-ps



# To ease script-writing, although in 4.1 it is identical to 'test'

test-full:	test



# We are testing a new Perl version of the test script

test-pl:

	cd mysql-test; \

	./mysql-test-run.pl && \

	./mysql-test-run.pl --ps-protocol

test-force:

	$(MAKE) force=--force test



test-force-pl:

	cd mysql-test; \

	./mysql-test-run.pl --force && \

	./mysql-test-run.pl --ps-protocol --force

test-force-full:

	$(MAKE) force=--force test-full



#used by autopush.pl to run memory based tests

test-force-pl-mem:

	cd mysql-test; \

	./mysql-test-run.pl --force --mem && \

	./mysql-test-run.pl --ps-protocol --force --mem

test-force-mem:

	$(MAKE) 'force=--force --mem' test



# Keep these for a while

test-pl:	test

test-full-pl:	test-full

test-force-pl:	test-force

test-force-pl-mem:  test-force-mem

test-force-full-pl: test-force-full

client/mysqltest.c

+14 −5
Original line number Diff line number Diff line
@@ -1240,7 +1240,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);
@@ -2968,7 +2970,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)
@@ -4678,10 +4685,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);
@@ -4733,7 +4739,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)

myisam/mi_packrec.c

+1 −2
Original line number Diff line number Diff line
@@ -590,8 +590,7 @@ static void fill_quick_table(uint16 *table, uint bits, uint max_bits, 
static uint copy_decode_table(uint16 *to_pos, uint offset,

			      uint16 *decode_table)

{

  uint prev_offset;

  prev_offset= offset;

  uint prev_offset= offset;

  DBUG_ENTER("copy_decode_table");



  /* Descent on the left side. */