Commit 211e8b03 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents 9bb7c348 425f2f91

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1007,3 +1007,4 @@ tests/mysql_client_test 
libmysqld/examples/mysql_client_test.c

libmysqld/examples/mysql_client_test_embedded

libmysqld/examples/mysqltest_embedded

support-files/ndb-config-2-node.ini

Build-tools/mysql-copyright-2

+6 −0
Original line number Diff line number Diff line
@@ -109,6 +109,12 @@ sub add_copyright 
    $line_copyright= "! ";

    $end_copyright=  "";

  }

  elsif ($ARGV =~ /\.sql$/)

  {

    $start_copyright="-- ";

    $line_copyright= "-- ";

    $end_copyright=  "";

  }

  elsif ($ARGV =~ /\.asm$/)

  {

    $start_copyright="; ";

mysql-test/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ dist-hook: 
		$(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include

	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r

	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.result.es $(srcdir)/r/*.require $(distdir)/r

	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(distdir)/std_data
@@ -65,7 +65,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r

	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.result.es $(DESTDIR)$(testdir)/r

	$(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -194,8 +194,8 @@ MY_LOG_DIR="$MYSQL_TEST_DIR/var/log" 
#

# Set LD_LIBRARY_PATH if we are using shared libraries

#

LD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$LD_LIBRARY_PATH"

DYLD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$DYLD_LIBRARY_PATH"

LD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/zlib/.libs:$LD_LIBRARY_PATH"

DYLD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/zlib/.libs:$DYLD_LIBRARY_PATH"

export LD_LIBRARY_PATH DYLD_LIBRARY_PATH



MASTER_RUNNING=0

mysql-test/r/group_by.result

+2 −2
Original line number Diff line number Diff line
@@ -655,9 +655,9 @@ insert into t1 (a,b) values (1,2),(1,3),(2,5); 
select a, 0.1*0+1 r2, sum(1) r1 from t1 where a = 1 group  by a having r1>1 and r2=1;

a	r2	r1

1	1.0	2

select a, rand()*0+1 r2, sum(1) r1 from t1 where a = 1 group  by a having r1>1 and r2=1;

select a, round(rand(100)*10) r2, sum(1) r1 from t1 where a = 1 group  by a having r1>1 and r2<=2;

a	r2	r1

1	1	2

1	2	2

select a,sum(b) from t1 where a=1 group by c;

a	sum(b)

1	5