Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
15aee374
Commit
15aee374
authored
Feb 10, 2003
by
monty@mashka.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
48558055
fbc9cd7e
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
56 additions
and
27 deletions
+56
-27
.bzrignore
.bzrignore
+14
-14
Build-tools/Do-compile
Build-tools/Do-compile
+8
-4
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+4
-1
mysql-test/r/count_distinct.result
mysql-test/r/count_distinct.result
+5
-0
mysql-test/t/count_distinct.test
mysql-test/t/count_distinct.test
+9
-0
scripts/mysqlaccess.sh
scripts/mysqlaccess.sh
+2
-2
scripts/mysqlhotcopy.sh
scripts/mysqlhotcopy.sh
+8
-3
sql/item_sum.cc
sql/item_sum.cc
+1
-2
sql/item_sum.h
sql/item_sum.h
+2
-0
sql/sql_acl.cc
sql/sql_acl.cc
+3
-1
No files found.
.bzrignore
View file @
15aee374
...
@@ -238,6 +238,8 @@ client/mysys_priv.h
...
@@ -238,6 +238,8 @@ client/mysys_priv.h
client/select_test
client/select_test
client/thimble
client/thimble
client/thread_test
client/thread_test
cmd-line-utils/libedit/common.h
comon.h
config.cache
config.cache
config.h
config.h
config.h.in
config.h.in
...
@@ -250,6 +252,7 @@ core.2430
...
@@ -250,6 +252,7 @@ core.2430
db-*.*.*
db-*.*.*
dbug/user.t
dbug/user.t
depcomp
depcomp
emacs.h
extra/comp_err
extra/comp_err
extra/my_print_defaults
extra/my_print_defaults
extra/mysql_install
extra/mysql_install
...
@@ -258,12 +261,17 @@ extra/perror
...
@@ -258,12 +261,17 @@ extra/perror
extra/replace
extra/replace
extra/resolve_stack_dump
extra/resolve_stack_dump
extra/resolveip
extra/resolveip
fcns.c
fcns.h
gmon.out
gmon.out
heap/hp_test1
heap/hp_test1
heap/hp_test2
heap/hp_test2
help.c
help.h
include/my_config.h
include/my_config.h
include/my_global.h
include/my_global.h
include/mysql_version.h
include/mysql_version.h
include/readline/readline.h
include/widec.h
include/widec.h
innobase/autom4te-2.53.cache/output.0
innobase/autom4te-2.53.cache/output.0
innobase/autom4te-2.53.cache/requests
innobase/autom4te-2.53.cache/requests
...
@@ -554,9 +562,14 @@ sql_prepare.cc
...
@@ -554,9 +562,14 @@ sql_prepare.cc
stamp-h
stamp-h
stamp-h.in
stamp-h.in
stamp-h1
stamp-h1
stamp-h2
stamp-h3
stamp-h4
strings/conf_to_src
strings/conf_to_src
strings/ctype_autoconf.c
strings/ctype_autoconf.c
strings/ctype_extra_sources.c
strings/ctype_extra_sources.c
support-files/MacOSX/Description.plist
support-files/MacOSX/Info.plist
support-files/binary-configure
support-files/binary-configure
support-files/my-huge.cnf
support-files/my-huge.cnf
support-files/my-large.cnf
support-files/my-large.cnf
...
@@ -578,21 +591,8 @@ tools/my_vsnprintf.c
...
@@ -578,21 +591,8 @@ tools/my_vsnprintf.c
tools/mysqlmanager
tools/mysqlmanager
tools/mysqlmngd
tools/mysqlmngd
tools/mysys_priv.h
tools/mysys_priv.h
vi.h
vio/test-ssl
vio/test-ssl
vio/test-sslclient
vio/test-sslclient
vio/test-sslserver
vio/test-sslserver
vio/viotest-ssl
vio/viotest-ssl
comon.h
emacs.h
fcns.c
fcns.h
help.h
help.c
vi.h
include/readline/readline.h
cmd-line-utils/libedit/common.h
stamp-h2
stamp-h3
stamp-h4
support-files/MacOSX/Description.plist
support-files/MacOSX/Info.plist
Build-tools/Do-compile
View file @
15aee374
...
@@ -75,13 +75,17 @@ if (@config_env > 0)
...
@@ -75,13 +75,17 @@ if (@config_env > 0)
}
}
chomp
(
$host
=
`
hostname
`);
chomp
(
$host
=
`
hostname
`);
chomp
(
$uname
=
`
uname
`);
$full_host_name
=
$host
;
$full_host_name
=
$host
;
$connect_option
=
(
$opt_tcpip
?
"
--host=
$host
"
:
"");
$connect_option
=
(
$opt_tcpip
?
"
--host=
$host
"
:
"");
$host
=~
/^([^.-]*)/
;
$host
=~
/^([^.-]*)/
;
$host
=
$1
.
$opt_suffix
;
$host
=
$1
.
$opt_suffix
;
$email
=
"
$opt_user
\
@mysql
.com
";
$email
=
"
$opt_user
\
@mysql
.com
";
$pwd
=
`
pwd
`;
chomp
(
$pwd
);
chomp
(
$pwd
=
`
pwd
`);
$log
=
"
$pwd
/Logs/
$host$opt_version_suffix
.log
";
$VER
=
`
basename
$opt_distribution
`;
chop
$VER
;
$VER
=~
/mysql.*-([1-9]\.[0-9]{1,2}\.[0-9]{1,2}.*)\.tar*/
;
$version
=
$1
;
(
$major
,
$minor
,
$release
)
=
split
(
/\./
,
$version
);
$log
=
"
$pwd
/Logs/
$host
-
$major
.
$minor$opt_version_suffix
.log
";
$opt_distribution
=~
/(mysql[^\/]*)\.tar/
;
$opt_distribution
=~
/(mysql[^\/]*)\.tar/
;
$ver
=
$1
;
$ver
=
$1
;
$gcc_version
=
which
("
gcc
");
$gcc_version
=
which
("
gcc
");
...
@@ -559,9 +563,9 @@ sub abort
...
@@ -559,9 +563,9 @@ sub abort
{
{
$mail_header_file
=
"
$opt_tmp
/do-command.$$
";
$mail_header_file
=
"
$opt_tmp
/do-command.$$
";
open
(
TMP
,"
>
$mail_header_file
");
open
(
TMP
,"
>
$mail_header_file
");
print
TMP
"
From: mysql
\
@
$full_host_name
\n
";
print
TMP
"
From: mysql
dev
\
@
$full_host_name
\n
";
print
TMP
"
To:
$email
\n
";
print
TMP
"
To:
$email
\n
";
print
TMP
"
Subject:
$ver$opt_version_suffix
compilation failed
\n\n
";
print
TMP
"
Subject:
$
host
(
$uname
):
$
ver$opt_version_suffix
compilation failed
\n\n
";
close
TMP
;
close
TMP
;
system
("
tail -n 40
$log
>
$log
.mail
");
system
("
tail -n 40
$log
>
$log
.mail
");
system
("
cat
$mail_header_file
$log
.mail |
$sendmail
-t -f
$email
");
system
("
cat
$mail_header_file
$log
.mail |
$sendmail
-t -f
$email
");
...
...
mysql-test/mysql-test-run.sh
View file @
15aee374
...
@@ -611,7 +611,9 @@ report_stats () {
...
@@ -611,7 +611,9 @@ report_stats () {
$ECHO
"http://www.mysql.com/doc/M/y/MySQL_test_suite.html"
$ECHO
"http://www.mysql.com/doc/M/y/MySQL_test_suite.html"
fi
fi
#
if
test
-z
"
$USE_RUNNING_SERVER
"
then
# Report if there was any fatal warnings/errors in the log files
# Report if there was any fatal warnings/errors in the log files
#
#
$RM
-f
$MY_LOG_DIR
/warnings
$MY_LOG_DIR
/warnings.tmp
$RM
-f
$MY_LOG_DIR
/warnings
$MY_LOG_DIR
/warnings.tmp
...
@@ -634,6 +636,7 @@ report_stats () {
...
@@ -634,6 +636,7 @@ report_stats () {
echo
"WARNING: Got errors/warnings while running tests. Please examine"
echo
"WARNING: Got errors/warnings while running tests. Please examine"
echo
"
$MY_LOG_DIR
/warnings for details."
echo
"
$MY_LOG_DIR
/warnings for details."
fi
fi
fi
}
}
mysql_install_db
()
{
mysql_install_db
()
{
...
...
mysql-test/r/count_distinct.result
View file @
15aee374
...
@@ -48,3 +48,8 @@ select t1.f1,count(distinct t2.f2),count(distinct 1,NULL) from t1 left join t2 o
...
@@ -48,3 +48,8 @@ select t1.f1,count(distinct t2.f2),count(distinct 1,NULL) from t1 left join t2 o
f1 count(distinct t2.f2) count(distinct 1,NULL)
f1 count(distinct t2.f2) count(distinct 1,NULL)
1 0 0
1 0 0
drop table t1,t2;
drop table t1,t2;
create table t1 (f int);
select count(distinct f) from t1;
count(distinct f)
0
drop table t1;
mysql-test/t/count_distinct.test
View file @
15aee374
...
@@ -46,3 +46,12 @@ insert into t1 values (1);
...
@@ -46,3 +46,12 @@ insert into t1 values (1);
create
table
t2
(
f1
int
,
f2
int
);
create
table
t2
(
f1
int
,
f2
int
);
select
t1
.
f1
,
count
(
distinct
t2
.
f2
),
count
(
distinct
1
,
NULL
)
from
t1
left
join
t2
on
t1
.
f1
=
t2
.
f1
group
by
t1
.
f1
;
select
t1
.
f1
,
count
(
distinct
t2
.
f2
),
count
(
distinct
1
,
NULL
)
from
t1
left
join
t2
on
t1
.
f1
=
t2
.
f1
group
by
t1
.
f1
;
drop
table
t1
,
t2
;
drop
table
t1
,
t2
;
#
# Empty tables
#
create
table
t1
(
f
int
);
select
count
(
distinct
f
)
from
t1
;
drop
table
t1
;
scripts/mysqlaccess.sh
View file @
15aee374
...
@@ -2414,7 +2414,7 @@ sub Print_Header {
...
@@ -2414,7 +2414,7 @@ sub Print_Header {
sub Print_Footer {
sub Print_Footer {
if ($MySQLaccess::CMD) { #command-line mode
if ($MySQLaccess::CMD) { #command-line mode
print "\n"
print "\n"
."BUGs can be reported by email to
Yves.Carlier\@rug.ac.be
\n";
."BUGs can be reported by email to
bugs\@mysql.com
\n";
}
}
if ($MySQLaccess::CGI) { #CGI-BIN mode
if ($MySQLaccess::CGI) { #CGI-BIN mode
if ($MySQLaccess::Param{'
brief
'}) {
if ($MySQLaccess::Param{'
brief
'}) {
...
@@ -2422,7 +2422,7 @@ sub Print_Footer {
...
@@ -2422,7 +2422,7 @@ sub Print_Footer {
}
}
print "<HR>\n"
print "<HR>\n"
."<ADDRESS>\n"
."<ADDRESS>\n"
."BUGs can be reported by email to <a href=mailto:
Yves.Carlier\@rug.ac.be>Yves.Carlier\@rug.ac.be
</a><BR>\n"
."BUGs can be reported by email to <a href=mailto:
bugs\@mysql.com>bugs\@mysql.com
</a><BR>\n"
# ."Don'
t forget to mention the version
$VERSION
!
<BR>
\n
"
# ."Don'
t forget to mention the version
$VERSION
!
<BR>
\n
"
."
</ADDRESS>
\n
"
."
</ADDRESS>
\n
"
."
</BODY>
\n
"
."
</BODY>
\n
"
...
...
scripts/mysqlhotcopy.sh
View file @
15aee374
...
@@ -49,8 +49,9 @@ Usage: $0 db_name[./table_regex/] [new_db_name | directory]
...
@@ -49,8 +49,9 @@ Usage: $0 db_name[./table_regex/] [new_db_name | directory]
-?, --help display this helpscreen and exit
-?, --help display this helpscreen and exit
-u, --user=# user for database login if not current user
-u, --user=# user for database login if not current user
-p, --password=# password to use when connecting to server
-p, --password=# password to use when connecting to server (if not set
-h, --host=# Hostname for local server when connecting over TCP/IP
in my.cnf, which is recommended)
-h, --host=# Hostname for local server when connecting over TCP/IP
-P, --port=# port to use when connecting to local server with TCP/IP
-P, --port=# port to use when connecting to local server with TCP/IP
-S, --socket=# socket to use when connecting to local server
-S, --socket=# socket to use when connecting to local server
...
@@ -893,7 +894,11 @@ user for database login if not current user
...
@@ -893,7 +894,11 @@ user for database login if not current user
=
item
-p
,
--password
=
#
=
item
-p
,
--password
=
#
password to use when connecting to server
password to use when connecting to the server. Note that you are strongly
encouraged
*
not
*
to use this option as every user would be able to see the
password
in
the process list. Instead use the
'[mysqlhotcopy]'
section
in
one of the config files, normally /etc/my.cnf or your personal ~/.my.cnf.
(
See the chapter
'my.cnf Option Files'
in
the manual
)
=
item
-h
,
-h
,
--host
=
#
=
item
-h
,
-h
,
--host
=
#
...
...
sql/item_sum.cc
View file @
15aee374
/* Copyright (C) 2000
MySQL AB & MySQL Finland AB & TCX DataKonsult
AB
/* Copyright (C) 2000
-2003 MySQL
AB
This program is free software; you can redistribute it and/or modify
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
...
@@ -1013,7 +1013,6 @@ Item_sum_count_distinct::~Item_sum_count_distinct()
...
@@ -1013,7 +1013,6 @@ Item_sum_count_distinct::~Item_sum_count_distinct()
}
}
}
}
bool
Item_sum_count_distinct
::
fix_fields
(
THD
*
thd
,
TABLE_LIST
*
tables
,
bool
Item_sum_count_distinct
::
fix_fields
(
THD
*
thd
,
TABLE_LIST
*
tables
,
Item
**
ref
)
Item
**
ref
)
{
{
...
...
sql/item_sum.h
View file @
15aee374
...
@@ -219,6 +219,7 @@ class Item_sum_count_distinct :public Item_sum_int
...
@@ -219,6 +219,7 @@ class Item_sum_count_distinct :public Item_sum_int
always_null
(
item
.
always_null
)
always_null
(
item
.
always_null
)
{}
{}
~
Item_sum_count_distinct
();
~
Item_sum_count_distinct
();
table_map
used_tables
()
const
{
return
used_table_cache
;
}
table_map
used_tables
()
const
{
return
used_table_cache
;
}
enum
Sumfunctype
sum_func
()
const
{
return
COUNT_DISTINCT_FUNC
;
}
enum
Sumfunctype
sum_func
()
const
{
return
COUNT_DISTINCT_FUNC
;
}
void
reset
();
void
reset
();
...
@@ -232,6 +233,7 @@ class Item_sum_count_distinct :public Item_sum_int
...
@@ -232,6 +233,7 @@ class Item_sum_count_distinct :public Item_sum_int
{
{
return
new
Item_sum_count_distinct
(
thd
,
*
this
);
return
new
Item_sum_count_distinct
(
thd
,
*
this
);
}
}
void
no_rows_in_result
()
{}
};
};
...
...
sql/sql_acl.cc
View file @
15aee374
...
@@ -1338,7 +1338,9 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo,
...
@@ -1338,7 +1338,9 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo,
if
((
combo
.
password
.
length
!=
HASH_PASSWORD_LENGTH
)
if
((
combo
.
password
.
length
!=
HASH_PASSWORD_LENGTH
)
&&
combo
.
password
.
length
!=
HASH_OLD_PASSWORD_LENGTH
)
&&
combo
.
password
.
length
!=
HASH_OLD_PASSWORD_LENGTH
)
{
{
my_error
(
ER_PASSWORD_NO_MATCH
,
MYF
(
0
));
my_printf_error
(
ER_PASSWORD_NO_MATCH
,
"Password hash should be a %d-digit hexadecimal number"
,
MYF
(
0
),
HASH_PASSWORD_LENGTH
);
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
}
}
password
=
combo
.
password
.
str
;
password
=
combo
.
password
.
str
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment