#At lp:maria/5.2 based on revid:monty@askmonty.org-20100408095253-z8vg2u7fq6hf6jxy 2781 Michael Widenius 2010-04-08 Fixed compiler warnings Changed version string to beta modified: client/mysql.cc configure.in plugin/auth/dialog.c per-file messages: 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) === modified file 'client/mysql.cc' --- a/client/mysql.cc 2010-03-29 15:13:53 +0000 +++ b/client/mysql.cc 2010-04-08 13:02:49 +0000 @@ -4288,8 +4288,9 @@ extern "C" char *mysql_authentication_di } else { - fgets(buf, buf_len-1, stdin); - if (buf[0] && (s= strend(buf))[-1] == '\n') + if (!fgets(buf, buf_len-1, stdin)) + buf[0]= 0; + else if (buf[0] && (s= strend(buf))[-1] == '\n') s[-1]= 0; } === modified file 'configure.in' --- a/configure.in 2010-04-01 14:34:51 +0000 +++ b/configure.in 2010-04-08 13:02:49 +0000 @@ -12,7 +12,7 @@ AC_PREREQ(2.59) # MySQL version number. # # 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_CANONICAL_SYSTEM # USTAR format gives us the possibility to store longer path names in === modified file 'plugin/auth/dialog.c' --- a/plugin/auth/dialog.c 2010-04-01 14:34:51 +0000 +++ b/plugin/auth/dialog.c 2010-04-08 13:02:49 +0000 @@ -224,11 +224,11 @@ static mysql_authentication_dialog_ask_t static char *builtin_ask(MYSQL *mysql __attribute__((unused)), int type __attribute__((unused)), const char *prompt, - char *buf, int buf_len __attribute__((unused))) + char *buf, int buf_len) { fputs(prompt, stdout); fputc(' ', stdout); - if (gets(buf) == 0) + if (fgets(buf, buf_len, stdin) == 0) return 0; return buf;