Skip to content

M
MariaDB
Commit ec08ea70 authored by unknown's avatar unknown
Browse files
Options

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
parents 27ecbeec e809f913
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 18 deletions
BUILD/check-cpu
View file @ ec08ea70
...@@ -177,8 +177,7 @@ check_cpu () { ...@@ -177,8 +177,7 @@ check_cpu () {
touch __test.c touch __test.c
while [ "$cpu_arg" ] ; do while [ "$cpu_arg" ] ; do
# FIXME: echo -n isn't portable - see contortions autoconf goes through printf "testing $cpu_arg ... " >&2
echo -n testing $cpu_arg "... " >&2
# compile check # compile check
check_cpu_cflags=`eval echo $check_cpu_args` check_cpu_cflags=`eval echo $check_cpu_args`
......
VC++Files/mysys/mysys.vcproj
View file @ ec08ea70
...@@ -3417,6 +3417,49 @@ ...@@ -3417,6 +3417,49 @@
PreprocessorDefinitions=""/> PreprocessorDefinitions=""/>
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="my_getpagesize.c">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Max|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="TLS_DEBUG|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="TLS|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File <File
RelativePath="my_mmap.c"> RelativePath="my_mmap.c">
<FileConfiguration <FileConfiguration
......
client/mysql_upgrade.c
View file @ ec08ea70
...@@ -143,6 +143,7 @@ void set_extra_default(int id, const struct my_option *opt) ...@@ -143,6 +143,7 @@ void set_extra_default(int id, const struct my_option *opt)
case 'f': /* --force is ours */ case 'f': /* --force is ours */
case 'u': /* --user passed on cmdline */ case 'u': /* --user passed on cmdline */
case 'T': /* --debug-info is not accepted by mysqlcheck */ case 'T': /* --debug-info is not accepted by mysqlcheck */
case 'p': /* --password may change yet */
/* so, do nothing */ /* so, do nothing */
break; break;
default: default:
...@@ -174,7 +175,7 @@ void set_extra_default(int id, const struct my_option *opt) ...@@ -174,7 +175,7 @@ void set_extra_default(int id, const struct my_option *opt)
d->id= id; d->id= id;
d->name= opt->name; d->name= opt->name;
d->n_len= strlen(opt->name); d->n_len= strlen(opt->name);
if (opt->arg_type != NO_ARG) if (opt->arg_type != NO_ARG && opt->value)
switch (opt->var_type & GET_TYPE_MASK) { switch (opt->var_type & GET_TYPE_MASK) {
case GET_BOOL: case GET_BOOL:
if (*((int *)opt->value)) if (*((int *)opt->value))
...@@ -320,6 +321,15 @@ static int create_defaults_file(const char *path, const char *forced_path) ...@@ -320,6 +321,15 @@ static int create_defaults_file(const char *path, const char *forced_path)
} }
dynstr_set(&buf, "\n[client]"); dynstr_set(&buf, "\n[client]");
if (opt_password)
{
if (dynstr_append(&buf, "\npassword=")
|| dynstr_append(&buf, opt_password))
{
ret = 1;
goto error;
}
}
while (extra_defaults) while (extra_defaults)
{ {
int len; int len;
......
mysql-test/t/myisam.test
View file @ ec08ea70
...@@ -498,7 +498,7 @@ insert into t1 values (1),(2),(3),(4),(5),(6); ...@@ -498,7 +498,7 @@ insert into t1 values (1),(2),(3),(4),(5),(6);
insert into t2 values (1,1),(2,1); insert into t2 values (1,1),(2,1);
lock tables t1 read local, t2 read local; lock tables t1 read local, t2 read local;
select straight_join * from t1,t2 force index (primary) where t1.a=t2.a; select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock); connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
insert into t2 values(2,0); insert into t2 values(2,0);
disconnect root; disconnect root;
connection default; connection default;
......
mysql-test/t/query_cache_notembedded.test
View file @ ec08ea70
...@@ -81,12 +81,12 @@ drop table t1, t2, t3, t11, t21; ...@@ -81,12 +81,12 @@ drop table t1, t2, t3, t11, t21;
# #
# do not use QC if tables locked (BUG#12385) # do not use QC if tables locked (BUG#12385)
# #
connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock); connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connection root; connection root;
CREATE TABLE t1 ( a INT NOT NULL PRIMARY KEY AUTO_INCREMENT ) ENGINE = CREATE TABLE t1 ( a INT NOT NULL PRIMARY KEY AUTO_INCREMENT ) ENGINE =
MyISAM; MyISAM;
LOCK TABLE t1 READ LOCAL; LOCK TABLE t1 READ LOCAL;
connect (root2,localhost,root,,test,$MASTER_MYPORT,master.sock); connect (root2,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connection root2; connection root2;
INSERT INTO t1 VALUES (), (), (); INSERT INTO t1 VALUES (), (), ();
connection root; connection root;
......
mysql-test/t/rpl000015.test
View file @ ec08ea70
connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock); connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
connection master; connection master;
reset master; reset master;
show master status; show master status;
......
mysql-test/t/rpl000017.test
View file @ ec08ea70
connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock); connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
connection master; connection master;
reset master; reset master;
grant replication slave on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab'; grant replication slave on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab';
......
mysql-test/t/rpl_rotate_logs.test
View file @ ec08ea70
...@@ -16,7 +16,7 @@ connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); ...@@ -16,7 +16,7 @@ connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
--disable_warnings --disable_warnings
drop table if exists t1, t2, t3, t4; drop table if exists t1, t2, t3, t4;
--enable_warnings --enable_warnings
connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock); connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
system cat /dev/null > $MYSQLTEST_VARDIR/slave-data/master.info; system cat /dev/null > $MYSQLTEST_VARDIR/slave-data/master.info;
system chmod 000 $MYSQLTEST_VARDIR/slave-data/master.info; system chmod 000 $MYSQLTEST_VARDIR/slave-data/master.info;
connection slave; connection slave;
......
scripts/mysql_secure_installation.sh
View file @ ec08ea70
...@@ -21,6 +21,16 @@ command=".mysql.$$" ...@@ -21,6 +21,16 @@ command=".mysql.$$"
trap "interrupt" 2 trap "interrupt" 2
rootpass="" rootpass=""
echo_n=
echo_c=
set_echo_compat() {
case `echo "testing\c"`,`echo -n testing` in
*c*,-n*) echo_n= echo_c= ;;
*c*,*) echo_n=-n echo_c= ;;
*) echo_n= echo_c='\c' ;;
esac
}
prepare() { prepare() {
touch $config $command touch $config $command
...@@ -44,7 +54,7 @@ get_root_password() { ...@@ -44,7 +54,7 @@ get_root_password() {
status=1 status=1
while [ $status -eq 1 ]; do while [ $status -eq 1 ]; do
stty -echo stty -echo
echo -n "Enter current password for root (enter for none): " echo $echo_n "Enter current password for root (enter for none): $echo_c"
read password read password
echo echo
stty echo stty echo
...@@ -64,10 +74,10 @@ get_root_password() { ...@@ -64,10 +74,10 @@ get_root_password() {
set_root_password() { set_root_password() {
stty -echo stty -echo
echo -n "New password: " echo $echo_n "New password: $echo_c"
read password1 read password1
echo echo
echo -n "Re-enter new password: " echo $echo_n "Re-enter new password: $echo_c"
read password2 read password2
echo echo
stty echo stty echo
...@@ -172,6 +182,7 @@ cleanup() { ...@@ -172,6 +182,7 @@ cleanup() {
# The actual script starts here # The actual script starts here
prepare prepare
set_echo_compat
echo echo
echo echo
...@@ -200,11 +211,11 @@ echo "root user without the proper authorisation." ...@@ -200,11 +211,11 @@ echo "root user without the proper authorisation."
echo echo
if [ $hadpass -eq 0 ]; then if [ $hadpass -eq 0 ]; then
echo -n "Set root password? [Y/n] " echo $echo_n "Set root password? [Y/n] $echo_c"
else else
echo "You already have a root password set, so you can safely answer 'n'." echo "You already have a root password set, so you can safely answer 'n'."
echo echo
echo -n "Change the root password? [Y/n] " echo $echo_n "Change the root password? [Y/n] $echo_c"
fi fi
read reply read reply
...@@ -231,7 +242,7 @@ echo "go a bit smoother. You should remove them before moving into a" ...@@ -231,7 +242,7 @@ echo "go a bit smoother. You should remove them before moving into a"
echo "production environment." echo "production environment."
echo echo
echo -n "Remove anonymous users? [Y/n] " echo $echo_n "Remove anonymous users? [Y/n] $echo_c"
read reply read reply
if [ "$reply" = "n" ]; then if [ "$reply" = "n" ]; then
...@@ -250,7 +261,7 @@ echo "Normally, root should only be allowed to connect from 'localhost'. This" ...@@ -250,7 +261,7 @@ echo "Normally, root should only be allowed to connect from 'localhost'. This"
echo "ensures that someone cannot guess at the root password from the network." echo "ensures that someone cannot guess at the root password from the network."
echo echo
echo -n "Disallow root login remotely? [Y/n] " echo $echo_n "Disallow root login remotely? [Y/n] $echo_c"
read reply read reply
if [ "$reply" = "n" ]; then if [ "$reply" = "n" ]; then
echo " ... skipping." echo " ... skipping."
...@@ -269,7 +280,7 @@ echo "access. This is also intended only for testing, and should be removed" ...@@ -269,7 +280,7 @@ echo "access. This is also intended only for testing, and should be removed"
echo "before moving into a production environment." echo "before moving into a production environment."
echo echo
echo -n "Remove test database and access to it? [Y/n] " echo $echo_n "Remove test database and access to it? [Y/n] $echo_c"
read reply read reply
if [ "$reply" = "n" ]; then if [ "$reply" = "n" ]; then
echo " ... skipping." echo " ... skipping."
...@@ -287,7 +298,7 @@ echo "Reloading the privilege tables will ensure that all changes made so far" ...@@ -287,7 +298,7 @@ echo "Reloading the privilege tables will ensure that all changes made so far"
echo "will take effect immediately." echo "will take effect immediately."
echo echo
echo -n "Reload privilege tables now? [Y/n] " echo $echo_n "Reload privilege tables now? [Y/n] $echo_c"
read reply read reply
if [ "$reply" = "n" ]; then if [ "$reply" = "n" ]; then
echo " ... skipping." echo " ... skipping."
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7