Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

6 files changed, 8 insertions, 11 deletions

diff --git a/plugin/feedback/feedback.cc b/plugin/feedback/feedback.cc
index c7861d99004..bd433efa4d3 100644
--- a/plugin/feedback/feedback.cc
+++ b/plugin/feedback/feedback.cc
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 #include "feedback.h"
 
diff --git a/plugin/feedback/feedback.h b/plugin/feedback/feedback.h
index bb3f896288d..5e7e7b1516e 100644
--- a/plugin/feedback/feedback.h
+++ b/plugin/feedback/feedback.h
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 #define MYSQL_SERVER 1
 #include <sql_class.h>
diff --git a/plugin/feedback/sender_thread.cc b/plugin/feedback/sender_thread.cc
index 16cdfe5574a..66f47e7302a 100644
--- a/plugin/feedback/sender_thread.cc
+++ b/plugin/feedback/sender_thread.cc
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 #include "feedback.h"
 #include <sql_acl.h>
diff --git a/plugin/feedback/url_base.cc b/plugin/feedback/url_base.cc
index 6afbcd7c8f4..44cb0b00c95 100644
--- a/plugin/feedback/url_base.cc
+++ b/plugin/feedback/url_base.cc
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 #include "feedback.h"
 
diff --git a/plugin/feedback/url_http.cc b/plugin/feedback/url_http.cc
index cec3f60505c..4851097e63f 100644
--- a/plugin/feedback/url_http.cc
+++ b/plugin/feedback/url_http.cc
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 #include "feedback.h"
 
diff --git a/plugin/feedback/utils.cc b/plugin/feedback/utils.cc
index feffc38645d..a43dad8d630 100644
--- a/plugin/feedback/utils.cc
+++ b/plugin/feedback/utils.cc
@@ -11,7 +11,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 #include "feedback.h"
 
@@ -19,9 +19,6 @@
 #include <unistd.h>
 #endif
 
-#include <base64.h>
-#include <sha1.h>
-
 #if defined (_WIN32)
 #define HAVE_SYS_UTSNAME_H
 
@@ -418,7 +415,7 @@ int fill_collation_statistics(THD *thd, TABLE_LIST *tables)
 int calculate_server_uid(char *dest)
 {
   uchar rawbuf[2 + 6];
-  uchar shabuf[SHA1_HASH_SIZE];
+  uchar shabuf[MY_SHA1_HASH_SIZE];
 
   int2store(rawbuf, mysqld_port);
   if (my_gethwaddr(rawbuf + 2))
@@ -427,7 +424,7 @@ int calculate_server_uid(char *dest)
     return 1;
   }
 
-  compute_sha1_hash((uint8*) shabuf, (char*) rawbuf, sizeof(rawbuf));
+  my_sha1((uint8*) shabuf, (char*) rawbuf, sizeof(rawbuf));
 
   assert(my_base64_needed_encoded_length(sizeof(shabuf)) <= SERVER_UID_SIZE);
   my_base64_encode(shabuf, sizeof(shabuf), dest);