1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some compiler warnings

Browse Source 
include/m_ctype.h:
  MY_UNICASE_INFO already includes 'const'
plugin/auth/dialog.c:
  Fixed parameters to have correct signed/unsigned type
sql/sql_acl.cc:
  old_password_plugin is not used for EMBEDDED_LIBRARY
storage/pbxt/src/ha_pbxt.cc:
  Remove not used variable
This commit is contained in:
Michael Widenius 2010-03-31 21:37:45 +03:00
parent 515c2db030
commit fee40e2773
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/m_ctype.h
View File

@ -291,7 +291,7 @@ struct charset_info_st
const uint16 *const *sort_order_big; const uint16 *const *sort_order_big;
const uint16 *tab_to_uni; const uint16 *tab_to_uni;
MY_UNI_IDX *tab_from_uni; MY_UNI_IDX *tab_from_uni;
const MY_UNICASE_INFO *const *caseinfo; MY_UNICASE_INFO *const *caseinfo;
const uchar *state_map; const uchar *state_map;
const uchar *ident_map; const uchar *ident_map;
uint strxfrm_multiply; uint strxfrm_multiply;

22
plugin/auth/dialog.c
View File

@ -51,6 +51,8 @@
#define PASSWORD_QUESTION "\4" #define PASSWORD_QUESTION "\4"
#define LAST_PASSWORD "\5" #define LAST_PASSWORD "\5"
typedef unsigned char uchar;
/********************* SERVER SIDE ****************************************/ /********************* SERVER SIDE ****************************************/
/** /**
@ -63,7 +65,9 @@ static int two_questions(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
int pkt_len; int pkt_len;
/* send a password question */ /* send a password question */
if (vio->write_packet(vio, PASSWORD_QUESTION "Password, please:", 18)) if (vio->write_packet(vio,
(const uchar*) (PASSWORD_QUESTION "Password, please:"),
18))
return CR_ERROR; return CR_ERROR;
/* read the answer */ /* read the answer */
@ -73,11 +77,12 @@ static int two_questions(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
info->password_used = 1; info->password_used = 1;
/* fail if the password is wrong */ /* fail if the password is wrong */
if (strcmp(pkt, info->auth_string)) if (strcmp((char*) pkt, info->auth_string))
return CR_ERROR; return CR_ERROR;
/* send the last, ordinary, question */ /* send the last, ordinary, question */
if (vio->write_packet(vio, LAST_QUESTION "Are you sure ?", 15)) if (vio->write_packet(vio,
(const uchar*) (LAST_QUESTION "Are you sure ?"), 15))
return CR_ERROR; return CR_ERROR;
/* read the answer */ /* read the answer */
@ -85,7 +90,7 @@ static int two_questions(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
return CR_ERROR; return CR_ERROR;
/* check the reply */ /* check the reply */
return strcmp(pkt, "yes, of course") ? CR_ERROR : CR_OK; return strcmp((char*) pkt, "yes, of course") ? CR_ERROR : CR_OK;
} }
static struct st_mysql_auth two_handler= static struct st_mysql_auth two_handler=
@ -108,7 +113,8 @@ static int three_attempts(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
for (i= 0; i < 3; i++) for (i= 0; i < 3; i++)
{ {
/* send the prompt */ /* send the prompt */
if (vio->write_packet(vio, PASSWORD_QUESTION "Password, please:", 18)) if (vio->write_packet(vio,
(const uchar*) (PASSWORD_QUESTION "Password, please:"), 18))
return CR_ERROR; return CR_ERROR;
/* read the password */ /* read the password */
@ -121,7 +127,7 @@ static int three_attempts(MYSQL_PLUGIN_VIO *vio, MYSQL_SERVER_AUTH_INFO *info)
finish, if the password is correct. finish, if the password is correct.
note, that we did not mark the prompt packet as "last" note, that we did not mark the prompt packet as "last"
*/ */
if (strcmp(pkt, info->auth_string) == 0) if (strcmp((char*) pkt, info->auth_string) == 0)
return CR_OK; return CR_OK;
} }
@ -255,12 +261,12 @@ static int perform_dialog(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
if ((cmd >> 1) == 2 && *pkt == 0) if ((cmd >> 1) == 2 && *pkt == 0)
reply= mysql->passwd; reply= mysql->passwd;
else else
reply= ask(mysql, cmd >> 1, pkt, reply_buf, sizeof(reply_buf)); reply= ask(mysql, cmd >> 1, (char*) pkt, reply_buf, sizeof(reply_buf));
if (!reply) if (!reply)
return CR_ERROR; return CR_ERROR;
} }
/* send the reply to the server */ /* send the reply to the server */
res= vio->write_packet(vio, reply, strlen(reply)+1); res= vio->write_packet(vio, (uchar*) reply, strlen(reply)+1);
if (reply != mysql->passwd && reply != reply_buf) if (reply != mysql->passwd && reply != reply_buf)
free(reply); free(reply);

5
sql/sql_acl.cc
View File

@ -161,7 +161,10 @@ static LEX_STRING old_password_plugin_name= {
/// @todo make it configurable /// @todo make it configurable
LEX_STRING *default_auth_plugin_name= &native_password_plugin_name; LEX_STRING *default_auth_plugin_name= &native_password_plugin_name;
static plugin_ref native_password_plugin, old_password_plugin; static plugin_ref native_password_plugin;
#ifndef EMBEDDED_LIBRARY
static plugin_ref old_password_plugin;
#endif
/* Classes */ /* Classes */

2
storage/pbxt/src/ha_pbxt.cc
View File

@ -1215,8 +1215,6 @@ static int pbxt_init(void *p)
THD *thd = NULL; THD *thd = NULL;
#ifndef DRIZZLED #ifndef DRIZZLED
extern myxt_mutex_t LOCK_plugin;
/* {MYSQL QUIRK} /* {MYSQL QUIRK}
* I have to release this lock for PBXT recovery to * I have to release this lock for PBXT recovery to
* work, because it needs to open .frm files. * work, because it needs to open .frm files.