mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Fixed a bug in password handling. All related to Bug#5955.
This commit is contained in:

parent
092d1a5084
commit
a44b6b67a5
@@ -66,6 +66,7 @@ igor@rurik.mysql.com
|
|||||||
ingo@mysql.com
|
ingo@mysql.com
|
||||||
jan@hundin.mysql.fi
|
jan@hundin.mysql.fi
|
||||||
jani@a80-186-24-72.elisa-laajakaista.fi
|
jani@a80-186-24-72.elisa-laajakaista.fi
|
||||||
|
jani@a80-186-41-201.elisa-laajakaista.fi
|
||||||
jani@dsl-jkl1657.dial.inet.fi
|
jani@dsl-jkl1657.dial.inet.fi
|
||||||
jani@dsl-kpogw4gb5.dial.inet.fi
|
jani@dsl-kpogw4gb5.dial.inet.fi
|
||||||
jani@hynda.(none)
|
jani@hynda.(none)
|
||||||
|
@@ -25,7 +25,7 @@
|
|||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <mysql.h>
|
#include <mysql.h>
|
||||||
|
|
||||||
#define ADMIN_VERSION "8.40"
|
#define ADMIN_VERSION "8.41"
|
||||||
#define MAX_MYSQL_VAR 256
|
#define MAX_MYSQL_VAR 256
|
||||||
#define SHUTDOWN_DEF_TIMEOUT 3600 /* Wait for shutdown */
|
#define SHUTDOWN_DEF_TIMEOUT 3600 /* Wait for shutdown */
|
||||||
#define MAX_TRUNC_LENGTH 3
|
#define MAX_TRUNC_LENGTH 3
|
||||||
@@ -209,6 +209,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||||||
while (*argument) *argument++= 'x'; /* Destroy argument */
|
while (*argument) *argument++= 'x'; /* Destroy argument */
|
||||||
if (*start)
|
if (*start)
|
||||||
start[1]=0; /* Cut length of argument */
|
start[1]=0; /* Cut length of argument */
|
||||||
|
tty_password= 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
tty_password=1;
|
tty_password=1;
|
||||||
|
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
/* By Jani Tolonen, 2001-04-20, MySQL Development Team */
|
/* By Jani Tolonen, 2001-04-20, MySQL Development Team */
|
||||||
|
|
||||||
#define CHECK_VERSION "2.4.3"
|
#define CHECK_VERSION "2.4.4"
|
||||||
|
|
||||||
#include "client_priv.h"
|
#include "client_priv.h"
|
||||||
#include <m_ctype.h>
|
#include <m_ctype.h>
|
||||||
@@ -246,6 +246,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||||||
while (*argument) *argument++= 'x'; /* Destroy argument */
|
while (*argument) *argument++= 'x'; /* Destroy argument */
|
||||||
if (*start)
|
if (*start)
|
||||||
start[1] = 0; /* Cut length of argument */
|
start[1] = 0; /* Cut length of argument */
|
||||||
|
tty_password= 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
tty_password = 1;
|
tty_password = 1;
|
||||||
|
@@ -37,7 +37,7 @@
|
|||||||
** 10 Jun 2003: SET NAMES and --no-set-names by Alexander Barkov
|
** 10 Jun 2003: SET NAMES and --no-set-names by Alexander Barkov
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define DUMP_VERSION "10.7"
|
#define DUMP_VERSION "10.8"
|
||||||
|
|
||||||
#include <my_global.h>
|
#include <my_global.h>
|
||||||
#include <my_sys.h>
|
#include <my_sys.h>
|
||||||
@@ -486,6 +486,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||||||
while (*argument) *argument++= 'x'; /* Destroy argument */
|
while (*argument) *argument++= 'x'; /* Destroy argument */
|
||||||
if (*start)
|
if (*start)
|
||||||
start[1]=0; /* Cut length of argument */
|
start[1]=0; /* Cut length of argument */
|
||||||
|
tty_password= 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
tty_password=1;
|
tty_password=1;
|
||||||
|
@@ -25,7 +25,7 @@
|
|||||||
** * *
|
** * *
|
||||||
** *************************
|
** *************************
|
||||||
*/
|
*/
|
||||||
#define IMPORT_VERSION "3.4"
|
#define IMPORT_VERSION "3.5"
|
||||||
|
|
||||||
#include "client_priv.h"
|
#include "client_priv.h"
|
||||||
#include "mysql_version.h"
|
#include "mysql_version.h"
|
||||||
@@ -191,6 +191,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||||||
while (*argument) *argument++= 'x'; /* Destroy argument */
|
while (*argument) *argument++= 'x'; /* Destroy argument */
|
||||||
if (*start)
|
if (*start)
|
||||||
start[1]=0; /* Cut length of argument */
|
start[1]=0; /* Cut length of argument */
|
||||||
|
tty_password= 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
tty_password= 1;
|
tty_password= 1;
|
||||||
|
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
/* Show databases, tables or columns */
|
/* Show databases, tables or columns */
|
||||||
|
|
||||||
#define SHOW_VERSION "9.4"
|
#define SHOW_VERSION "9.5"
|
||||||
|
|
||||||
#include "client_priv.h"
|
#include "client_priv.h"
|
||||||
#include <my_sys.h>
|
#include <my_sys.h>
|
||||||
@@ -257,6 +257,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||||||
while (*argument) *argument++= 'x'; /* Destroy argument */
|
while (*argument) *argument++= 'x'; /* Destroy argument */
|
||||||
if (*start)
|
if (*start)
|
||||||
start[1]=0; /* Cut length of argument */
|
start[1]=0; /* Cut length of argument */
|
||||||
|
tty_password= 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
tty_password=1;
|
tty_password=1;
|
||||||
|
@@ -42,7 +42,7 @@
|
|||||||
|
|
||||||
**********************************************************************/
|
**********************************************************************/
|
||||||
|
|
||||||
#define MTEST_VERSION "2.1"
|
#define MTEST_VERSION "2.2"
|
||||||
|
|
||||||
#include <my_global.h>
|
#include <my_global.h>
|
||||||
#include <mysql_embed.h>
|
#include <mysql_embed.h>
|
||||||
@@ -2090,6 +2090,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|||||||
my_free(pass, MYF(MY_ALLOW_ZERO_PTR));
|
my_free(pass, MYF(MY_ALLOW_ZERO_PTR));
|
||||||
pass= my_strdup(argument, MYF(MY_FAE));
|
pass= my_strdup(argument, MYF(MY_FAE));
|
||||||
while (*argument) *argument++= 'x'; /* Destroy argument */
|
while (*argument) *argument++= 'x'; /* Destroy argument */
|
||||||
|
tty_password= 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
tty_password= 1;
|
tty_password= 1;
|
||||||
|
Reference in New Issue
Block a user