Commit c4711fb9 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 

into deer.(none):/home/hf/work/mysql-4.1.4815


sql/sql_class.cc:
  Auto merged
parents 848414cf 0ceb4ddc

.bzrignore

+3 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
*/.pure

*~

.*.swp

./config.h

.defs.mk

.depend

.depend.mk
@@ -258,7 +259,7 @@ cmd-line-utils/libedit/common.h 
cmd-line-utils/libedit/makelist

comon.h

config.cache

./config.h

config.h

config.h.in

config.log

config.status
@@ -830,6 +831,7 @@ support-files/MacOSX/postinstall 
support-files/MacOSX/preinstall

support-files/binary-configure

support-files/my-huge.cnf

support-files/my-innodb-heavy-4G.cnf

support-files/my-large.cnf

support-files/my-medium.cnf

support-files/my-small.cnf

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ jcole@mugatu.jcole.us 
jcole@mugatu.spaceapes.com

jcole@sarvik.tfr.cafe.ee

jcole@tetra.spaceapes.com

joerg@mysql.com

joreland@mysql.com

jorge@linux.jorge.mysql.com

jplindst@t41.(none)

Build-tools/Do-compile

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) 
  log_timestamp();

  system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir);

  safe_cd("${test_dir}/mysql-test");

  check_system("./mysql-test-run $flags --warnings --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");

  check_system("./mysql-test-run $flags --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");

}



#

Build-tools/mysql-copyright

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ sub trim_the_fat 
                open(CONFIGURE,">configure.in") or die "Unable to open configure.in for write: $!\n";

                print CONFIGURE $configure;

                close(CONFIGURE);

                `autoconf`;

                `aclocal && autoheader && aclocal && automake && autoconf`;

                die "'./configure' was not produced!" unless (-f "configure");

                chdir("$cwd");

        }

VC++Files/sql/message.mc

0 → 100644
+8 −0
Original line number Diff line number Diff line 
MessageId    = 100

Severity     = Error

Facility     = Application

SymbolicName = MSG_DEFAULT

Language     = English

%1For more information, see Help and Support Center at http://www.mysql.com.