Commit ff27c085 authored by unknown's avatar unknown
Browse files

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

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


sql/mysql_priv.h:
  Auto merged
parents cdf0bfbc a5d82874

BitKeeper/etc/collapsed

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ 
44ec850ac2k4y2Omgr92GiWPBAVKGQ

44edb86b1iE5knJ97MbliK_3lCiAXA

44f33f3aj5KW5qweQeekY1LU0E9ZCg

4513d8e4Af4dQWuk13sArwofRgFDQw

Makefile.am

+7 −3
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ 
SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \

			@readline_topdir@ sql-common \

			@thread_dirs@ pstack \

			@sql_union_dirs@ storage plugin \

			@sql_union_dirs@ unittest storage plugin \

			@sql_server@ scripts @man_dirs@ tests \

			netware @libmysqld_dirs@ \

			mysql-test support-files @tools_dirs@ \

			unittest win

			win



DIST_SUBDIRS =		$(SUBDIRS) BUILD
@@ -114,7 +114,7 @@ test-unit: 


test-ps:

	cd mysql-test ; \

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

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



test-nr:

	cd mysql-test ; \
@@ -125,6 +125,10 @@ test-pr: 
	./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



test-binlog-statement:

	cd mysql-test ; \

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

client/mysqldump.c

+53 −45
Original line number Diff line number Diff line
@@ -3594,6 +3594,8 @@ static char *primary_key_fields(const char *table_name) 
  char show_keys_buff[15 + NAME_LEN * 2 + 3];

  uint result_length= 0;

  char *result= 0;

  char buff[NAME_LEN * 2 + 3];

  char *quoted_field;



  my_snprintf(show_keys_buff, sizeof(show_keys_buff),

              "SHOW KEYS FROM %s", table_name);
@@ -3617,8 +3619,10 @@ static char *primary_key_fields(const char *table_name) 
  {

    /* Key is unique */

    do

      result_length += strlen(row[4]) + 1;      /* + 1 for ',' or \0 */

    while ((row = mysql_fetch_row(res)) && atoi(row[3]) > 1);

    {

      quoted_field= quote_name(row[4], buff, 0);

      result_length+= strlen(quoted_field) + 1; /* + 1 for ',' or \0 */

    } while ((row= mysql_fetch_row(res)) && atoi(row[3]) > 1);

  }



  /* Build the ORDER BY clause result */
@@ -3634,9 +3638,13 @@ static char *primary_key_fields(const char *table_name) 
    }

    mysql_data_seek(res, 0);

    row= mysql_fetch_row(res);

    end = strmov(result, row[4]);

    quoted_field= quote_name(row[4], buff, 0);

    end= strmov(result, quoted_field);

    while ((row= mysql_fetch_row(res)) && atoi(row[3]) > 1)

      end = strxmov(end, ",", row[4], NullS);

    {

      quoted_field= quote_name(row[4], buff, 0);

      end= strxmov(end, ",", quoted_field, NullS);

    }

  }



cleanup:

config/ac-macros/plugins.m4

+10 −2
Original line number Diff line number Diff line
@@ -280,6 +280,8 @@ AC_DEFUN([MYSQL_CONFIGURE_PLUGINS],[ 
    _MYSQL_EMIT_PLUGIN_ACTIONS(m4_bpatsubst(__mysql_plugin_list__, :, [,]))

    AC_SUBST([mysql_se_dirs])

    AC_SUBST([mysql_pg_dirs])

    AC_SUBST([mysql_se_unittest_dirs])

    AC_SUBST([mysql_pg_unittest_dirs])

   ])

 ])

])
@@ -410,9 +412,15 @@ dnl Although this is "pretty", it breaks libmysqld build 
          [AC_CONFIG_FILES($6/Makefile)]

        )

        ifelse(m4_substr($6, 0, 8), [storage/],

          [mysql_se_dirs="$mysql_se_dirs ]m4_substr($6, 8)",

          [

            [mysql_se_dirs="$mysql_se_dirs ]m4_substr($6, 8)"

             mysql_se_unittest_dirs="$mysql_se_unittest_dirs ../$6"

          ],

          m4_substr($6, 0, 7), [plugin/],

          [mysql_pg_dirs="$mysql_pg_dirs ]m4_substr($6, 7)",

          [

            [mysql_pg_dirs="$mysql_pg_dirs ]m4_substr($6, 7)"

             mysql_pg_unittest_dirs="$mysql_pg_unittest_dirs ../$6"

          ],

          [AC_FATAL([don't know how to handle plugin dir ]$6)])

      fi

    ])

mysql-test/extra/binlog_tests/binlog.test

+1 −21
Original line number Diff line number Diff line
@@ -59,24 +59,4 @@ insert into t1 values(null); 
select * from t1;

drop table t1;



# Test of binlogging of INSERT_ID with INSERT DELAYED

create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;

# First, avoid BUG#20627:

set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;

# Verify that only one INSERT_ID event is binlogged.

insert delayed into t1 values (207);



# We use sleeps between statements, that's the only way to get a

# repeatable binlog in a normal test run and under Valgrind.

# It may be that the "binlog missing rows" of BUG#20821 shows up

# here.

sleep 2;

insert delayed into t1 values (null);

sleep 2;

insert delayed into t1 values (300);

sleep 2; # time for the delayed queries to reach disk

select * from t1;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events from 102;

drop table t1;
 
-- source extra/binlog_tests/binlog_insert_delayed.test