Commit f70b7020 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/hf/work/22451/my51-22451

into  mysql.com:/home/hf/work/mysql-5.1-mrg


storage/federated/ha_federated.cc:
  Auto merged
parents 7990ec32 3e275085
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
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
+21 −0
Original line number Diff line number Diff line
#
# 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 −1
Original line number Diff line number Diff line
@@ -405,7 +405,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;