bk commit into 5.1 tree (holyfoot:1.2359) BUG#22451

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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-12-19 16:37:50+04:00, holyfoot@stripped +3 -0
  bug #22451 (Partitions: duplicating results with ENGINE=FEDERATED)
  
  As presently PARTITIONS + FEDERATED just doesn't work i added error message
  to inform user about that.
  Should be enabled again after releted WL's completion.

  mysql-test/r/partition_federated.result@stripped, 2006-12-19 16:37:45+04:00, holyfoot@stripped +6 -0
    result added

  mysql-test/r/partition_federated.result@stripped, 2006-12-19 16:37:45+04:00, holyfoot@stripped +0 -0

  mysql-test/t/partition_federated.test@stripped, 2006-12-19 16:37:45+04:00, holyfoot@stripped +21 -0
    test added

  mysql-test/t/partition_federated.test@stripped, 2006-12-19 16:37:45+04:00, holyfoot@stripped +0 -0

  storage/federated/ha_federated.cc@stripped, 2006-12-19 16:37:45+04:00, holyfoot@stripped +1 -1
    partitioning disabled in FEDERATED engine

# 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:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/22451/my51-22451
--- New file ---
+++ mysql-test/r/partition_federated.result	06/12/19 16:37:45
drop table if exists t1;
create table t1 (s1 int) engine=federated
connection='mysql://root@localhost/federated/t1' partition by list (s1)
(partition p1 values in (1), partition p2 values in (2));
ERROR HY000: Engine cannot be used in partitioned tables
End of 5.1 tests

--- New file ---
+++ mysql-test/t/partition_federated.test	06/12/19 16:37:45
#
# Tests for partitioned FEDERATED
#
-- source include/have_partition.inc
-- source include/not_embedded.inc
-- source include/have_federated_db.inc

--disable_warnings
drop table if exists t1;
--enable_warnings

#
# Bug #22451 Partitions: duplicate results with engine=federated 
#

--error ER_PARTITION_MERGE_ERROR
create table t1 (s1 int) engine=federated
connection='mysql://root@localhost/federated/t1' partition by list (s1)
(partition p1 values in (1), partition p2 values in (2));

--echo End of 5.1 tests


--- 1.90/storage/federated/ha_federated.cc	2006-12-19 16:37:58 +04:00
+++ 1.91/storage/federated/ha_federated.cc	2006-12-19 16:37:58 +04:00
@@ -406,7 +406,7 @@ int federated_db_init(void *p)
   federated_hton->commit= federated_commit;
   federated_hton->rollback= federated_rollback;
   federated_hton->create= federated_create_handler;
-  federated_hton->flags= HTON_ALTER_NOT_SUPPORTED;
+  federated_hton->flags= HTON_ALTER_NOT_SUPPORTED | HTON_NO_PARTITION;
 
   if (pthread_mutex_init(&federated_mutex, MY_MUTEX_INIT_FAST))
     goto error;