Commit bf100db0 authored by Michael Widenius's avatar Michael Widenius

Fixed compiler warnings

Changed version string to beta

client/mysql.cc:
  Fixed compiler warning
configure.in:
  Changed version string to beta
plugin/auth/dialog.c:
  Fixed compiler warning (gets() is a not recommended function)
parent feca90ae
...@@ -4288,8 +4288,9 @@ extern "C" char *mysql_authentication_dialog_ask(MYSQL *mysql, int type, ...@@ -4288,8 +4288,9 @@ extern "C" char *mysql_authentication_dialog_ask(MYSQL *mysql, int type,
} }
else else
{ {
fgets(buf, buf_len-1, stdin); if (!fgets(buf, buf_len-1, stdin))
if (buf[0] && (s= strend(buf))[-1] == '\n') buf[0]= 0;
else if (buf[0] && (s= strend(buf))[-1] == '\n')
s[-1]= 0; s[-1]= 0;
} }
......
...@@ -12,7 +12,7 @@ AC_PREREQ(2.59) ...@@ -12,7 +12,7 @@ AC_PREREQ(2.59)
# MySQL version number. # MySQL version number.
# #
# Note: the following line must be parseable by win/configure.js:GetVersion() # Note: the following line must be parseable by win/configure.js:GetVersion()
AC_INIT([MariaDB Server], [5.2.0-MariaDB-alpha], [], [mysql]) AC_INIT([MariaDB Server], [5.2.0-MariaDB-beta], [], [mysql])
AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CONFIG_SRCDIR([sql/mysqld.cc])
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# USTAR format gives us the possibility to store longer path names in # USTAR format gives us the possibility to store longer path names in
......
...@@ -224,11 +224,11 @@ static mysql_authentication_dialog_ask_t ask; ...@@ -224,11 +224,11 @@ static mysql_authentication_dialog_ask_t ask;
static char *builtin_ask(MYSQL *mysql __attribute__((unused)), static char *builtin_ask(MYSQL *mysql __attribute__((unused)),
int type __attribute__((unused)), int type __attribute__((unused)),
const char *prompt, const char *prompt,
char *buf, int buf_len __attribute__((unused))) char *buf, int buf_len)
{ {
fputs(prompt, stdout); fputs(prompt, stdout);
fputc(' ', stdout); fputc(' ', stdout);
if (gets(buf) == 0) if (fgets(buf, buf_len, stdin) == 0)
return 0; return 0;
return buf; return buf;
......
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