WL#1012: All changes as one single changeset.

This includes both code and test cases.

1 files changed, 22 insertions, 0 deletions

diff --git a/sql/sql_list.h b/sql/sql_list.h
index b2bcc4ea401..05f589a2c23 100644
--- a/sql/sql_list.h
+++ b/sql/sql_list.h
@@ -441,6 +441,28 @@ struct ilink
 };
 
 
+/* Needed to be able to have an I_List of char* strings in mysqld.cc. */
+
+class i_string: public ilink
+{
+public:
+  const char* ptr;
+  i_string():ptr(0) { }
+  i_string(const char* s) : ptr(s) {}
+};
+
+/* needed for linked list of two strings for replicate-rewrite-db */
+class i_string_pair: public ilink
+{
+public:
+  const char* key;
+  const char* val;
+  i_string_pair():key(0),val(0) { }
+  i_string_pair(const char* key_arg, const char* val_arg) : 
+    key(key_arg),val(val_arg) {}
+};
+
+
 template <class T> class I_List_iterator;
 
 /*