Automerge the build fixes of 5.5.0-m2 back into the tree.

4 files changed, 22 insertions, 19 deletions

diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am
index 143d684025e..bb88ff2e8d1 100644
--- a/storage/archive/Makefile.am
+++ b/storage/archive/Makefile.am
@@ -77,9 +77,12 @@ libarchive_a_DEPENDENCIES = probes_mysql.o dtrace_files dtrace_providers
 ha_archive_la_LIBADD = probes_sh_mysql.o
 ha_archive_la_DEPENDENCIES = probes_sh_mysql.o dtrace_shared_files dtrace_providers
 
-CLEANFILES = $(DTRACEPROVIDER) dtrace_files dtrace_providers dtrace_shared_files
+CLEANFILES = $(DTRACEPROVIDER) dtrace_files dtrace_providers dtrace_shared_files dtrace_sources
 DTRACEFILES = libarchive_a-ha_archive.o
 DTRACESHAREDFILES = .libs/ha_archive_la-ha_archive.o
+# Hack: We "depend" on ".libs/" but have no rule for it,
+# but it is created as a byproduct of the ".lo"
+DTRACESHAREDDEPEND = ha_archive_la-ha_archive.lo
 DTRACEPROVIDER = probes_mysql.d
 
 dtrace_files:
@@ -93,7 +96,7 @@ probes_mysql.d:
 	$(CP) $(top_srcdir)/include/probes_mysql.d.base probes_mysql.d
 	echo timestamp > dtrace_sources
 
-probes_sh_mysql.o: $(DTRACEPROVIDER) $(DTRACESHAREDFILES)
+probes_sh_mysql.o: $(DTRACEPROVIDER) $(DTRACESHAREDDEPEND)
 	$(DTRACE) $(DTRACEFLAGS) -G -s $(DTRACEPROVIDER) $(DTRACESHAREDFILES) -o $@
 
 probes_mysql.o: $(DTRACEPROVIDER) $(DTRACEFILES)
diff --git a/storage/ibmdb2i/db2i_charsetSupport.cc b/storage/ibmdb2i/db2i_charsetSupport.cc
index 83bf1b9448b..f5a3a74025e 100644
--- a/storage/ibmdb2i/db2i_charsetSupport.cc
+++ b/storage/ibmdb2i/db2i_charsetSupport.cc
@@ -164,10 +164,10 @@ int32 initCharsetSupport()
   }
 
   VOID(pthread_mutex_init(&textDescMapHashMutex,MY_MUTEX_INIT_FAST));
-  hash_init(&textDescMapHash, &my_charset_bin, 10, offsetof(TextDescMap, hashKey), sizeof(TextDescMap::hashKey), 0, 0, HASH_UNIQUE);
+  my_hash_init(&textDescMapHash, &my_charset_bin, 10, offsetof(TextDescMap, hashKey), sizeof(TextDescMap::hashKey), 0, 0, HASH_UNIQUE);
 
   VOID(pthread_mutex_init(&iconvMapHashMutex,MY_MUTEX_INIT_FAST));
-  hash_init(&iconvMapHash, &my_charset_bin, 10, offsetof(IconvMap, hashKey), sizeof(IconvMap::hashKey), 0, 0, HASH_UNIQUE);
+  my_hash_init(&iconvMapHash, &my_charset_bin, 10, offsetof(IconvMap, hashKey), sizeof(IconvMap::hashKey), 0, 0, HASH_UNIQUE);
 
   init_alloc_root(&textDescMapMemroot, 2048, 0);
   init_alloc_root(&iconvMapMemroot, 256, 0);
@@ -191,9 +191,9 @@ void doneCharsetSupport()
   free_root(&iconvMapMemroot, 0);
   
   pthread_mutex_destroy(&textDescMapHashMutex);
-  hash_free(&textDescMapHash);
+  my_hash_free(&textDescMapHash);
   pthread_mutex_destroy(&iconvMapHashMutex);
-  hash_free(&iconvMapHash);
+  my_hash_free(&iconvMapHash);
   free_aligned(QlgCvtTextDescToDesc_sym);
 }
 
@@ -415,7 +415,7 @@ static int32 convertTextDesc(const int32 inType, const int32 outType, const char
   memcpy(hashKey.inDesc, inDescOverride, len);
   memset(hashKey.inDesc+len, 0, sizeof(hashKey.inDesc) - len);
   
-  if (!(mapping=(TextDescMap *) hash_search(&textDescMapHash,
+  if (!(mapping=(TextDescMap *) my_hash_search(&textDescMapHash,
                                            (const uchar*)&hashKey,
                                            sizeof(hashKey))))
   {
@@ -748,7 +748,7 @@ int32 getConversion(enum_conversionDirection direction, const CHARSET_INFO* cs,
   
   /* Look for the conversion in the cache and add it if it is not there. */
   IconvMap *mapping;
-  if (!(mapping= (IconvMap *) hash_search(&iconvMapHash,
+  if (!(mapping= (IconvMap *) my_hash_search(&iconvMapHash,
                                          (const uchar*)&hashKey,
                                          sizeof(hashKey))))
   {
diff --git a/storage/ibmdb2i/db2i_constraints.cc b/storage/ibmdb2i/db2i_constraints.cc
index 9a96eda1173..50af6c27898 100644
--- a/storage/ibmdb2i/db2i_constraints.cc
+++ b/storage/ibmdb2i/db2i_constraints.cc
@@ -102,7 +102,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex,
       Foreign_key* fk = (Foreign_key*)curKey;
       
       char db2LibName[MAX_DB2_SCHEMANAME_LENGTH+1];
-      if (fk->name)
+      if (fk->name.str)
       {
         char db2FKName[MAX_DB2_FILENAME_LENGTH+1];
         appendHere.append(STRING_WITH_LEN("CONSTRAINT "));
@@ -120,7 +120,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex,
         
         appendHere.append('.');
         
-        convertMySQLNameToDB2Name(fk->name, db2FKName, sizeof(db2FKName));
+        convertMySQLNameToDB2Name(fk->name.str, db2FKName, sizeof(db2FKName));
         appendHere.append(db2FKName);
       }
       
@@ -139,7 +139,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex,
         }
         firstTime = false;
         
-        convertMySQLNameToDB2Name(curColumn->field_name, colName, sizeof(colName));
+        convertMySQLNameToDB2Name(curColumn->field_name.str, colName, sizeof(colName));
         appendHere.append(colName);
 
         // DB2 requires that the sort sequence on the child table match the parent table's
@@ -148,7 +148,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex,
         Field** field = fields;
         do
         {
-          if (strcmp((*field)->field_name, curColumn->field_name) == 0)
+          if (strcmp((*field)->field_name, curColumn->field_name.str) == 0)
           {
             int rc = updateAssociatedSortSequence((*field)->charset(),
                                                   fileSortSequenceType,
@@ -199,7 +199,7 @@ int ha_ibmdb2i::buildDB2ConstraintString(LEX* lex,
           }
           firstTime = false;
 
-          convertMySQLNameToDB2Name(curRef->field_name, colName, sizeof(colName));
+          convertMySQLNameToDB2Name(curRef->field_name.str, colName, sizeof(colName));
           appendHere.append(colName);
         }
 
diff --git a/storage/ibmdb2i/ha_ibmdb2i.cc b/storage/ibmdb2i/ha_ibmdb2i.cc
index 0fc2d1e83dc..759562e3217 100644
--- a/storage/ibmdb2i/ha_ibmdb2i.cc
+++ b/storage/ibmdb2i/ha_ibmdb2i.cc
@@ -284,8 +284,8 @@ static int ibmdb2i_init_func(void *p)
   was_ILE_inited = false;
   ibmdb2i_hton= (handlerton *)p;
   VOID(pthread_mutex_init(&ibmdb2i_mutex,MY_MUTEX_INIT_FAST));
-  (void) hash_init(&ibmdb2i_open_tables,system_charset_info,32,0,0,
-                   (hash_get_key) ibmdb2i_get_key,0,0);
+  (void) my_hash_init(&ibmdb2i_open_tables,system_charset_info,32,0,0,
+                   (my_hash_get_key) ibmdb2i_get_key,0,0);
 
   ibmdb2i_hton->state=   SHOW_OPTION_YES;
   ibmdb2i_hton->create=  ibmdb2i_create_handler;
@@ -340,7 +340,7 @@ static int ibmdb2i_done_func(void *p)
   
   doneCharsetSupport();
 
-  hash_free(&ibmdb2i_open_tables);
+  my_hash_free(&ibmdb2i_open_tables);
   pthread_mutex_destroy(&ibmdb2i_mutex);
   
   DBUG_RETURN(0);
@@ -356,7 +356,7 @@ IBMDB2I_SHARE *ha_ibmdb2i::get_share(const char *table_name, TABLE *table)
   pthread_mutex_lock(&ibmdb2i_mutex);
   length=(uint) strlen(table_name);
 
-  if (!(share=(IBMDB2I_SHARE*) hash_search(&ibmdb2i_open_tables,
+  if (!(share=(IBMDB2I_SHARE*) my_hash_search(&ibmdb2i_open_tables,
                                            (uchar*)table_name,
                                            length)))
   {
@@ -387,7 +387,7 @@ IBMDB2I_SHARE *ha_ibmdb2i::get_share(const char *table_name, TABLE *table)
     if (rc)
     {
       delete share->db2Table;
-      hash_delete(&ibmdb2i_open_tables, (uchar*) share);
+      my_hash_delete(&ibmdb2i_open_tables, (uchar*) share);
       thr_lock_delete(&share->lock);
       my_errno = rc;
       goto error;
@@ -420,7 +420,7 @@ int ha_ibmdb2i::free_share(IBMDB2I_SHARE *share)
     delete share->db2Table;
     db2Table = NULL;
 
-    hash_delete(&ibmdb2i_open_tables, (uchar*) share);
+    my_hash_delete(&ibmdb2i_open_tables, (uchar*) share);
     thr_lock_delete(&share->lock);
     pthread_mutex_destroy(&share->mutex);
     my_free(share, MYF(0));