MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:ingo Date:July 10 2006 6:46pm
Subject:bk commit into 5.0 tree (ingo:1.2223) BUG#10952
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of mydev. When mydev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-10 20:46:05+02:00, ingo@stripped +8 -0
  Revoking patch for Bug#10952 on behalf of Brian.

  mysql-test/r/blackhole.result@stripped, 2006-07-10 20:46:02+02:00, ingo@stripped +0 -8
    Revoking patch for Bug#10952 on behalf of Brian.

  mysql-test/r/merge.result@stripped, 2006-07-10 20:46:03+02:00, ingo@stripped +0 -8
    Revoking patch for Bug#10952 on behalf of Brian.

  mysql-test/t/blackhole.test@stripped, 2006-07-10 20:46:03+02:00, ingo@stripped +0 -12
    Revoking patch for Bug#10952 on behalf of Brian.

  mysql-test/t/merge.test@stripped, 2006-07-10 20:46:03+02:00, ingo@stripped +0 -10
    Revoking patch for Bug#10952 on behalf of Brian.

  sql/ha_blackhole.cc@stripped, 2006-07-10 20:46:03+02:00, ingo@stripped +1 -1
    Revoking patch for Bug#10952 on behalf of Brian.

  sql/ha_myisammrg.cc@stripped, 2006-07-10 20:46:03+02:00, ingo@stripped +1 -1
    Revoking patch for Bug#10952 on behalf of Brian.

  sql/handler.h@stripped, 2006-07-10 20:46:03+02:00, ingo@stripped +0 -1
    Revoking patch for Bug#10952 on behalf of Brian.

  sql/sql_table.cc@stripped, 2006-07-10 20:46:03+02:00, ingo@stripped +1 -3
    Revoking patch for Bug#10952 on behalf of Brian.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0-release

--- 1.77/sql/ha_myisammrg.cc	2006-07-10 20:46:13 +02:00
+++ 1.78/sql/ha_myisammrg.cc	2006-07-10 20:46:13 +02:00
@@ -55,7 +55,7 @@
   NULL,    /* create_cursor_read_view */
   NULL,    /* set_cursor_read_view */
   NULL,    /* close_cursor_read_view */
-  HTON_CAN_RECREATE | HTON_ALTER_CANNOT_CREATE
+  HTON_CAN_RECREATE
 };
 
 

--- 1.172/sql/handler.h	2006-07-10 20:46:13 +02:00
+++ 1.173/sql/handler.h	2006-07-10 20:46:13 +02:00
@@ -410,7 +410,6 @@
 #define HTON_ALTER_NOT_SUPPORTED     (1 << 1) //Engine does not support alter
 #define HTON_CAN_RECREATE            (1 << 2) //Delete all is used fro truncate
 #define HTON_HIDDEN                  (1 << 3) //Engine does not appear in lists
-#define HTON_ALTER_CANNOT_CREATE     (1 << 4) //Cannot use alter to create
 
 typedef struct st_thd_trans
 {

--- 1.316/sql/sql_table.cc	2006-07-10 20:46:13 +02:00
+++ 1.317/sql/sql_table.cc	2006-07-10 20:46:13 +02:00
@@ -3240,9 +3240,7 @@
 
   DBUG_PRINT("info", ("old type: %d  new type: %d", old_db_type, new_db_type));
   if (ha_check_storage_engine_flag(old_db_type, HTON_ALTER_NOT_SUPPORTED) ||
-      ha_check_storage_engine_flag(new_db_type, HTON_ALTER_NOT_SUPPORTED) ||
-      (old_db_type != new_db_type &&
-       ha_check_storage_engine_flag(new_db_type, HTON_ALTER_CANNOT_CREATE)))
+      ha_check_storage_engine_flag(new_db_type, HTON_ALTER_NOT_SUPPORTED))
   {
     DBUG_PRINT("info", ("doesn't support alter"));
     my_error(ER_ILLEGAL_HA, MYF(0), table_name);

--- 1.9/mysql-test/r/blackhole.result	2006-07-10 20:46:13 +02:00
+++ 1.10/mysql-test/r/blackhole.result	2006-07-10 20:46:13 +02:00
@@ -123,11 +123,3 @@
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 select * from t3
 master-bin.000001	#	Query	1	#	use `test`; replace into t1 select * from t3
 drop table t1,t2,t3;
-drop table if exists t1;
-Warnings:
-Note	1051	Unknown table 't1'
-create table t1 (c char(20)) engine=MyISAM;
-insert into t1 values ("Monty"),("WAX"),("Walrus");
-alter table t1 engine=blackhole;
-ERROR HY000: Table storage engine for 't1' doesn't have this option
-drop table t1;

--- 1.7/mysql-test/t/blackhole.test	2006-07-10 20:46:13 +02:00
+++ 1.8/mysql-test/t/blackhole.test	2006-07-10 20:46:13 +02:00
@@ -128,15 +128,3 @@
 drop table t1,t2,t3;
 
 # End of 4.1 tests
-
-#
-# BUG#10952 - alter table ... lost data without errors and warnings
-#
-drop table if exists t1;
-create table t1 (c char(20)) engine=MyISAM;
-insert into t1 values ("Monty"),("WAX"),("Walrus");
---error 1031
-alter table t1 engine=blackhole;
-drop table t1;
-
-# End of 5.0 tests

--- 1.22/sql/ha_blackhole.cc	2006-07-10 20:46:13 +02:00
+++ 1.23/sql/ha_blackhole.cc	2006-07-10 20:46:13 +02:00
@@ -47,7 +47,7 @@
   NULL,    /* create_cursor_read_view */
   NULL,    /* set_cursor_read_view */
   NULL,    /* close_cursor_read_view */
-  HTON_CAN_RECREATE | HTON_ALTER_CANNOT_CREATE
+  HTON_CAN_RECREATE
 };
 
 /*****************************************************************************

--- 1.48/mysql-test/r/merge.result	2006-07-10 20:46:13 +02:00
+++ 1.49/mysql-test/r/merge.result	2006-07-10 20:46:13 +02:00
@@ -768,14 +768,6 @@
 test.t1	check	status	OK
 test.t2	check	status	OK
 drop table t1, t2, t3;
-drop table if exists t1;
-Warnings:
-Note	1051	Unknown table 't1'
-create table t1 (c char(20)) engine=MyISAM;
-insert into t1 values ("Monty"),("WAX"),("Walrus");
-alter table t1 engine=MERGE;
-ERROR HY000: Table storage engine for 't1' doesn't have this option
-drop table t1;
 create table t1 (b bit(1));
 create table t2 (b bit(1));
 create table tm (b bit(1)) engine = merge union = (t1,t2);

--- 1.41/mysql-test/t/merge.test	2006-07-10 20:46:13 +02:00
+++ 1.42/mysql-test/t/merge.test	2006-07-10 20:46:13 +02:00
@@ -381,16 +381,6 @@
 # End of 4.1 tests
 
 #
-# BUG#10952 - alter table ... lost data without errors and warnings
-#
-drop table if exists t1;
-create table t1 (c char(20)) engine=MyISAM;
-insert into t1 values ("Monty"),("WAX"),("Walrus");
---error 1031
-alter table t1 engine=MERGE;
-drop table t1;
-
-#
 # BUG#19648 - Merge table does not work with bit types
 #
 create table t1 (b bit(1));
Thread
bk commit into 5.0 tree (ingo:1.2223) BUG#10952ingo10 Jul