Commit 27978ba2 authored by unknown's avatar unknown
Browse files

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

into lmy004.:/work/mysql-5.1-bug14356
parents dc546f52 816bd99b

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)

include/config-win.h

+2 −2
Original line number Diff line number Diff line
@@ -429,8 +429,8 @@ inline double ulonglong2double(ulonglong value) 
#define HAVE_RTREE_KEYS 1

#define HAVE_ROW_BASED_REPLICATION 1



/* #undef HAVE_OPENSSL */

/* #undef HAVE_YASSL */

#define HAVE_OPENSSL 1

#define HAVE_YASSL 1



/* Define charsets you want */

/* #undef HAVE_CHARSET_armscii8 */

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/subselect.result

+7 −0
Original line number Diff line number Diff line
@@ -3156,3 +3156,10 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	9	Using where

2	DEPENDENT SUBQUERY	t1	index	NULL	a	8	NULL	9	Using filesort

DROP TABLE t1;

create table t1( f1 int,f2 int);

insert into t1 values (1,1),(2,2);

select tt.t from (select 'crash1' as t, f2 from t1) as tt left join t1 on tt.t = 'crash2' and tt.f2 = t1.f2 where tt.t = 'crash1';

t

crash1

crash1

drop table t1;