Commit a7fb0daa authored by John Esmet's avatar John Esmet Committed by Yoni Fogel

close[t:4445] initialize charset num to an accetable default value, 0

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@39337 c7de825b-a66e-492c-adef-691d508d4ae1
parent 83e3d8c8
...@@ -2633,7 +2633,7 @@ u_int32_t pack_key_from_desc( ...@@ -2633,7 +2633,7 @@ u_int32_t pack_key_from_desc(
has_charset = desc_pos[0]; has_charset = desc_pos[0];
desc_pos++; desc_pos++;
u_int32_t charset_num; u_int32_t charset_num = 0;
if (has_charset == COL_HAS_CHARSET) { if (has_charset == COL_HAS_CHARSET) {
memcpy(&charset_num, desc_pos, sizeof(charset_num)); memcpy(&charset_num, desc_pos, sizeof(charset_num));
desc_pos += sizeof(charset_num); desc_pos += sizeof(charset_num);
......
#if !defined(TOKU_MYSQL_PRIV_H) #if !defined(TOKU_MYSQL_PRIV_H)
#define TOKUMYSQL_PRIV_H #define TOKU_MYSQL_PRIV_H
#include <sys/time.h>
#include <stdio.h>
static long current_time_usec(void)
{
(void) current_time_usec;
struct timeval t;
gettimeofday(&t, NULL);
return t.tv_sec * 1000000 + t.tv_usec;
}
#include "mysql_version.h" #include "mysql_version.h"
#if MYSQL_VERSION_ID < 50506 #if MYSQL_VERSION_ID < 50506
#include "mysql_priv.h" #include "mysql_priv.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment