merge
BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-configure.in~ac795a92c8fe049c: Auto merged include/my_sys.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/t/count_distinct.test: Auto merged sql/ha_innodb.cc: Auto merged sql/item_sum.cc: Auto merged sql/sql_acl.cc: Auto merged
This commit is contained in:
unknown
commit
363fd89b92
28
.bzrignore
28
.bzrignore
@ -238,6 +238,8 @@ client/mysys_priv.h
|
||||
client/select_test
|
||||
client/thimble
|
||||
client/thread_test
|
||||
cmd-line-utils/libedit/common.h
|
||||
comon.h
|
||||
config.cache
|
||||
config.h
|
||||
config.h.in
|
||||
@ -250,6 +252,7 @@ core.2430
|
||||
db-*.*.*
|
||||
dbug/user.t
|
||||
depcomp
|
||||
emacs.h
|
||||
extra/comp_err
|
||||
extra/my_print_defaults
|
||||
extra/mysql_install
|
||||
@ -258,12 +261,17 @@ extra/perror
|
||||
extra/replace
|
||||
extra/resolve_stack_dump
|
||||
extra/resolveip
|
||||
fcns.c
|
||||
fcns.h
|
||||
gmon.out
|
||||
heap/hp_test1
|
||||
heap/hp_test2
|
||||
help.c
|
||||
help.h
|
||||
include/my_config.h
|
||||
include/my_global.h
|
||||
include/mysql_version.h
|
||||
include/readline/readline.h
|
||||
include/widec.h
|
||||
innobase/autom4te-2.53.cache/output.0
|
||||
innobase/autom4te-2.53.cache/requests
|
||||
@ -554,9 +562,14 @@ sql_prepare.cc
|
||||
stamp-h
|
||||
stamp-h.in
|
||||
stamp-h1
|
||||
stamp-h2
|
||||
stamp-h3
|
||||
stamp-h4
|
||||
strings/conf_to_src
|
||||
strings/ctype_autoconf.c
|
||||
strings/ctype_extra_sources.c
|
||||
support-files/MacOSX/Description.plist
|
||||
support-files/MacOSX/Info.plist
|
||||
support-files/binary-configure
|
||||
support-files/my-huge.cnf
|
||||
support-files/my-large.cnf
|
||||
@ -578,21 +591,8 @@ tools/my_vsnprintf.c
|
||||
tools/mysqlmanager
|
||||
tools/mysqlmngd
|
||||
tools/mysys_priv.h
|
||||
vi.h
|
||||
vio/test-ssl
|
||||
vio/test-sslclient
|
||||
vio/test-sslserver
|
||||
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
|
||||
|
||||
@ -75,13 +75,17 @@ if (@config_env > 0)
|
||||
}
|
||||
|
||||
chomp($host=`hostname`);
|
||||
chomp($uname=`uname`);
|
||||
$full_host_name=$host;
|
||||
$connect_option= ($opt_tcpip ? "--host=$host" : "");
|
||||
$host =~ /^([^.-]*)/;
|
||||
$host=$1 . $opt_suffix;
|
||||
$email="$opt_user\@mysql.com";
|
||||
$pwd = `pwd`; chomp($pwd);
|
||||
$log="$pwd/Logs/$host$opt_version_suffix.log";
|
||||
chomp($pwd = `pwd`);
|
||||
$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/;
|
||||
$ver=$1;
|
||||
$gcc_version=which("gcc");
|
||||
@ -559,9 +563,9 @@ sub abort
|
||||
{
|
||||
$mail_header_file="$opt_tmp/do-command.$$";
|
||||
open(TMP,">$mail_header_file");
|
||||
print TMP "From: mysql\@$full_host_name\n";
|
||||
print TMP "From: mysqldev\@$full_host_name\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;
|
||||
system("tail -n 40 $log > $log.mail");
|
||||
system("cat $mail_header_file $log.mail | $sendmail -t -f $email");
|
||||
|
||||
@ -611,7 +611,9 @@ report_stats () {
|
||||
$ECHO "http://www.mysql.com/doc/M/y/MySQL_test_suite.html"
|
||||
fi
|
||||
|
||||
#
|
||||
if test -z "$USE_RUNNING_SERVER"
|
||||
then
|
||||
|
||||
# Report if there was any fatal warnings/errors in the log files
|
||||
#
|
||||
$RM -f $MY_LOG_DIR/warnings $MY_LOG_DIR/warnings.tmp
|
||||
@ -634,6 +636,7 @@ report_stats () {
|
||||
echo "WARNING: Got errors/warnings while running tests. Please examine"
|
||||
echo "$MY_LOG_DIR/warnings for details."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
mysql_install_db () {
|
||||
|
||||
@ -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)
|
||||
1 0 0
|
||||
drop table t1,t2;
|
||||
create table t1 (f int);
|
||||
select count(distinct f) from t1;
|
||||
count(distinct f)
|
||||
0
|
||||
drop table t1;
|
||||
|
||||
@ -46,3 +46,12 @@ insert into t1 values (1);
|
||||
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;
|
||||
drop table t1,t2;
|
||||
|
||||
|
||||
#
|
||||
# Empty tables
|
||||
#
|
||||
create table t1 (f int);
|
||||
select count(distinct f) from t1;
|
||||
drop table t1;
|
||||
|
||||
|
||||
@ -2414,7 +2414,7 @@ sub Print_Header {
|
||||
sub Print_Footer {
|
||||
if ($MySQLaccess::CMD) { #command-line mode
|
||||
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::Param{'brief'}) {
|
||||
@ -2422,7 +2422,7 @@ sub Print_Footer {
|
||||
}
|
||||
print "<HR>\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"
|
||||
."</ADDRESS>\n"
|
||||
."</BODY>\n"
|
||||
|
||||
@ -49,8 +49,9 @@ Usage: $0 db_name[./table_regex/] [new_db_name | directory]
|
||||
|
||||
-?, --help display this helpscreen and exit
|
||||
-u, --user=# user for database login if not current user
|
||||
-p, --password=# password to use when connecting to server
|
||||
-h, --host=# Hostname for local server when connecting over TCP/IP
|
||||
-p, --password=# password to use when connecting to server (if not set
|
||||
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
|
||||
-S, --socket=# socket to use when connecting to local server
|
||||
|
||||
@ -893,7 +894,11 @@ user for database login if not current user
|
||||
|
||||
=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=#
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* 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
|
||||
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()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
bool Item_sum_count_distinct::fix_fields(THD *thd, TABLE_LIST *tables,
|
||||
Item **ref)
|
||||
{
|
||||
|
||||
@ -219,6 +219,7 @@ class Item_sum_count_distinct :public Item_sum_int
|
||||
always_null(item.always_null)
|
||||
{}
|
||||
~Item_sum_count_distinct();
|
||||
|
||||
table_map used_tables() const { return used_table_cache; }
|
||||
enum Sumfunctype sum_func () const { return COUNT_DISTINCT_FUNC; }
|
||||
void reset();
|
||||
@ -232,6 +233,7 @@ class Item_sum_count_distinct :public Item_sum_int
|
||||
{
|
||||
return new Item_sum_count_distinct(thd, *this);
|
||||
}
|
||||
void no_rows_in_result() {}
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -1338,7 +1338,9 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo,
|
||||
if ((combo.password.length != HASH_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);
|
||||
}
|
||||
password=combo.password.str;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user