small cleanup

include/hash.h

@@ -1,4 +1,5 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2010, Oracle and/or its affiliates.
+   Copyright (c) 2011, 2013, Monty Program Ab.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -60,11 +61,8 @@ typedef struct st_hash {
 /* A search iterator state */
 typedef uint HASH_SEARCH_STATE;
 
-#define my_hash_init(A,B,C,D,E,F,G,H) \
+#define my_hash_init(A,B,C,D,E,F,G,H) my_hash_init2(A,0,B,C,D,E,F,G,H)
-          _my_hash_init(A,0,B,C,D,E,F,G,H)
+my_bool my_hash_init2(HASH *hash, uint growth_size, CHARSET_INFO *charset,
-#define my_hash_init2(A,B,C,D,E,F,G,H,I) \
-          _my_hash_init(A,B,C,D,E,F,G,H,I)
-my_bool _my_hash_init(HASH *hash, uint growth_size, CHARSET_INFO *charset,
                       ulong default_array_elements, size_t key_offset,
                       size_t key_length, my_hash_get_key get_key,
                       void (*free_element)(void*),
@@ -98,7 +96,7 @@ my_bool my_hash_iterate(HASH *hash, my_hash_walk_action action, void *argument);
 #define my_hash_clear(H) bzero((char*) (H), sizeof(*(H)))
 #define my_hash_inited(H) ((H)->blength != 0)
 #define my_hash_init_opt(A,B,C,D,E,F,G,H) \
-          (!my_hash_inited(A) && _my_hash_init(A,0,B,C,D,E,F,G,H))
+          (!my_hash_inited(A) && my_hash_init(A,B,C,D,E,F,G,H))
 
 #ifdef	__cplusplus
 }

mysql-test/suite/archive/archive.test

@@ -3,7 +3,6 @@
 # Taken FROM the select test
 #
 -- source include/have_archive.inc
--- source include/have_binlog_format_mixed_or_statement.inc
 
 CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 call mtr.add_suppression("Table 't1' is marked as crashed and should be repaired");

mysys/hash.c

@@ -1,4 +1,5 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2010, Oracle and/or its affiliates.
+   Copyright (c) 2011, 2013, Monty Program Ab.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -59,6 +60,7 @@ static my_hash_value_type calc_hash(const HASH *hash,
   as required during insertion.
 
   @param[in,out] hash         The hash that is initialized
+  @param[in[     growth_size  size incrememnt for the underlying dynarray
   @param[in]     charset      The charater set information
   @param[in]     size         The hash size
   @param[in]     key_offest   The key offset for the hash
@@ -72,7 +74,7 @@ static my_hash_value_type calc_hash(const HASH *hash,
     @retval 1 failure
 */
 my_bool
-_my_hash_init(HASH *hash, uint growth_size, CHARSET_INFO *charset,
+my_hash_init2(HASH *hash, uint growth_size, CHARSET_INFO *charset,
               ulong size, size_t key_offset, size_t key_length,
               my_hash_get_key get_key,
               void (*free_element)(void*), uint flags)

sql/my_apc.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2011 - 2012, Monty Program Ab
+   Copyright (c) 2011, 2013 Monty Program Ab.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,6 @@
 
 #ifndef MY_APC_STANDALONE
 
-#include "sql_priv.h"
 #include "sql_class.h"
 
 #endif

sql/my_apc.h

@@ -1,7 +1,7 @@
-#ifndef INCLUDES_MY_APC_H
+#ifndef SQL_MY_APC_INCLUDED
-#define INCLUDES_MY_APC_H
+#define SQL_MY_APC_INCLUDED
 /*
-   Copyright (c) 2011 - 2012, Monty Program Ab
+   Copyright (c) 2011, 2013 Monty Program Ab.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -134,5 +134,5 @@ private:
 void init_show_explain_psi_keys(void);
 #endif
 
-#endif //INCLUDES_MY_APC_H
+#endif //SQL_MY_APC_INCLUDED
 

storage/archive/ha_archive.cc

@@ -1,5 +1,6 @@
 /*
    Copyright (c) 2004, 2012, Oracle and/or its affiliates
+   Copyright (c) 2010, 2013 Monty Program Ab.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -1812,23 +1813,6 @@ void ha_archive::destroy_record_buffer(archive_record_buffer *r)
 struct st_mysql_storage_engine archive_storage_engine=
 { MYSQL_HANDLERTON_INTERFACE_VERSION };
 
-mysql_declare_plugin(archive)
-{
-  MYSQL_STORAGE_ENGINE_PLUGIN,
-  &archive_storage_engine,
-  "ARCHIVE",
-  "Brian Aker, MySQL AB",
-  "Archive storage engine",
-  PLUGIN_LICENSE_GPL,
-  archive_db_init, /* Plugin Init */
-  archive_db_done, /* Plugin Deinit */
-  0x0300 /* 3.0 */,
-  NULL,                       /* status variables                */
-  NULL,                       /* system variables                */
-  NULL,                       /* config options                  */
-  0,                          /* flags                           */
-}
-mysql_declare_plugin_end;
 maria_declare_plugin(archive)
 {
   MYSQL_STORAGE_ENGINE_PLUGIN,