Commit 2380913d authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents bc178429 a04d9fa9

BUILD/compile-pentium-gcov

+13 −2
Original line number Diff line number Diff line
@@ -3,8 +3,19 @@ 
path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium_cflags  -fprofile-arcs -ftest-coverage"

# Need to disable ccache, or we loose the gcov-needed compiler output files.

CCACHE_DISABLE=1

export CCACHE_DISABLE



# GCC4 needs -fprofile-arcs -ftest-coverage on the linker command line (as well

# as on the compiler command line), and this requires setting LDFLAGS for BDB.

export LDFLAGS="-fprofile-arcs -ftest-coverage"



# The  -fprofile-arcs and -ftest-coverage options cause GCC to instrument the

# code with profiling information used by gcov.

# the -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.

extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM"

extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"

extra_configs="$extra_configs  --with-innodb --with-berkeley-db"

extra_configs="$extra_configs $max_configs"



. "$path/FINISH.sh"

config/ac-macros/ssl.m4

+12 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [ 
    extra/yassl/src/Makefile dnl

    extra/yassl/testsuite/Makefile)



  with_yassl="yes"

  with_bundled_yassl="yes"



  yassl_dir="yassl"

  AC_SUBST([yassl_dir])
@@ -174,6 +174,16 @@ AC_MSG_CHECKING(for SSL) 
              [mysql_ssl_dir="$withval"],

              [mysql_ssl_dir=no])



  if test "$with_yassl"

  then

    AC_MSG_ERROR([The flag --with-yassl is deprecated, use --with-ssl])

  fi



  if test "$with_openssl"

  then

    AC_MSG_ERROR([The flag --with-openssl is deprecated, use --with-ssl])

  fi



  case "$mysql_ssl_dir" in

    "no")

      #
@@ -196,5 +206,5 @@ AC_MSG_CHECKING(for SSL) 
      MYSQL_FIND_OPENSSL([$mysql_ssl_dir])

      ;;

  esac

  AM_CONDITIONAL([HAVE_YASSL], [ test "$with_yassl" = "yes" ])

  AM_CONDITIONAL([HAVE_YASSL], [ test "$with_bundled_yassl" = "yes" ])

])

include/heap.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ struct st_heap_info; /* For referense */ 


typedef struct st_hp_keydef		/* Key definition with open */

{

  uint flag;				/* HA_NOSAME | HA_NULL_PART_KEY */

  uint flag;				/* HA_NOSAME | HA_NULL_PART_KEY */

  uint keysegs;				/* Number of key-segment */

  uint length;				/* Length of key (automatic) */

  uint8 algorithm;			/* HASH / BTREE */

mysql-test/r/contributors.result

0 → 100644
+5 −0
Original line number Diff line number Diff line 
SHOW CONTRIBUTORS;

Name	Location	Comment

Ronald Bradford	Brisbane, Australia	EFF contribution for UC2006 Auction

Sheeri Kritzer	Boston, Mass. USA	EFF contribution for UC2006 Auction

Mark Shuttleworth	London, UK.	EFF contribution for UC2006 Auction

mysql-test/r/events_logs_tests.result

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ SET GLOBAL event_scheduler=1; 
"Should see 3 rows - the 'SELect' is in the middle. The other two are selects from general_log"

call select_general_log();

user_host	argument

root[root] @ localhost [localhost]	SELect 'alabala', sleep(3) from dual

USER_HOST	SELect 'alabala', sleep(3) from dual

DROP PROCEDURE select_general_log;

DROP EVENT log_general;

SET GLOBAL event_scheduler=2;
@@ -43,7 +43,7 @@ SLEEP(2) 
0

SELECT user_host, query_time, db, sql_text FROM mysql.slow_log;

user_host	query_time	db	sql_text

root[root] @ localhost []	SLEEPVAL	events_test	SELECT SLEEP(2)

USER_HOST	SLEEPVAL	events_test	SELECT SLEEP(2)

TRUNCATE mysql.slow_log;

CREATE TABLE slow_event_test (slo_val tinyint, val tinyint);

"This won't go to the slow log"
@@ -76,7 +76,7 @@ slo_val val 
"Check slow log. Should see 1 row because 4 is over the threshold of 3 for GLOBAL, though under SESSION which is 10"

SELECT user_host, query_time, db, sql_text FROM mysql.slow_log;

user_host	query_time	db	sql_text

root[root] @ localhost [localhost]	SLEEPVAL	events_test	INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(2)

USER_HOST	SLEEPVAL	events_test	INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(2)

DROP EVENT long_event2;

SET GLOBAL  long_query_time =@old_global_long_query_time;

SET SESSION long_query_time =@old_session_long_query_time;