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

BUILD/compile-pentium-gcov

@@ -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

@@ -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

@@ -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

+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

@@ -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;

mysql-test/r/heap.result

@@ -718,3 +718,16 @@ Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	I
 t1	MEMORY	10	Fixed	0	11	0	#	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
 t2	MEMORY	10	Fixed	0	12	0	#	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
 drop table t1, t2;
+CREATE TABLE t1(a VARCHAR(1), b VARCHAR(2), c VARCHAR(256),
+KEY(a), KEY(b), KEY(c)) ENGINE=MEMORY;
+INSERT INTO t1 VALUES('a','aa',REPEAT('a', 256)),('a','aa',REPEAT('a',256));
+SELECT COUNT(*) FROM t1 WHERE a='a';
+COUNT(*)
+2
+SELECT COUNT(*) FROM t1 WHERE b='aa';
+COUNT(*)
+2
+SELECT COUNT(*) FROM t1 WHERE c=REPEAT('a',256);
+COUNT(*)
+2
+DROP TABLE t1;

mysql-test/r/log_tables.result

@@ -2,14 +2,14 @@ use mysql;
 truncate table general_log;
 select * from general_log;
 event_time	user_host	thread_id	server_id	command_type	argument
-TIMESTAMP	root[root] @ localhost []	THREAD_ID	1	Query	select * from general_log
+TIMESTAMP	USER_HOST	THREAD_ID	1	Query	select * from general_log
 truncate table slow_log;
 select * from slow_log;
 start_time	user_host	query_time	lock_time	rows_sent	rows_examined	db	last_insert_id	insert_id	server_id	sql_text
 truncate table general_log;
 select * from general_log where argument like '%general_log%';
 event_time	user_host	thread_id	server_id	command_type	argument
-TIMESTAMP	root[root] @ localhost []	THREAD_ID	1	Query	select * from general_log where argument like '%general_log%'
+TIMESTAMP	USER_HOST	THREAD_ID	1	Query	select * from general_log where argument like '%general_log%'
 create table join_test (verbose_comment varchar (80), command_type varchar(64));
 insert into join_test values ("User performed a usual SQL query", "Query");
 insert into join_test values ("New DB connection was registered", "Connect");
@@ -18,12 +18,12 @@ select verbose_comment, user_host, argument
 from  mysql.general_log join join_test
 on (mysql.general_log.command_type = join_test.command_type);
 verbose_comment	user_host	argument
-User performed a usual SQL query	root[root] @ localhost []	select * from general_log where argument like '%general_log%'
-User performed a usual SQL query	root[root] @ localhost []	create table join_test (verbose_comment varchar (80), command_type varchar(64))
-User performed a usual SQL query	root[root] @ localhost []	insert into join_test values ("User performed a usual SQL query", "Query")
-User performed a usual SQL query	root[root] @ localhost []	insert into join_test values ("New DB connection was registered", "Connect")
-User performed a usual SQL query	root[root] @ localhost []	insert into join_test values ("Get the table info", "Field List")
-User performed a usual SQL query	root[root] @ localhost []	select verbose_comment, user_host, argument
+User performed a usual SQL query	USER_HOST	select * from general_log where argument like '%general_log%'
+User performed a usual SQL query	USER_HOST	create table join_test (verbose_comment varchar (80), command_type varchar(64))
+User performed a usual SQL query	USER_HOST	insert into join_test values ("User performed a usual SQL query", "Query")
+User performed a usual SQL query	USER_HOST	insert into join_test values ("New DB connection was registered", "Connect")
+User performed a usual SQL query	USER_HOST	insert into join_test values ("Get the table info", "Field List")
+User performed a usual SQL query	USER_HOST	select verbose_comment, user_host, argument
 from  mysql.general_log join join_test
 on (mysql.general_log.command_type = join_test.command_type)
 drop table join_test;
@@ -59,10 +59,10 @@ create table bug16905 (s char(15) character set utf8 default 'пусто');
 insert into bug16905 values ('новое');
 select * from mysql.general_log;
 event_time	user_host	thread_id	server_id	command_type	argument
-TIMESTAMP	root[root] @ localhost []	THREAD_ID	1	Query	set names utf8
-TIMESTAMP	root[root] @ localhost []	THREAD_ID	1	Query	create table bug16905 (s char(15) character set utf8 default 'пусто')
-TIMESTAMP	root[root] @ localhost []	THREAD_ID	1	Query	insert into bug16905 values ('новое')
-TIMESTAMP	root[root] @ localhost []	THREAD_ID	1	Query	select * from mysql.general_log
+TIMESTAMP	USER_HOST	THREAD_ID	1	Query	set names utf8
+TIMESTAMP	USER_HOST	THREAD_ID	1	Query	create table bug16905 (s char(15) character set utf8 default 'пусто')
+TIMESTAMP	USER_HOST	THREAD_ID	1	Query	insert into bug16905 values ('новое')
+TIMESTAMP	USER_HOST	THREAD_ID	1	Query	select * from mysql.general_log
 drop table bug16905;
 truncate table mysql.slow_log;
 set session long_query_time=1;
@@ -71,4 +71,4 @@ sleep(2)
 0
 select * from mysql.slow_log;
 start_time	user_host	query_time	lock_time	rows_sent	rows_examined	db	last_insert_id	insert_id	server_id	sql_text
-TIMESTAMP,	root[root] @ localhost []	USER_HOST,	QUERY_TIME	1	0	test	0	0	1	select sleep(2)
+TIMESTAMP	USER_HOST	QUERY_TIME	00:00:00	1	0	test	0	0	1	select sleep(2)

mysql-test/t/contributors.test

+SHOW CONTRIBUTORS;

mysql-test/t/events_logs_tests.test

@@ -14,11 +14,13 @@ SET GLOBAL event_scheduler=2;
 create event log_general on schedule every 1 minute do SELect 'alabala', sleep(3) from dual;
 TRUNCATE mysql.general_log;
 --echo "1 row, the current statement!"
+--replace_column 1 USER_HOST
 call select_general_log();
 SET GLOBAL event_scheduler=1;
 --echo "Wait the scheduler to start"
 --echo "Should see 3 rows - the 'SELect' is in the middle. The other two are selects from general_log"
 --sleep 2
+--replace_column 1 USER_HOST
 call select_general_log();
 DROP PROCEDURE select_general_log;
 DROP EVENT log_general;
@@ -50,13 +52,14 @@ SET @old_session_long_query_time:=@@long_query_time;
 SHOW VARIABLES LIKE 'log_slow_queries';
 DROP FUNCTION get_value;
 TRUNCATE mysql.slow_log;
+--replace_column 1 USER_HOST
 SELECT user_host, query_time, db, sql_text FROM mysql.slow_log;
 --echo "Set new values"
 SET GLOBAL long_query_time=4;
 SET SESSION long_query_time=1;
 --echo "Check that logging is working"
 SELECT SLEEP(2);
---replace_regex /00:00:0[2-4]/SLEEPVAL/
+--replace_column 1 USER_HOST 2 SLEEPVAL
 SELECT user_host, query_time, db, sql_text FROM mysql.slow_log;
 TRUNCATE mysql.slow_log;
 CREATE TABLE slow_event_test (slo_val tinyint, val tinyint);
@@ -81,7 +84,7 @@ CREATE EVENT long_event2 ON SCHEDULE EVERY 1 MINUTE DO INSERT INTO slow_event_te
 --echo "Check our table. Should see 2 rows"
 SELECT * FROM slow_event_test;
 --echo "Check slow log. Should see 1 row because 4 is over the threshold of 3 for GLOBAL, though under SESSION which is 10"
---replace_regex /00:00:0[2-4]/SLEEPVAL/
+--replace_column 1 USER_HOST 2 SLEEPVAL
 SELECT user_host, query_time, db, sql_text FROM mysql.slow_log;
 DROP EVENT long_event2;
 SET GLOBAL  long_query_time =@old_global_long_query_time;

mysql-test/t/heap.test

@@ -458,4 +458,16 @@ create table t2 (c varchar(10)) engine=memory;
 show table status like 't_';
 drop table t1, t2;
 
+#
+# BUG#18233 - Memory tables INDEX USING HASH (a,b) returns 1 row on
+#             SELECT WHERE a= AND b=
+#
+CREATE TABLE t1(a VARCHAR(1), b VARCHAR(2), c VARCHAR(256),
+                KEY(a), KEY(b), KEY(c)) ENGINE=MEMORY;
+INSERT INTO t1 VALUES('a','aa',REPEAT('a', 256)),('a','aa',REPEAT('a',256));
+SELECT COUNT(*) FROM t1 WHERE a='a';
+SELECT COUNT(*) FROM t1 WHERE b='aa';
+SELECT COUNT(*) FROM t1 WHERE c=REPEAT('a',256);
+DROP TABLE t1;
+
 # End of 5.0 tests

mysql-test/t/log_tables.test

@@ -16,10 +16,10 @@ use mysql;
 #
 
 truncate table general_log;
---replace_column 1 TIMESTAMP 3 THREAD_ID
+--replace_column 1 TIMESTAMP 2 USER_HOST 3 THREAD_ID
 select * from general_log;
 truncate table slow_log;
---replace_column 1 TIMESTAMP
+--replace_column 1 TIMESTAMP 2 USER_HOST
 select * from slow_log;
 
 #
@@ -31,7 +31,7 @@ select * from slow_log;
 #
 
 truncate table general_log;
---replace_column 1 TIMESTAMP 3 THREAD_ID
+--replace_column 1 TIMESTAMP 2 USER_HOST 3 THREAD_ID
 select * from general_log where argument like '%general_log%';
 
 
@@ -47,6 +47,7 @@ insert into join_test values ("User performed a usual SQL query", "Query");
 insert into join_test values ("New DB connection was registered", "Connect");
 insert into join_test values ("Get the table info", "Field List");
 
+--replace_column 2 USER_HOST
 select verbose_comment, user_host, argument
   from  mysql.general_log join join_test
     on (mysql.general_log.command_type = join_test.command_type);
@@ -156,7 +157,7 @@ truncate table mysql.general_log;
 set names utf8;
 create table bug16905 (s char(15) character set utf8 default 'пусто');
 insert into bug16905 values ('новое');
---replace_column 1 TIMESTAMP 3 THREAD_ID
+--replace_column 1 TIMESTAMP 2 USER_HOST 3 THREAD_ID
 select * from mysql.general_log;
 drop table bug16905;
 
@@ -167,7 +168,7 @@ drop table bug16905;
 truncate table mysql.slow_log;
 set session long_query_time=1;
 select sleep(2);
---replace_column 1 TIMESTAMP, 3 USER_HOST, 4 QUERY_TIME
+--replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME
 select * from mysql.slow_log;
 
 # kill all connections

mysys/my_getopt.c

@@ -486,7 +486,7 @@ invalid value '%s'\n",
       }
       get_one_option(optp->id, optp, argument);
 
-      (*argc)--; /* option handled (shortorlong), decrease argument count */
+      (*argc)--; /* option handled (short or long), decrease argument count */
     }
     else /* non-option found */
       (*argv)[argvpos++]= cur_arg;

plugin/fulltext/Makefile.am

@@ -6,4 +6,4 @@ noinst_LTLIBRARIES= mypluglib.la
 #pkglib_LTLIBRARIES= mypluglib.la
 mypluglib_la_SOURCES= plugin_example.c
 mypluglib_la_LDFLAGS= -module -rpath $(pkglibdir)
-
+mypluglib_la_CFLAGS= -DMYSQL_DYNAMIC_PLUGIN

scripts/Makefile.am

@@ -30,7 +30,6 @@ bin_SCRIPTS =		@server_scripts@ \
 			mysql_find_rows \
 			mysqlhotcopy \
 			mysqldumpslow \
-			mysql_explain_log \
 			mysqld_multi \
 			mysql_create_system_tables
 
@@ -55,7 +54,6 @@ EXTRA_SCRIPTS =		make_binary_distribution.sh \
 			mysql_find_rows.sh \
 			mysqlhotcopy.sh \
 			mysqldumpslow.sh \
-			mysql_explain_log.sh \
 			mysqld_multi.sh \
 			mysqld_safe.sh \
 			mysql_create_system_tables.sh
@@ -83,7 +81,6 @@ CLEANFILES =		@server_scripts@ \
 			mysql_find_rows \
 			mysqlhotcopy \
 			mysqldumpslow \
-			mysql_explain_log \
 			mysql_tableinfo \
 			mysqld_multi \
 			make_win_src_distribution \

scripts/make_binary_distribution.sh

@@ -148,7 +148,7 @@ BIN_FILES="extra/comp_err$BS extra/replace$BS extra/perror$BS \
 if [ $BASE_SYSTEM = "netware" ] ; then
   BIN_FILES="$BIN_FILES \
     netware/mysqld_safe$BS netware/mysql_install_db$BS \
-    netware/init_db.sql netware/test_db.sql netware/mysql_explain_log$BS \
+    netware/init_db.sql netware/test_db.sql$BS \
     netware/mysqlhotcopy$BS netware/libmysql$BS netware/init_secure_db.sql \
     ";
 # For all other platforms:

scripts/mysql_explain_log.sh

-#!@PERL@ -w
-use strict;
-use DBI;
-
-use Getopt::Long;
-$Getopt::Long::ignorecase=0;
-
-print "explain_log	provided by http://www.mobile.de\n";
-print "===========	================================\n";
-
-my $Param={};
-
-$Param->{host}='';
-$Param->{user}='';
-$Param->{password}='';
-$Param->{PrintError}=0;
-$Param->{socket}='';
-
-if (!GetOptions ('date|d:i' => \$Param->{ViewDate},
-		 'host|h:s' => \$Param->{host},
-		 'user|u:s' => \$Param->{user},
-		 'password|p:s' => \$Param->{password},
-		 'printerror|e:s' => \$Param->{PrintError},
-		 'socket|s:s' => \$Param->{socket},
-		)) {
-  ShowOptions();
-}
-else {
-  $Param->{UpdateCount} = 0;
-  $Param->{SelectCount} = 0;
-  $Param->{IdxUseCount} = 0;
-  $Param->{LineCount} = 0;
-
-  $Param->{Init} = 0;
-  $Param->{Field} = 0;
-  $Param->{Refresh} = 0;
-  $Param->{QueryCount} = 0;
-  $Param->{Statistics} =0;
-
-  $Param->{Query} = undef;
-  $Param->{ALL} = undef ;
-  $Param->{Comment} = undef ;
-
-  @{$Param->{Rows}} = (qw|possible_keys key type|);
-
-  if ($Param->{ViewDate}) {
-    $Param->{View} = 0;
-  }
-  else {
-    $Param->{View} = 1;
-  }
-
-  #print "Date=$Param->{ViewDate}, host=$Param->{host}, user=$Param->{user}, password=$Param->{password}\n";
-
-  $Param->{dbh}=DBI->connect("DBI:mysql:host=$Param->{host}".($Param->{socket}?";mysql_socket=$Param->{socket}":""),$Param->{user},$Param->{password},{PrintError=>0});
-  if (DBI::err()) {
-    print "Error: " . DBI::errstr() . "\n";
-  }
-  else {
-    $Param->{Start} = time;
-    while(<STDIN>) {
-      $Param->{LineCount} ++ ;
-
-      if ($Param->{ViewDate} ) {
-	if (m/^(\d{6})\s+\d{1,2}:\d\d:\d\d\s.*$/) { # get date
-	  #print "# $1 #\n";
-	  if ($1 == $Param->{ViewDate}) {
-	    $Param->{View} = 1;
-	  }
-	  else {
-	    $Param->{View} = 0;
-	  }
-	}
-      }
-      if ($Param->{View} ) {
-	#print "->>>$_";
-
-	if (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Connect.+\s+on\s+(.*)$/i) { # get connection ID($2) and database($3)
-	  #print "C-$1--$2--$3------\n";
-	  RunQuery($Param);
-	  if (defined $3) {
-	    $Param->{CID}->{$2} = $3 ;
-	    #print "DB:$Param->{CID}->{$2} .. $2 .. $3 \n";
-	  }
-	}
-
-	elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Connect.+$/i) { # get connection ID($2) and database($3)
-	  #print "\n <<<<<<<<<<<<<<<<<<----------------------------<<<<<<<<<<<<<<<< \n";
-	  #print "Connect \n";
-	  RunQuery($Param);
-	}
-	elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Change user .*\s+on\s+(.*)$/i) { # get connection ID($2) and database($3)
-	  #print "C-$1--$2--$3------\n";
-	  RunQuery($Param);
-	  if (defined $3) {
-	    $Param->{CID}->{$2} = $3 ;
-	    #print "DB:$Param->{CID}->{$2} .. $2 .. $3 \n";
-	  }
-	}
-
-	elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Quit\s+$/i) { # remove connection ID($2) and querystring
-	  #print "Q-$1--$2--------\n";
-	  RunQuery($Param);
-	  delete $Param->{CID}->{$2} ;
-	}
-
-	elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Query\s+(select.+)$/i) { # get connection ID($2) and querystring
-	  #print "S1-$1--$2--$3------\n";
-	  RunQuery($Param);
-	  unless ($Param->{CID}->{$2}) {
-	    #print "Error: No Database for Handle: $2 found\n";
-	  }
-	  else {
-	    $Param->{DB}=$Param->{CID}->{$2};
-
-	    my $s = "$3";
-	    $s =~ s/from\s/from $Param->{DB}./i;
-	    $Param->{Query}="EXPLAIN $s";
-
-	    #$s =~ m/from\s+(\w+[.]\w+)/i;
-	    #$Param->{tab} =$1;
-	    #print "-- $Param->{tab} -- $s --\n";
-	  }
-	}
-
-	elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Query\s+(update.+)$/i) { # get connection ID($2) and querystring
-	  #print "S2--$1--$2--$3------\n";
-	  RunQuery($Param);
-	  unless ($Param->{CID}->{$2}) {
-	    #print "Error: No Database for Handle: $2 found\n";
-	  }
-	  else {
-	    $Param->{DB}=$Param->{CID}->{$2};
-
-	    my $ud = $3;
-	    $ud =~ m/^update\s+(\w+).+(where.+)$/i;
-	    $Param->{Query} ="EXPLAIN SELECT * FROM $1 $2";
-	    $Param->{Query} =~ s/from\s/from $Param->{DB}./i;
-
-	    #$Param->{Query} =~ m/from\s+(\w+[.]\w+)/i;
-	    #$Param->{tab} =$1;
-	  }
-	}
-
-	elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Statistics\s+(.*)$/i) { # get connection ID($2) and info?
-	  $Param->{Statistics} ++;
-	  #print "Statistics--$1--$2--$3------\n";
-	  RunQuery($Param);
-	}
-	elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Query\s+(.+)$/i) { # get connection ID($2)
-	  $Param->{QueryCount} ++;
-	  #print "Query-NULL $3\n";
-	  RunQuery($Param);
-	}
-	elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Refresh\s+(.+)$/i) { # get connection ID($2)
-	  $Param->{Refresh} ++;
-	  #print "Refresh\n";
-	  RunQuery($Param);
-	}
-	elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Init\s+(.+)$/i) { # get connection ID($2)
-	  $Param->{Init} ++;
-	  #print "Init $3\n";
-	  RunQuery($Param);
-	}
-	elsif (m/^(\d{6}\s+\d{1,2}:\d\d:\d\d\s+|\s+)(\d+)\s+Field\s+(.+)$/i) { # get connection ID($2)
-	  $Param->{Field} ++;
-	  #print "Field $3\n";
-	  RunQuery($Param);
-	}
-
-	elsif (m/^\s+(.+)$/ ) { # command could be some lines ...
-	  #print "multi-lined ($1)\n";
-	  my ($A)=$1;
- 	  chomp $A;
-	  $Param->{Query} .= " $1";
-	  #print "multi-lined ($1)<<$Param->{Query}>>\n";
-	}
-
-
-      }
-
-    }
-
-    $Param->{dbh}->disconnect();
-
-    if (1 == 0) {
-      print "\nunclosed handles----------------------------------------\n";
-      my $count=0;
-      foreach (sort keys %{$Param->{CID}}) {
-	print "$count | $_ : $Param->{CID}->{$_} \n";
-	$count ++;
-      }
-    }
-
-    print "\nIndex usage ------------------------------------\n";
-    foreach my $t (sort keys %{$Param->{Data}}) {
-      print "\nTable\t$t: ---\n";
-      foreach my $k (sort keys %{$Param->{Data}->{$t}}) {
-	print " count\t$k:\n";
-	my %h = %{$Param->{Data}->{$t}->{$k}};
-	  foreach (sort {$h{$a} <=> $h{$b}} keys %h) {
-	  print "  $Param->{Data}->{$t}->{$k}->{$_}\t$_\n";
-	}
-      }
-    }
-
-    $Param->{AllCount}=0;
-    print "\nQueries causing table scans -------------------\n\n";
-    foreach (@{$Param->{ALL}}) {
-      $Param->{AllCount} ++;
-      print "$_\n";
-    }
-    print "Sum: $Param->{AllCount} table scans\n";
-
-    print "\nSummary ---------------------------------------\n\n";
-    print "Select: \t$Param->{SelectCount} queries\n";
-    print "Update: \t$Param->{UpdateCount} queries\n";
-    print "\n";
-
-    print "Init:   \t$Param->{Init} times\n";
-    print "Field:  \t$Param->{Field} times\n";
-    print "Refresh: \t$Param->{Refresh} times\n";
-    print "Query:  \t$Param->{QueryCount} times\n";
-    print "Statistics:\t$Param->{Statistics} times\n";
-    print "\n";
-
-    print "Logfile: \t$Param->{LineCount} lines\n";
-    print "Started:  \t".localtime($Param->{Start})."\n";
-    print "Finished:   \t".localtime(time)."\n";
-
-  }
-}
-
-
-###########################################################################
-#
-#
-#
-sub RunQuery {
-  my $Param = shift ;
-
-  if (defined $Param->{Query}) {
-    if (defined $Param->{DB} ) {
-
-      $Param->{Query} =~ m/from\s+(\w+[.]\w+|\w+)/i;
-      $Param->{tab} =$1;
-      #print "||$Param->{tab} -- $Param->{Query}\n";
-
-      my $sth=$Param->{dbh}->prepare("USE $Param->{DB}");
-      if (DBI::err()) {
-	if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";}
-      }
-      else {
-	$sth->execute();
-	if (DBI::err()) {
-	  if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";}
-	}
-	else {
-	  $sth->finish();
-
-	  $sth=$Param->{dbh}->prepare($Param->{Query});
-	  if (DBI::err()) {
-	    if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";}
-	  }
-	  else {
-	    #print "$Param->{Query}\n";
-	    $sth->execute();
-	    if (DBI::err()) {
-	      if ($Param->{PrintError}) {print "[$Param->{LineCount}]<<$Param->{Query}>>\n";}
-	      if ($Param->{PrintError}) {print "Error: ".DBI::errstr()."\n";}
-	    }
-	    else {
-	      my $row = undef;
-	      while ($row = $sth->fetchrow_hashref()) {
-		$Param->{SelectCount} ++;
-
-		if (defined $row->{Comment}) {
-		  push (@{$Param->{Comment}}, "$row->{Comment}; $_; $Param->{DB}; $Param->{Query}");
-		}
-		foreach (@{$Param->{Rows}}) {
-		  if (defined $row->{$_}) {
-		    #if (($_ eq 'type' ) and ($row->{$_} eq 'ALL')) {
-		    if ($row->{type} eq 'ALL') {
-		      push (@{$Param->{ALL}}, "$Param->{Query}");
-		      #print ">> $row->{$_} $_ $Param->{DB} $Param->{Query}\n";
-		    }
-		    $Param->{IdxUseCount} ++;
-		    $Param->{Data}->{$Param->{tab}}->{$_}->{$row->{$_}} ++;
-		  }
-		}
-	      }
-	    }
-	  }
-	}
-      }
-      $sth->finish();
-    }
-    $Param->{Query} = undef ;
-  }
-}
-
-###########################################################################
-#
-#
-#
-sub ShowOptions {
-  print <<EOF;
-Usage: $0 [OPTIONS] < LOGFILE
-
---date=YYMMDD       select only entrys of date
--d=YYMMDD
---host=HOSTNAME     db-host to ask
--h=HOSTNAME
---user=USERNAME     db-user
--u=USERNAME
---password=PASSWORD password of db-user
--p=PASSWORD
---socket=SOCKET     mysqld socket file to connect
--s=SOCKET
-
-Read logfile from STDIN an try to EXPLAIN all SELECT statements. All UPDATE statements are rewritten to an EXPLAIN SELECT statement. The results of the EXPLAIN statement are collected and counted. All results with type=ALL are collected in an separete list. Results are printed to STDOUT.
-
-EOF
-}
-
-1;
-
-__END__
-
-=pod
-
-=head1 NAME
-
-explain_log.pl
-
-Feed a mysqld general logfile (created with mysqld --log) back into mysql
-and collect statistics about index usage with EXPLAIN.
-
-=head1 DISCUSSION
-
-To optimize your indices, you have to know which ones are actually
-used and what kind of queries are causing table scans. Especially
-if you are generating your queries dynamically and you have a huge
-amount of queries going on, this isn't easy.
-
-Use this tool to take a look at the effects of your real life queries.
-Then add indices to avoid table scans and remove those which aren't used.
-
-=head1 USAGE
-
-explain_log.pl [--date=YYMMDD] --host=dbhost] [--user=dbuser] [--password=dbpw] [--socket=/path/to/socket] < logfile
-
---date=YYMMDD       select only entrys of date
-
--d=YYMMDD
-
---host=HOSTNAME     db-host to ask
-
--h=HOSTNAME
-
---user=USERNAME     db-user
-
--u=USERNAME
-
---password=PASSWORD password of db-user
-
--p=PASSWORD
-
---socket=SOCKET     change path to the socket
-
--s=SOCKET
-
-=head1 EXAMPLE
-
-explain_log.pl --host=localhost --user=foo --password=bar < /var/lib/mysql/mobile.log
-
-=head1 AUTHORS
-
-  Stefan Nitz
-  Jan Willamowius <jan@mobile.de>, http://www.mobile.de
-  Dennis Haney <davh@davh.dk> (Added socket support)
-
-=head1 RECRUITING
-
-If you are looking for a MySQL or Perl job, take a look at http://www.mobile.de
-and send me an email with your resume (you must be speaking German!).
-
-=head1 SEE ALSO
-
-mysql documentation
-
-=cut

sql/Makefile.am

@@ -66,7 +66,8 @@ noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
 			parse_file.h sql_view.h	sql_trigger.h \
 			sql_array.h sql_cursor.h event.h event_priv.h \
 			sql_plugin.h authors.h sql_partition.h \
-			partition_info.h partition_element.h event_scheduler.h
+			partition_info.h partition_element.h event_scheduler.h \
+			contributors.h
 mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \
 			item.cc item_sum.cc item_buff.cc item_func.cc \
 			item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \

sql/contributors.h

+/* Copyright (C) 2005 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+/* Structure of the name list */
+
+struct show_table_contributors_st {
+  const char *name;
+  const char *location;
+  const char *comment;
+};
+
+/*
+  Output from "SHOW CONTRIBUTORS"
+
+  Get permission before editing.
+
+  IMPORTANT: Names should be left in historical order.
+
+  Names should be encoded using UTF-8.
+*/
+
+struct show_table_contributors_st show_table_contributors[]= {
+  {"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"},
+  {NULL, NULL, NULL}
+};

sql/event_scheduler.cc

@@ -236,9 +236,16 @@
   about conditional variables used.
 */
 
+#ifdef __GNUC__
+#if __GNUC__ >= 2
+#define SCHED_FUNC __FUNCTION__
+#endif
+#else
+#define SCHED_FUNC "<unknown>"
+#endif
 
-#define LOCK_SCHEDULER_DATA()   lock_data(__FUNCTION__,__LINE__)
-#define UNLOCK_SCHEDULER_DATA() unlock_data(__FUNCTION__,__LINE__)
+#define LOCK_SCHEDULER_DATA()   lock_data(SCHED_FUNC, __LINE__)
+#define UNLOCK_SCHEDULER_DATA() unlock_data(SCHED_FUNC, __LINE__)
 
 
 #ifndef DBUG_OFF
@@ -767,7 +774,7 @@ Event_scheduler::add_event(THD *thd, Event_timed *et, bool check_existence)
   }
 
   /* We need to load the event on scheduler_root */
-  if (!(res= load_event(thd, et, &et_new)))
+  if (!(res= load_named_event(thd, et, &et_new)))
   {
     queue_insert_safe(&queue, (byte *) et_new);
     DBUG_PRINT("info", ("Sending COND_new_work"));
@@ -902,7 +909,7 @@ Event_scheduler::replace_event(THD *thd, Event_timed *et, LEX_STRING *new_schema
     1. Error occured
     2. If the replace is DISABLED, we don't load it into the queue.
   */
-  if (!(res= load_event(thd, et, &et_new)))
+  if (!(res= load_named_event(thd, et, &et_new)))
   {
     queue_insert_safe(&queue, (byte *) et_new);
     DBUG_PRINT("info", ("Sending COND_new_work"));
@@ -2025,7 +2032,7 @@ Event_scheduler::events_count()
   the table, compiles and inserts it into the cache.
 
   SYNOPSIS
-    Event_scheduler::load_event()
+    Event_scheduler::load_named_event()
       thd      THD
       etn      The name of the event to load and compile on scheduler's root
       etn_new  The loaded event
@@ -2036,7 +2043,7 @@ Event_scheduler::events_count()
 */
 
 enum Event_scheduler::enum_error_code
-Event_scheduler::load_event(THD *thd, Event_timed *etn, Event_timed **etn_new)
+Event_scheduler::load_named_event(THD *thd, Event_timed *etn, Event_timed **etn_new)
 {
   int ret= 0;
   MEM_ROOT *tmp_mem_root;

sql/event_scheduler.h

@@ -152,7 +152,7 @@ private:
   stop_all_running_events(THD *thd);
 
   enum enum_error_code
-  load_event(THD *thd, Event_timed *etn, Event_timed **etn_new);
+  load_named_event(THD *thd, Event_timed *etn, Event_timed **etn_new);
 
   int
   load_events_from_db(THD *thd);

sql/lex.h

@@ -133,6 +133,7 @@ static SYMBOL symbols[] = {
   { "CONSTRAINT",	SYM(CONSTRAINT)},
   { "CONTAINS",         SYM(CONTAINS_SYM)},
   { "CONTINUE",         SYM(CONTINUE_SYM)},
+  { "CONTRIBUTORS",     SYM(CONTRIBUTORS_SYM)},
   { "CONVERT",		SYM(CONVERT_SYM)},
   { "CREATE",		SYM(CREATE)},
   { "CROSS",		SYM(CROSS)},

sql/mysql_priv.h

@@ -999,6 +999,7 @@ int mysql_find_files(THD *thd,List<char> *files, const char *db,
                 const char *path, const char *wild, bool dir);
 bool mysqld_show_storage_engines(THD *thd);
 bool mysqld_show_authors(THD *thd);
+bool mysqld_show_contributors(THD *thd);
 bool mysqld_show_privileges(THD *thd);
 bool mysqld_show_column_types(THD *thd);
 bool mysqld_help (THD *thd, const char *text);

sql/mysqld.cc

@@ -5004,7 +5004,7 @@ Disable with --skip-bdb (will save memory).",
    (gptr*) &global_system_variables.engine_condition_pushdown,
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"event-scheduler", OPT_EVENT_SCHEDULER, "Enable/disable the event scheduler.",
-   (gptr*) &Events::opt_event_scheduler, (gptr*) &Events::opt_event_scheduler, 0, GET_STR,
+   (gptr*) &Events::opt_event_scheduler, (gptr*) &Events::opt_event_scheduler, 0, GET_ULONG,
     REQUIRED_ARG, 2/*default*/, 0/*min-value*/, 2/*max-value*/, 0, 0, 0},
   {"exit-info", 'T', "Used for debugging;  Use at your own risk!", 0, 0, 0,
    GET_LONG, OPT_ARG, 0, 0, 0, 0, 0, 0},

sql/sp_head.cc

@@ -202,6 +202,7 @@ sp_get_flags_for_command(LEX *lex)
   case SQLCOM_SHOW_PROC_CODE:
   case SQLCOM_SHOW_FUNC_CODE:
   case SQLCOM_SHOW_AUTHORS:
+  case SQLCOM_SHOW_CONTRIBUTORS:
   case SQLCOM_REPAIR:
   case SQLCOM_BACKUP_TABLE:
   case SQLCOM_RESTORE_TABLE:

sql/sql_insert.cc

@@ -2674,24 +2674,24 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
 }
 
 
+class MY_HOOKS : public TABLEOP_HOOKS {
+public:
+  MY_HOOKS(select_create *x) : ptr(x) { }
+  virtual void do_prelock(TABLE **tables, uint count)
+  {
+    if (ptr->get_thd()->current_stmt_binlog_row_based)
+      ptr->binlog_show_create_table(tables, count);
+  }
+
+private:
+  select_create *ptr;
+};
+
 int
 select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
 {
   DBUG_ENTER("select_create::prepare");
 
-  class MY_HOOKS : public TABLEOP_HOOKS {
-  public:
-    MY_HOOKS(select_create *x) : ptr(x) { }
-    virtual void do_prelock(TABLE **tables, uint count)
-    {
-      if (ptr->get_thd()->current_stmt_binlog_row_based)
-        ptr->binlog_show_create_table(tables, count);
-    }
-
-  private:
-    select_create *ptr;
-  };
-
   MY_HOOKS hooks(this);
 
   unit= u;

sql/sql_lex.h

@@ -110,6 +110,7 @@ enum enum_sql_command {
   SQLCOM_INSTALL_PLUGIN, SQLCOM_UNINSTALL_PLUGIN,
   SQLCOM_SHOW_AUTHORS, SQLCOM_BINLOG_BASE64_EVENT,
   SQLCOM_SHOW_PLUGINS,
+  SQLCOM_SHOW_CONTRIBUTORS,
   SQLCOM_CREATE_EVENT, SQLCOM_ALTER_EVENT, SQLCOM_DROP_EVENT,
   SQLCOM_SHOW_CREATE_EVENT, SQLCOM_SHOW_EVENTS, 
   SQLCOM_SHOW_SCHEDULER_STATUS,

sql/sql_parse.cc

@@ -3531,6 +3531,9 @@ end_with_restore_list:
   case SQLCOM_SHOW_AUTHORS:
     res= mysqld_show_authors(thd);
     break;
+  case SQLCOM_SHOW_CONTRIBUTORS:
+    res= mysqld_show_contributors(thd);
+    break;
   case SQLCOM_SHOW_PRIVILEGES:
     res= mysqld_show_privileges(thd);
     break;

sql/sql_show.cc

@@ -25,6 +25,7 @@
 #include "sp_head.h"
 #include "sql_trigger.h"
 #include "authors.h"
+#include "contributors.h"
 #include "event.h"
 #include <my_dir.h>
 
@@ -229,6 +230,41 @@ bool mysqld_show_authors(THD *thd)
   DBUG_RETURN(FALSE);
 }
 
+
+/***************************************************************************
+** List all Contributors.
+** Please get permission before updating
+***************************************************************************/
+
+bool mysqld_show_contributors(THD *thd)
+{
+  List<Item> field_list;
+  Protocol *protocol= thd->protocol;
+  DBUG_ENTER("mysqld_show_contributors");
+
+  field_list.push_back(new Item_empty_string("Name",40));
+  field_list.push_back(new Item_empty_string("Location",40));
+  field_list.push_back(new Item_empty_string("Comment",80));
+
+  if (protocol->send_fields(&field_list,
+                            Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
+    DBUG_RETURN(TRUE);
+
+  show_table_contributors_st *contributors;
+  for (contributors= show_table_contributors; contributors->name; contributors++)
+  {
+    protocol->prepare_for_resend();
+    protocol->store(contributors->name, system_charset_info);
+    protocol->store(contributors->location, system_charset_info);
+    protocol->store(contributors->comment, system_charset_info);
+    if (protocol->write())
+      DBUG_RETURN(TRUE);
+  }
+  send_eof(thd);
+  DBUG_RETURN(FALSE);
+}
+
+
 /***************************************************************************
  List all privileges supported
 ***************************************************************************/

sql/sql_yacc.yy

@@ -204,6 +204,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %token  CONSTRAINT
 %token  CONTAINS_SYM
 %token  CONTINUE_SYM
+%token  CONTRIBUTORS_SYM
 %token  CONVERT_SYM
 %token  CONVERT_TZ_SYM
 %token  COUNT_SYM
@@ -8194,6 +8195,11 @@ show_param:
 	    LEX *lex=Lex;
 	    lex->sql_command= SQLCOM_SHOW_AUTHORS;
 	  }
+	| CONTRIBUTORS_SYM
+	  {
+	    LEX *lex=Lex;
+	    lex->sql_command= SQLCOM_SHOW_CONTRIBUTORS;
+	  }
 	| PRIVILEGES
 	  {
 	    LEX *lex=Lex;

storage/heap/hp_create.c

@@ -85,6 +85,7 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef,
           if (!my_binary_compare(keyinfo->seg[j].charset))
             keyinfo->flag|= HA_END_SPACE_KEY;
           keyinfo->flag|= HA_VAR_LENGTH_KEY;
+          length+= 2;
           /* Save number of bytes used to store length */
           keyinfo->seg[j].bit_start= 1;
           break;
@@ -95,6 +96,7 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef,
           if (!my_binary_compare(keyinfo->seg[j].charset))
             keyinfo->flag|= HA_END_SPACE_KEY;
           keyinfo->flag|= HA_VAR_LENGTH_KEY;
+          length+= 2;
           /* Save number of bytes used to store length */
           keyinfo->seg[j].bit_start= 2;
           /*

support-files/mysql.spec.sh

@@ -554,7 +554,6 @@ fi
 %attr(755, root, root) %{_bindir}/myisampack
 %attr(755, root, root) %{_bindir}/mysql_convert_table_format
 %attr(755, root, root) %{_bindir}/mysql_create_system_tables
-%attr(755, root, root) %{_bindir}/mysql_explain_log
 %attr(755, root, root) %{_bindir}/mysql_fix_extensions
 %attr(755, root, root) %{_bindir}/mysql_fix_privilege_tables
 %attr(755, root, root) %{_bindir}/mysql_install_db