Merge bk-internal:/home/bk/mysql-5.0

into mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

Build-tools/Do-compile

@@ -394,13 +394,13 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)
   info("Running test suite");
   system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir);
   safe_cd("${test_dir}/mysql-test");
-  check_system("./mysql-test-run $flags --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
+  check_system("./mysql-test-run $flags --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "were successful");
 
   unless ($opt_skip_ps_test)
   {
     log_timestamp();
     info("Running test suite using prepared statements");
-    check_system("./mysql-test-run $flags --ps-protocol --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
+    check_system("./mysql-test-run $flags --ps-protocol --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "were successful");
   }
   
   unless ($opt_skip_embedded_test)
@@ -409,7 +409,7 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)
     info("Running embedded server test suite");
     # Embedded server and NDB don't jive
     $flags=~ s/ --with-ndbcluster//;
-    check_system("./mysql-test-run $flags --embedded-server --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
+    check_system("./mysql-test-run $flags --embedded-server --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "were successful");
   }
   # 'mysql-test-run' writes its own final message for log evaluation.
 }

VC++Files/tests/mysql_client_test.dsp

@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo 
 # ADD BSC32 /nologo 
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib /nologo /out:"..\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console 
 
 !ELSEIF  "$(CFG)" == "mysql_client_test - Win32 Release"
 
@@ -76,8 +76,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo 
 # ADD BSC32 /nologo 
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\tests\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 
 
 !ENDIF
 
@@ -87,7 +87,7 @@ LINK32=link.exe
 # Name "mysql_client_test - Win32 Release"
 # Begin Source File
 
-SOURCE=tests\mysql_client_test.c
+SOURCE=mysql_client_test.c
 # End Source File
 # End Target
 # End Project

VC++Files/tests/mysql_client_test_ia64.dsp

@@ -48,16 +48,16 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console  /out:"..\tests\mysql_client_test.exe" /machine:IA64
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /subsystem:console  /out:"..\mysql_client_test.exe" /machine:IA64
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\libmysql.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib bufferoverflowU.lib /nologo /subsystem:console  /nodefaultlib /out:"..\tests\mysql_client_test.exe" /machine:IA64 /machine:IA64
+# ADD LINK32 ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\libmysql.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib bufferoverflowU.lib /nologo /subsystem:console  /nodefaultlib /out:"..\mysql_client_test.exe" /machine:IA64 /machine:IA64
 # SUBTRACT LINK32 /pdb:none
 # Begin Target
 
 # Name "mysql_client_test - WinIA64 Release"
 # Begin Source File
 
-SOURCE=tests\mysql_client_test.c
+SOURCE=mysql_client_test.c
 DEP_CPP_MYSQL=\
 	"..\include\config-netware.h"\
 	"..\include\config-os2.h"\

mysql-test/include/system_db_struct.inc

@@ -11,3 +11,4 @@ show create table func;
 show create table tables_priv;
 show create table columns_priv;
 show create table procs_priv;
+show create table proc;

mysql-test/lib/mtr_report.pl

@@ -161,7 +161,7 @@ sub mtr_report_stats ($) {
   {
     my $ratio=  $tot_passed * 100 / $tot_tests;
     printf "Failed $tot_failed/$tot_tests tests, " .
-      "%.2f\% successful.\n\n", $ratio;
+      "%.2f\% were successful.\n\n", $ratio;
     print
       "The log files in var/log may give you some hint\n",
       "of what when wrong.\n",

mysql-test/mysql-test-run.sh

@@ -861,7 +861,7 @@ report_stats () {
 	whole=`$PRINTF %.2s $raw`
 	xwhole=`$EXPR $whole \* 100`
 	deci=`$EXPR $raw - $xwhole`
-	$ECHO  "Failed ${TOT_FAIL}/${TOT_TEST} tests, ${whole}.${deci}% successful."
+	$ECHO  "Failed ${TOT_FAIL}/${TOT_TEST} tests, ${whole}.${deci}% were successful."
 	$ECHO ""
         $ECHO "The log files in $MY_LOG_DIR may give you some hint"
 	$ECHO "of what when wrong."

mysql-test/r/query_cache.result

@@ -957,3 +957,24 @@ drop table t1;
 select table_name from information_schema.tables
 where table_schema="test";
 table_name
+set global query_cache_size=1024*1024;
+flush query cache;
+create table t1 ( a int );
+insert into t1 values (1);
+select a from t1;
+a
+1
+select a from t1;
+a
+1
+show status like 'qcache_queries_in_cache';
+Variable_name	Value
+Qcache_queries_in_cache	1
+repair table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	repair	status	OK
+show status like 'qcache_queries_in_cache';
+Variable_name	Value
+Qcache_queries_in_cache	0
+drop table t1;
+set GLOBAL query_cache_size=0;

mysql-test/r/system_mysql_db.result

@@ -154,5 +154,26 @@ procs_priv	CREATE TABLE `procs_priv` (
   PRIMARY KEY  (`Host`,`Db`,`User`,`Routine_name`),
   KEY `Grantor` (`Grantor`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Procedure privileges'
+show create table proc;
+Table	Create Table
+proc	CREATE TABLE `proc` (
+  `db` char(64) character set latin1 collate latin1_bin NOT NULL default '',
+  `name` char(64) NOT NULL default '',
+  `type` enum('FUNCTION','PROCEDURE') NOT NULL default 'FUNCTION',
+  `specific_name` char(64) NOT NULL default '',
+  `language` enum('SQL') NOT NULL default 'SQL',
+  `sql_data_access` enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA') NOT NULL default 'CONTAINS_SQL',
+  `is_deterministic` enum('YES','NO') NOT NULL default 'NO',
+  `security_type` enum('INVOKER','DEFINER') NOT NULL default 'DEFINER',
+  `param_list` blob NOT NULL,
+  `returns` char(64) NOT NULL default '',
+  `body` blob NOT NULL,
+  `definer` char(77) character set latin1 collate latin1_bin NOT NULL default '',
+  `created` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `modified` timestamp NOT NULL default '0000-00-00 00:00:00',
+  `sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') NOT NULL default '',
+  `comment` char(64) character set latin1 collate latin1_bin NOT NULL default '',
+  PRIMARY KEY  (`db`,`name`,`type`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Stored Procedures'
 show tables;
 Tables_in_test

mysql-test/t/query_cache.test

@@ -697,3 +697,16 @@ where table_schema="test";
 drop table t1;
 select table_name from information_schema.tables
 where table_schema="test";
+# Bug #8480: REPAIR TABLE needs to flush the table from the query cache
+set global query_cache_size=1024*1024;
+flush query cache;
+create table t1 ( a int );
+insert into t1 values (1);
+select a from t1;
+select a from t1;
+show status like 'qcache_queries_in_cache';
+repair table t1;
+show status like 'qcache_queries_in_cache';
+drop table t1;
+
+set GLOBAL query_cache_size=0;

scripts/make_win_src_distribution.sh

@@ -15,13 +15,26 @@ DIRNAME=""
 OUTTAR="0"
 OUTZIP="0"
 
+#
+# An "abort" function taking a variable number of strings (one per line)
+#
+
+abort()
+{
+  for line
+  do
+    echo "$line"
+  done
+  exit 1
+}
+
+
 #
 # This script must run from MySQL top directory
 #
 
 if [ ! -f scripts/make_win_src_distribution ]; then
-  echo "ERROR : You must run this script from the MySQL top-level directory"
-  exit 1
+  abort "ERROR : You must run this script from the MySQL top-level directory"
 fi
 SOURCE=`pwd`
 
@@ -30,9 +43,8 @@ SOURCE=`pwd`
 #
 
 if [ ! -f sql/sql_yacc.cc ]; then
-  echo "ERROR : Sorry, you must run this script after the complete build,"
-  echo "        hope you know what you are trying to do !!"
-  exit 1
+  abort "ERROR : Sorry, you must run this script after the complete build," \
+        "        hope you know what you are trying to do !!"
 fi
 
 #
@@ -86,9 +98,7 @@ parse_arguments() {
       --tar)      OUTTAR=1 ;;
       --zip)      OUTZIP=1 ;;
       --help)     show_usage ;;
-      *)
-  echo "Unknown argument '$arg'"
-  exit 1
+      *)          abort "Unknown argument '$arg'"
       ;;
     esac
   done
@@ -138,6 +148,7 @@ if [ -d $BASE ] ; then
 fi
 
 $CP -r $SOURCE/VC++Files $BASE
+# This includes an implicit 'mkdir $BASE' !
 
 #
 # Process version tags in InstallShield files
@@ -312,7 +323,12 @@ do
   print_debug "Copying directory '$i'"
   if [ -d $i ]
   then
-    $CP -R $i $BASE/$i
+    if [ -d $BASE/$i ]
+    then
+      $CP -R $i $BASE
+    else
+      $CP -R $i $BASE/$i
+    fi
   fi
 done
 

scripts/mysql_create_system_tables.sh

@@ -702,7 +702,17 @@ then
   c_p="$c_p                         'MYSQL323',"
   c_p="$c_p                         'MYSQL40',"
   c_p="$c_p                         'ANSI',"
-  c_p="$c_p                         'NO_AUTO_VALUE_ON_ZERO'"
+  c_p="$c_p                         'NO_AUTO_VALUE_ON_ZERO',"
+  c_p="$c_p                         'NO_BACKSLASH_ESCAPES',"
+  c_p="$c_p                         'STRICT_TRANS_TABLES',"
+  c_p="$c_p                         'STRICT_ALL_TABLES',"
+  c_p="$c_p                         'NO_ZERO_IN_DATE',"
+  c_p="$c_p                         'NO_ZERO_DATE',"
+  c_p="$c_p                         'INVALID_DATES',"
+  c_p="$c_p                         'ERROR_FOR_DIVISION_BY_ZERO',"
+  c_p="$c_p                         'TRADITIONAL',"
+  c_p="$c_p                         'NO_AUTO_CREATE_USER',"
+  c_p="$c_p                         'HIGH_NOT_PRECEDENCE'"
   c_p="$c_p                     ) DEFAULT 0 NOT NULL,"
   c_p="$c_p   comment           char(64) binary DEFAULT '' NOT NULL,"
   c_p="$c_p   PRIMARY KEY (db,name,type)"

scripts/mysql_fix_privilege_tables.sql

@@ -422,7 +422,17 @@ CREATE TABLE IF NOT EXISTS proc (
                         'MYSQL323',
                         'MYSQL40',
                         'ANSI',
-                        'NO_AUTO_VALUE_ON_ZERO'
+                        'NO_AUTO_VALUE_ON_ZERO',
+                        'NO_BACKSLASH_ESCAPES',
+                        'STRICT_TRANS_TABLES',
+                        'STRICT_ALL_TABLES',
+                        'NO_ZERO_IN_DATE',
+                        'NO_ZERO_DATE',
+                        'INVALID_DATES',
+                        'ERROR_FOR_DIVISION_BY_ZERO',
+                        'TRADITIONAL',
+                        'NO_AUTO_CREATE_USER',
+                        'HIGH_NOT_PRECEDENCE'
                     ) DEFAULT 0 NOT NULL,
   comment           char(64) binary DEFAULT '' NOT NULL,
   PRIMARY KEY (db,name,type)
@@ -436,4 +446,36 @@ ALTER TABLE proc MODIFY name char(64) DEFAULT '' NOT NULL,
 			     'NO_SQL',
 			     'READS_SQL_DATA',
 			     'MODIFIES_SQL_DATA'
-			    ) DEFAULT 'CONTAINS_SQL' NOT NULL;
+			    ) DEFAULT 'CONTAINS_SQL' NOT NULL,
+                 MODIFY sql_mode
+                        set('REAL_AS_FLOAT',
+                            'PIPES_AS_CONCAT',
+                            'ANSI_QUOTES',
+                            'IGNORE_SPACE',
+                            'NOT_USED',
+                            'ONLY_FULL_GROUP_BY',
+                            'NO_UNSIGNED_SUBTRACTION',
+                            'NO_DIR_IN_CREATE',
+                            'POSTGRESQL',
+                            'ORACLE',
+                            'MSSQL',
+                            'DB2',
+                            'MAXDB',
+                            'NO_KEY_OPTIONS',
+                            'NO_TABLE_OPTIONS',
+                            'NO_FIELD_OPTIONS',
+                            'MYSQL323',
+                            'MYSQL40',
+                            'ANSI',
+                            'NO_AUTO_VALUE_ON_ZERO',
+                            'NO_BACKSLASH_ESCAPES',
+                            'STRICT_TRANS_TABLES',
+                            'STRICT_ALL_TABLES',
+                            'NO_ZERO_IN_DATE',
+                            'NO_ZERO_DATE',
+                            'INVALID_DATES',
+                            'ERROR_FOR_DIVISION_BY_ZERO',
+                            'TRADITIONAL',
+                            'NO_AUTO_CREATE_USER',
+                            'HIGH_NOT_PRECEDENCE'
+                            ) DEFAULT 0 NOT NULL;

scripts/mysqld_safe.sh

@@ -194,6 +194,15 @@ parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysq
 parse_arguments PICK-ARGS-FROM-ARGV "$@"
 safe_mysql_unix_port=${mysql_unix_port:-${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}}
 
+# Make sure that directory for $safe_mysql_unix_port exists
+mysql_unix_port_dir=`dirname $safe_mysql_unix_port`
+if [ ! -d $mysql_unix_port_dir ]
+then
+  mkdir $mysql_unix_port_dir
+  chown $user $mysql_unix_port_dir
+fi
+
+
 if test ! -x $ledir/$MYSQLD
 then
   echo "The file $ledir/$MYSQLD doesn't exist or is not executable"

sql/mysql_priv.h

@@ -299,6 +299,10 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset;
   use strictly more than 64 bits by adding one more define above, you should
   contact the replication team because the replication code should then be
   updated (to store more bytes on disk).
+
+  NOTE: When adding new SQL_MODE types, make sure to also add them to
+  ../scripts/mysql_create_system_tables.sh and
+  ../scripts/mysql_fix_privilege_tables.sql
 */
 
 #define RAID_BLOCK_SIZE 1024

sql/sql_table.cc

@@ -2144,7 +2144,9 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
       thd->exit_cond(old_message);
       if (thd->killed)
 	goto err;
-      open_for_modify=0;
+      /* Flush entries in the query cache involving this table. */
+      query_cache_invalidate3(thd, table->table, 0);
+      open_for_modify= 0;
     }
 
     result_code = (table->table->file->*operator_func)(thd, check_opt);