Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0

into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


sql/sql_parse.cc:
  Auto merged

mysql-test/mysql-test-run.sh

@@ -1535,12 +1535,12 @@ run_testcase ()
    return
  fi
 
- if [ -f "$TESTDIR/$tname.disabled" ]
- then
-   comment=`$CAT $TESTDIR/$tname.disabled`;
-   disable_test $tname "$comment"
-   return
- fi
+# if [ -f "$TESTDIR/$tname.disabled" ]
+# then
+#   comment=`$CAT $TESTDIR/$tname.disabled`;
+#   disable_test $tname "$comment"
+#   return
+# fi
  if [ -f "$TESTDIR/disabled.def" ] ; then
    comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`;
    if [ -n "$comment" ]

mysql-test/r/sp.result

@@ -2777,4 +2777,23 @@ a
 3.2000
 drop procedure bug8937|
 delete from t1|
+drop procedure if exists bug6600|
+drop table if exists t3|
+drop view if exists v1|
+create table t3 (s1 decimal(31,30))|
+create view v1 as select * from t3|
+create procedure bug6600()
+check table v1|
+call bug6600()|
+Table	Op	Msg_type	Msg_text
+test.v1	check	status	OK
+call bug6600()|
+Table	Op	Msg_type	Msg_text
+test.v1	check	status	OK
+call bug6600()|
+Table	Op	Msg_type	Msg_text
+test.v1	check	status	OK
+drop procedure bug6600|
+drop view v1|
+drop table t3|
 drop table t1,t2;

mysql-test/r/sp_trans.result

-drop procedure if exists sp1;
+drop procedure if exists bug8850|
 create table t1 (a int) engine=innodb|
-create procedure sp1 ()
+create procedure bug8850()
 begin
 truncate table t1; insert t1 values (1); rollback;
 end|
-set autocommit=0;
-insert t1 values (2);
-call sp1();
+set autocommit=0|
+insert t1 values (2)|
+call bug8850()|
 ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
-commit;
-select * from t1;
+commit|
+select * from t1|
 a
 2
-call sp1();
+call bug8850()|
 ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
-set autocommit=1;
-select * from t1;
+set autocommit=1|
+select * from t1|
 a
 2
-drop table t1;
-drop procedure sp1;
+drop table t1|
+drop procedure bug8850|

mysql-test/t/sp-error.test

@@ -680,6 +680,15 @@ begin
 end|
 
 
+#
+# BUG#NNNN: New bug synopsis
+#
+#--disable_warnings
+#drop procedure if exists bugNNNN|
+#--enable_warnings
+#create procedure bugNNNN...
+
+
 drop table t1|
 
 delimiter ;|

mysql-test/t/sp-threads.test

 #
-# Testing stored procedures with multiple connections
+# Testing stored procedures with multiple connections,
+# except security/privilege tests, they go to sp-security.test
 #
 
 connect (con1root,localhost,root,,);
@@ -52,3 +53,12 @@ connection con1root;
 drop table t1;
 drop procedure bug4934;
 
+
+#
+# BUG#NNNN: New bug synopsis
+#
+#--disable_warnings
+#drop procedure if exists bugNNNN;
+#--enable_warnings
+#create procedure bugNNNN...
+

mysql-test/t/sp.test

@@ -4,11 +4,22 @@
 # Please keep this file free of --error cases and other
 # things that will not run in a single debugged mysqld
 # process (e.g. master-slave things).
-
--- source include/have_innodb.inc
+#
+# Test cases for bugs are added at the end. See template there.
+#
+# Tests that require --error go into sp-error.test
+# Tests that require inndb go into sp_trans.test
+# Tests that check privilege and security issues go to sp-security.test.
+# Tests that require multiple connections, except security/privilege tests,
+#   go to sp-thread.
 
 use test;
 
+# Test tables
+#
+# t1 and t2 are reused throughout the file, and dropped at the end.
+# t3 and up are created and dropped when needed.
+#
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
@@ -3387,6 +3398,37 @@ drop procedure bug8937|
 delete from t1|
 
 
+#
+# BUG#6600: Stored procedure crash after repeated calls with check table
+#
+--disable_warnings
+drop procedure if exists bug6600|
+drop table if exists t3|
+drop view if exists v1|
+--enable_warnings
+create table t3 (s1 decimal(31,30))|
+create view v1 as select * from t3|
+
+create procedure bug6600()
+  check table v1|
+
+call bug6600()|
+call bug6600()|
+call bug6600()|
+drop procedure bug6600|
+drop view v1|
+drop table t3|
+
+
+#
+# BUG#NNNN: New bug synopsis
+#
+#--disable_warnings
+#drop procedure if exists bugNNNN|
+#--enable_warnings
+#create procedure bugNNNN...
+
+
 # Add bugs above this line. Use existing tables t1 and t2 when
 # practical, or create table t3, t3 etc temporarily (and drop them).
 delimiter ;|

mysql-test/t/sp_trans.test

@@ -4,32 +4,43 @@
 
 -- source include/have_innodb.inc
 
+delimiter |;
+
 #
-# BUG#8850
+# BUG#8850: Truncate table in a stored procedure locks the tables
 #
 --disable_warnings
-drop procedure if exists sp1;
+drop procedure if exists bug8850|
 --enable_warnings
-delimiter |;
 create table t1 (a int) engine=innodb|
-create procedure sp1 ()
+create procedure bug8850()
 begin
   truncate table t1; insert t1 values (1); rollback;
 end|
-delimiter ;|
-set autocommit=0;
-insert t1 values (2);
+
+set autocommit=0|
+insert t1 values (2)|
 --error 1192
-call sp1();
-commit;
-select * from t1;
+call bug8850()|
+commit|
+select * from t1|
 #
 # when CALL will be fixed to not start a transaction, the error should
 # go away
 --error 1192
-call sp1();
-set autocommit=1;
-select * from t1;
-drop table t1;
-drop procedure sp1;
+call bug8850()|
+set autocommit=1|
+select * from t1|
+drop table t1|
+drop procedure bug8850|
 
+
+#
+# BUG#NNNN: New bug synopsis
+#
+#--disable_warnings
+#drop procedure if exists bugNNNN|
+#--enable_warnings
+#create procedure bugNNNN...
+
+delimiter ;|

sql/sp_head.cc

@@ -58,6 +58,7 @@ sp_multi_results_command(enum enum_sql_command cmd)
 {
   switch (cmd) {
   case SQLCOM_ANALYZE:
+  case SQLCOM_CHECK:
   case SQLCOM_CHECKSUM:
   case SQLCOM_HA_READ:
   case SQLCOM_SHOW_BINLOGS:

sql/sql_parse.cc

@@ -27,6 +27,7 @@
 
 #include "sp_head.h"
 #include "sp.h"
+#include "sp_cache.h"
 
 #ifdef HAVE_OPENSSL
 /*
@@ -3045,6 +3046,7 @@ unsent_create_error:
       goto error; /* purecov: inspected */
     thd->slow_command=TRUE;
     res = mysql_check_table(thd, first_table, &lex->check_opt);
+    sp_cache_invalidate();
     break;
   }
   case SQLCOM_ANALYZE:

support-files/mysql.spec.sh

@@ -214,7 +214,6 @@ Optional MySQL server binary that supports additional features like:
  - CSV Storage Engine
  - Example Storage Engine
  - Federated Storage Engine
- - MyISAM RAID
  - User Defined Functions (UDFs).
 
 To activate this binary, just install this package in addition to
@@ -328,7 +327,6 @@ BuildMySQL "--enable-shared \
 		--with-berkeley-db \
 		--with-innodb \
 		--with-ndbcluster \
-		--with-raid \
 		--with-archive \
 		--with-csv-storage-engine \
 		--with-example-storage-engine \
@@ -694,9 +692,14 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Fri Mar 18 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Disabled RAID in the Max binares once and for all (it has finally been removed
+  from the source tree)
+
 * Sun Feb 20 2005 Petr Chardin <petr@mysql.com>
 
-- Install MySQL Instance Manager together with mysqld, toch mysqlmanager
+- Install MySQL Instance Manager together with mysqld, touch mysqlmanager
   password file
 
 * Mon Feb 14 2005 Lenz Grimmer <lenz@mysql.com>