diff options
Diffstat (limited to 'plugin/feedback/utils.cc')
| -rw-r--r-- | plugin/feedback/utils.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/plugin/feedback/utils.cc b/plugin/feedback/utils.cc index 7530003182f..0805a6e1d76 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 @@ -420,7 +417,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)) @@ -429,7 +426,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); |