Commit 373593c7 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/my/mysql-5.1


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents fa99e347 36daa4d9

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
*.d

*.da

*.exe

*.gcda

*.gcno

*.gcov

*.idb

*.la

BUILD/compile-pentium-gcov

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 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_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM -DHAVE_MUTEX_THREAD_ONLY"

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

extra_configs="$extra_configs $max_configs"

mysql-test/r/show_check.result

+6 −0
Original line number Diff line number Diff line
@@ -623,4 +623,10 @@ delete from mysql.db where user='mysqltest_4'; 
delete from mysql.tables_priv where user='mysqltest_4';

flush privileges;

drop database mysqltest;

show full plugin;

show warnings;

Level	Code	Message

Warning	1541	The syntax 'SHOW PLUGIN' is deprecated and will be removed in MySQL 5.2. Please use 'SHOW PLUGINS' instead.

show plugin;

show plugins;

End of 5.1 tests

mysql-test/t/show_check.test

+13 −0
Original line number Diff line number Diff line
@@ -445,4 +445,17 @@ delete from mysql.tables_priv where user='mysqltest_4'; 
flush privileges;

drop database mysqltest;



#

# Ensure that show plugin code is tested

#



--disable_result_log

show full plugin;

--enable_result_log

show warnings;

--disable_result_log

show plugin;

show plugins;

--enable_result_log



--echo End of 5.1 tests

mysys/my_handler.c

+2 −1
Original line number Diff line number Diff line
@@ -548,7 +548,8 @@ HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a) 
    case HA_KEYTYPE_DOUBLE:

      a= end;

      break;

    case HA_KEYTYPE_END:

    case HA_KEYTYPE_END:                        /* purecov: inspected */

      /* keep compiler happy */

      DBUG_ASSERT(0);

      break;

    }