Fix native protocol drop user type notification

patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-7571

Conflicts:
        CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33719e75
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33719e75
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33719e75

Branch: refs/heads/cassandra-2.1
Commit: 33719e759aa600149b4b1286c63e4f895a920b4e
Parents: 4f6e108
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Sat Jul 19 00:19:34 2014 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Thu Jul 24 20:36:50 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                      | 1 +
 src/java/org/apache/cassandra/db/DefsTables.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/33719e75/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7117a77..3776319 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.0-final
+ * Fix native protocol drop user type notification (CASSANDRA-7571)
  * Give read access to system.schema_usertypes to all authenticated users
    (CASSANDRA-7578)
  * Fix cqlsh display when zero rows are returned (CASSANDRA-7580)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/33719e75/src/java/org/apache/cassandra/db/DefsTables.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DefsTables.java 
b/src/java/org/apache/cassandra/db/DefsTables.java
index 98ced8d..96327c4 100644
--- a/src/java/org/apache/cassandra/db/DefsTables.java
+++ b/src/java/org/apache/cassandra/db/DefsTables.java
@@ -537,7 +537,7 @@ public class DefsTables
         ksm.userTypes.removeType(ut);
 
         if (!StorageService.instance.isClientMode())
-            MigrationManager.instance.notifyUpdateUserType(ut);
+            MigrationManager.instance.notifyDropUserType(ut);
     }
 
     private static KSMetaData makeNewKeyspaceDefinition(KSMetaData ksm, 
CFMetaData toExclude)

Reply via email to