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

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

into  shellback.(none):/home/msvensson/mysql/mysql-5.1
parents 126e2118 5c9359c3

client/cmakelists.txt

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ ADD_LIBRARY(mysqlclient ../mysys/array.c ../strings/bchange.c ../strings/bmove.c 
                        ../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c 

                        ../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c)



ADD_DEPENDENCIES(mysqlclient GenError)

ADD_DEPENDENCIES(mysqlclient comp_err)

ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)

LINK_DIRECTORIES(${MYSQL_BINARY_DIR}/mysys ${MYSQL_BINARY_DIR}/zlib)

TARGET_LINK_LIBRARIES(mysql mysqlclient mysys yassl zlib dbug yassl  taocrypt wsock32)

extra/cmakelists.txt

+10 −10
Original line number Diff line number Diff line
@@ -8,16 +8,16 @@ TARGET_LINK_LIBRARIES(comp_err dbug mysys strings wsock32) 


GET_TARGET_PROPERTY(COMP_ERR_EXE comp_err LOCATION)



ADD_CUSTOM_TARGET(GenError

                  ${COMP_ERR_EXE} --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets 

ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/include/mysqld_error.h

                   COMMAND ${COMP_ERR_EXE}

                    --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets 

                    --out-dir=${PROJECT_SOURCE_DIR}/sql/share/

                    --header_file=${PROJECT_SOURCE_DIR}/include/mysqld_error.h 

                    --name_file=${PROJECT_SOURCE_DIR}/include/mysqld_ername.h

                    --state_file=${PROJECT_SOURCE_DIR}/include/sql_state.h

                    --in_file=${PROJECT_SOURCE_DIR}/sql/share/errmsg.txt

         DEPENDS comp_err ${PROJECT_SOURCE_DIR}/sql/share/errmsg.txt)

         

         

                   MAIN_DEPENDENCY comp_err

                   DEPENDS ${PROJECT_SOURCE_DIR}/sql/share/errmsg.txt)



ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)

TARGET_LINK_LIBRARIES(my_print_defaults strings mysys dbug taocrypt odbc32 odbccp32 wsock32)

libmysql/cmakelists.txt

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ ADD_LIBRARY(libmysql MODULE dll.c libmysql.def 
                     ../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c 

                     ../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c 

                     ../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c)

ADD_DEPENDENCIES(libmysql dbug vio mysys strings GenError zlib)

ADD_DEPENDENCIES(libmysql dbug vio mysys strings comp_err zlib)

TARGET_LINK_LIBRARIES(libmysql mysys strings wsock32)



# ToDo: We should move the mytest.c program out in libmysql/

mysql-test/r/partition.result

+11 −0
Original line number Diff line number Diff line
@@ -546,4 +546,15 @@ t1 CREATE TABLE `t1` ( 
  `b` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY LIST (a) (PARTITION p1 VALUES IN (1) ENGINE = MyISAM, PARTITION p2 VALUES IN (2) ENGINE = MyISAM)

drop table t1;

create table t1 (a int unsigned not null auto_increment primary key)

partition by key(a);

alter table t1 rename t2, add c char(10), comment "no comment";

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` int(10) unsigned NOT NULL AUTO_INCREMENT,

  `c` char(10) DEFAULT NULL,

  PRIMARY KEY (`a`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='no comment' PARTITION BY KEY (a) 

drop table t2;

End of 5.1 tests

mysql-test/t/partition.test

+17 −0
Original line number Diff line number Diff line
@@ -697,4 +697,21 @@ alter table t1 add primary key (b); 
show create table t1;

drop table t1;



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

#

# Author: Mikael Ronstrom

# Date:   2006-03-01

# Purpose

# Bug 17772: Crash at ALTER TABLE with rename

#            and add column + comment on

#            partitioned table

#

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

create table t1 (a int unsigned not null auto_increment primary key)

partition by key(a);

alter table t1 rename t2, add c char(10), comment "no comment";

show create table t2;



drop table t2;



--echo End of 5.1 tests