Commit 887cde75 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
parents 37feda25 010d81af

.bzrignore

+6 −1
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ client/mysqltestmanager-pwgen 
client/mysqltestmanagerc

client/mysys_priv.h

client/readline.cpp

client/rpl_constants.h

client/select_test

client/sql_string.cpp

client/ssl_test
@@ -1347,10 +1348,15 @@ mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings 
mysql-test/suite/funcs_1/r/myisam_views.warnings

mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings

mysql-test/suite/funcs_1/r/ndb_views.warnings

mysql-test/suite/partitions/r/dif

mysql-test/suite/partitions/r/diff

mysql-test/suite/partitions/r/partition.result

mysql-test/suite/partitions/r/partition_bit_ndb.warnings

mysql-test/suite/partitions/r/partition_special_innodb.warnings

mysql-test/suite/partitions/r/partition_special_myisam.warnings

mysql-test/suite/partitions/r/partition_t55.out

mysql-test/suite/partitions/r/partition_t55.refout

mysql-test/suite/partitions/t/partition.test

mysql-test/t/index_merge.load

mysql-test/t/tmp.test

mysql-test/var
@@ -2956,4 +2962,3 @@ win/vs71cache.txt 
win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj
 
client/rpl_constants.h

config/ac-macros/zlib.m4

+12 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ dnl Define zlib paths to point at bundled zlib 


AC_DEFUN([MYSQL_USE_BUNDLED_ZLIB], [

ZLIB_INCLUDES="-I\$(top_srcdir)/zlib"

ZLIB_LIBS="\$(top_builddir)/zlib/libz.la"

ZLIB_LIBS="\$(top_builddir)/zlib/libzlt.la"

dnl Omit -L$pkglibdir as it's always in the list of mysql_config deps.

ZLIB_DEPS="-lz"

zlib_dir="zlib"
@@ -10,16 +10,25 @@ AC_SUBST([zlib_dir]) 
mysql_cv_compress="yes"

])



dnl Auxiliary macro to check for zlib at given path

dnl Auxiliary macro to check for zlib at given path.

dnl We are strict with the server, as "archive" engine

dnl needs zlibCompileFlags(), but for client only we

dnl are less strict, and take the zlib we find.



AC_DEFUN([MYSQL_CHECK_ZLIB_DIR], [

save_CPPFLAGS="$CPPFLAGS"

save_LIBS="$LIBS"

CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS"

LIBS="$LIBS $ZLIB_LIBS"

if test X"$with_server" = Xno

then

  zlibsym=zlibVersion

else

  zlibsym=zlibCompileFlags

fi

AC_CACHE_VAL([mysql_cv_compress],

  [AC_TRY_LINK([#include <zlib.h>],

    [return zlibCompileFlags();],

    [return $zlibsym();],

    [mysql_cv_compress="yes"

    AC_MSG_RESULT([ok])],

    [mysql_cv_compress="no"])

mysql-test/suite/funcs_1/r/a_version_check.result

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ 
. updated with each new version --- THIS IS INTENDED!

--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------



funcs_1 checked with version: 5.1.16

funcs_1 checked with version: 5.1.17

Warnings:

Warning	1548	Leading spaces are removed from name ' '

mysql-test/suite/partitions/include/partition_supported_sql_funcs.inc

+56 −37
Original line number Diff line number Diff line 
################################################################################

# t/partition_supported_sql_funcs.inc   #                                                                              #

# t/partition_supported_sql_funcs.inc                                          #           #                                                                              #

# Purpose:                                                                     #

#  Tests around sql functions                                                  #

#  Tests frame for allowed sql functions                                       #

#                                                                              #

#                                                                              #

#------------------------------------------------------------------------------#
@@ -83,24 +83,23 @@ eval insert into t3 values ($val1); 
eval insert into t3 values ($val2);

eval insert into t3 values ($val3);



eval insert into t4 values (1,$val1);

eval insert into t4 values (2,$val2);

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval load data infile '$MYSQL_TEST_DIR/suite/partitions/include/$infile' into table t4;



eval insert into t5 values (1,$val1);

eval insert into t5 values (2,$val2);

eval insert into t5 values (3,$val3);

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval load data infile '$MYSQL_TEST_DIR/suite/partitions/include/$infile' into table t5;



eval insert into t6 values (1,$val2);

eval insert into t6 values (2,$val3);

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval load data infile '$MYSQL_TEST_DIR/suite/partitions/include/$infile' into table t6;



eval select $sqlfunc from t1;

eval select $sqlfunc from t1 order by col1;



select * from t1;

select * from t2;

select * from t3;

select * from t4;

select * from t5;

select * from t6;

select * from t1 order by col1;

select * from t2 order by col1;

select * from t3 order by col1;

select * from t4 order by colint;

select * from t5 order by colint;

select * from t6 order by colint;



if ($do_long_tests)

{
@@ -111,12 +110,12 @@ if ($do_long_tests) 
	eval update t5 set col1=$val4 where col1=$val1;

	eval update t6 set col1=$val4 where col1=$val1;



	select * from t1;

	select * from t2;

	select * from t3;

	select * from t4;

	select * from t5;

	select * from t6;

	select * from t1 order by col1;

	select * from t2 order by col1;

	select * from t3 order by col1;

	select * from t4 order by colint;

	select * from t5 order by colint;

	select * from t6 order by colint;

}



--echo -------------------------------------------------------------------------
@@ -175,46 +174,63 @@ partition by range(colint) 
(partition p0 values less than ($valsqlfunc),

 partition p1 values less than maxvalue);



select * from t11;

select * from t22;

select * from t33;

select * from t44;

select * from t55;

select * from t66;

select * from t11 order by col1;

select * from t22 order by col1;

select * from t33 order by col1;

select * from t44 order by colint;

select * from t55 order by colint;

select * from t66 order by colint;

 

if ($do_long_tests)

{

        --echo ---------------------------

        --echo ---- some alter table begin

        --echo ---------------------------

	eval alter table t11

	reorganize partition p0,p1 into

	(partition s1 values less than maxvalue);

	select * from t11;

	select * from t11 order by col1;



	eval alter table t11

	reorganize partition s1 into

	(partition p0 values less than (15),

	 partition p1 values less than maxvalue);

	select * from t11;

	select * from t11 order by col1;



eval alter table t55

partition by list(colint)

subpartition by hash($sqlfunc) subpartitions 5 

(partition p0 values in (1,2,3,4,5,6,7,8,9,10),

 partition p1 values in (11,12,13,14,15,16,17,18,19,20),

 partition p2 values in (21,22,23,24,25,26,27,28,29,30),

 partition p3 values in (31,32,33,34,35,36,37,38,39,40),

 partition p4 values in (41,42,43,44,45,46,47,48,49,50),

 partition p5 values in (51,52,53,54,55,56,57,58,59,60)

);

        show create table t55; 

	select * from t55 order by colint;



	eval alter table t66

	reorganize partition p0,p1 into

	(partition s1 values less than maxvalue);

	select * from t66;

	select * from t66 order by colint;



	eval alter table t66

	reorganize partition s1 into

	(partition p0 values less than ($valsqlfunc),

	 partition p1 values less than maxvalue);

	select * from t66;

	select * from t66 order by colint;

	

	eval alter table t66

        reorganize partition p0,p1 into

        (partition s1 values less than maxvalue);

        select * from t66;

        select * from t66 order by colint;



	eval alter table t66

        add partition s0 

        (partition p0 values less than ($valsqlfunc);

        select * fromt t66;

        reorganize partition s1 into

	(partition p0 values less than ($valsqlfunc),

	 partition p1 values less than maxvalue);

        select * from t66 order by colint;



	let $t1=t1;

	let $t2=t2;
@@ -233,6 +249,9 @@ if ($do_long_tests) 
	let $t6=t66;

	--source suite/partitions/include/partition_supported_sql_funcs_delete.inc

	# --source include/partition_supported_sql_funcs_delete.inc

        --echo -------------------------

        --echo ---- some alter table end

        --echo -------------------------

}

--disable_warnings

drop table if exists t1 ;

mysql-test/suite/partitions/include/partition_supported_sql_funcs_delete.inc

+33 −20
Original line number Diff line number Diff line 
################################################################################

# t/partition_supported_sql_funcs_delete.inc                                   #           #                                                                              #

# Purpose:                                                                     #

#  Delete access of the tests frame for allowed sql functions                  #

#                                                                              #

#                                                                              #

#------------------------------------------------------------------------------#

# Original Author: HH                                                          #

# Original Date: 2006-11-22                                                    #

# Change Author:                                                               #

# Change Date:                                                                 #

# Change:                                                                      #

################################################################################

--echo -------------------------------------------------------------------------

--echo ---  Delete rows and partitions of tables with $sqlfunc

--echo -------------------------------------------------------------------------
@@ -9,25 +22,25 @@ eval delete from $t4 where col1=$val2; 
eval delete from $t5 where col1=$val2;

eval delete from $t6 where col1=$val2;



eval select * from $t1;

eval select * from $t2;

eval select * from $t3;

eval select * from $t4;

eval select * from $t5;

eval select * from $t1 order by col1;

eval select * from $t2 order by col1;

eval select * from $t3 order by col1;

eval select * from $t4 order by colint;

eval select * from $t5 order by colint;



eval insert into $t1 values ($val2);

eval insert into $t2 values ($val2);

eval insert into $t3 values ($val2);

eval insert into $t4 values (4,$val2);

eval insert into $t5 values (4,$val2);

eval insert into $t6 values (4,$val2);

eval insert into $t4 values (60,$val2);

eval insert into $t5 values (60,$val2);

eval insert into $t6 values (60,$val2);



eval select * from $t1;

eval select * from $t2;

eval select * from $t3;

eval select * from $t4;

eval select * from $t5;

eval select * from $t6;

eval select * from $t1 order by col1;

eval select * from $t2 order by col1;

eval select * from $t3 order by col1;

eval select * from $t4 order by colint;

eval select * from $t5 order by colint;

eval select * from $t6 order by colint;



eval alter table $t1 drop partition p0; 

eval alter table $t2 drop partition p0;
@@ -35,9 +48,9 @@ eval alter table $t4 drop partition p0; 
eval alter table $t5 drop partition p0; 

eval alter table $t6 drop partition p0;  



eval select * from $t1;

eval select * from $t2;

eval select * from $t3;

eval select * from $t4;

eval select * from $t5;

eval select * from $t6;
 
eval select * from $t1 order by col1;

eval select * from $t2 order by col1;

eval select * from $t3 order by col1;

eval select * from $t4 order by colint;

eval select * from $t5 order by colint;

eval select * from $t6 order by colint;