Commit 0f545fc7 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/partition_mgm_err.test:
  Auto merged
parents 2e2ec866 1692707c

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
        event_executor.cc event.cc event_timed.cc \

        rpl_filter.cc sql_partition.cc handlerton.cc sql_plugin.cc \

        sql_tablespace.cc \

        rpl_injector.cc my_user.c

        rpl_injector.cc my_user.c partition_info.cc



libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)

EXTRA_libmysqld_a_SOURCES =	ha_innodb.cc ha_berkeley.cc ha_archive.cc \

mysql-test/r/partition_mgm_err.result

+6 −0
Original line number Diff line number Diff line
@@ -142,3 +142,9 @@ t1 CREATE TABLE `t1` ( 
DROP TABLE t1;

CREATE TABLE t1 (a INT) PARTITION BY HASH(a);

ALTER TABLE t1 ADD PARTITION PARTITIONS 4;

DROP TABLE t1;

CREATE TABLE t1 (s1 int, s2 int) PARTITION BY LIST (s1)  (

PARTITION p1 VALUES IN (0) (SUBPARTITION p1b), 

PARTITION p2 VALUES IN (2) (SUBPARTITION p1b)

);

ERROR HY000: Duplicate partition name p1b

mysql-test/t/partition_mgm_err.test

+10 −0
Original line number Diff line number Diff line
@@ -217,3 +217,13 @@ DROP TABLE t1; 
#

CREATE TABLE t1 (a INT) PARTITION BY HASH(a);

ALTER TABLE t1 ADD PARTITION PARTITIONS 4;

DROP TABLE t1;



#

#BUG 15408: Partitions: subpartition names are not unique

#

--error ER_SAME_NAME_PARTITION

CREATE TABLE t1 (s1 int, s2 int) PARTITION BY LIST (s1)  (

PARTITION p1 VALUES IN (0) (SUBPARTITION p1b), 

PARTITION p2 VALUES IN (2) (SUBPARTITION p1b)

);

scripts/mysql_upgrade.sh

+18 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ parse_arguments() { 
      --ldata=*|--data=*|--datadir=*) DATADIR=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;

      --force) force=1 ;;

      --verbose) verbose=1 ;;

      --help) help_option=1 ;;

      *)

        if test -n "$pick_args"

        then
@@ -84,10 +85,27 @@ bindir= 
MY_BASEDIR_VERSION=

verbose=0

force=0

help_option=0



parse_arguments `$print_defaults $defaults mysqld mysql_upgrade`

parse_arguments PICK-ARGS-FROM-ARGV "$@"



if test $help_option = 1

then

  echo "MySQL utility script to upgrade database to the current server version"

  echo ""

  echo "It takes the following arguments:"

  echo "  --help     Show this help message"

  echo "  --basedir  Specifies the directory where MySQL is installed"

  echo "  --datadir  Specifies the data directory"

  echo "  --force    Mysql_upgrade.info file will be ignored"

  echo "  --user     Username for server login if not current user"

  echo "  --verbose  Display more output about the process"

  echo ""



  exit 0

fi



#

# Try to find where binaries are installed

#

sql/Makefile.am

+3 −2
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ 
			sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \

			parse_file.h sql_view.h	sql_trigger.h \

			sql_array.h sql_cursor.h event.h event_priv.h \

			sql_plugin.h authors.h

			sql_plugin.h authors.h sql_partition.h \

                        partition_info.h partition_element.h

mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \

			item.cc item_sum.cc item_buff.cc item_func.cc \

			item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \
@@ -101,7 +102,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ 
			sp_cache.cc parse_file.cc sql_trigger.cc \

                        event_executor.cc event.cc event_timed.cc \

			sql_plugin.cc sql_binlog.cc \

			handlerton.cc sql_tablespace.cc

			handlerton.cc sql_tablespace.cc partition_info.cc

EXTRA_mysqld_SOURCES =	ha_innodb.cc ha_berkeley.cc ha_archive.cc \

			ha_innodb.h  ha_berkeley.h  ha_archive.h \

			ha_blackhole.cc ha_federated.cc ha_ndbcluster.cc \