Commit cb761d3a 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 e087df2f fca35216

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 comp_err)

ADD_DEPENDENCIES(mysqlclient GenError)

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

+5 −2
Original line number Diff line number Diff line
@@ -16,8 +16,11 @@ ADD_CUSTOM_COMMAND(OUTPUT ${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

                   MAIN_DEPENDENCY comp_err

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

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



ADD_CUSTOM_TARGET(GenError

                  ALL

                  DEPENDS ${PROJECT_SOURCE_DIR}/include/mysqld_error.h)



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 comp_err zlib)

ADD_DEPENDENCIES(libmysql dbug vio mysys strings GenError zlib)

TARGET_LINK_LIBRARIES(libmysql mysys strings wsock32)



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

mysql-test/r/events_bugs.result

+14 −0
Original line number Diff line number Diff line 
create database if not exists events_test;

use events_test;

set @a=3;

CREATE PROCEDURE p_16 () CREATE EVENT e_16 ON SCHEDULE EVERY @a SECOND DO SET @a=5;

call p_16();

"Here we used to crash!"

call p_16();

ERROR HY000: Event 'e_16' already exists

call p_16();

ERROR HY000: Event 'e_16' already exists

DROP EVENT e_16;

CALL p_16();

CALL p_16();

ERROR HY000: Event 'e_16' already exists

DROP PROCEDURE p_16;

DROP EVENT e_16;

set global event_scheduler=0;

"Wait a bit to settle down"

delete from mysql.event;

mysql-test/t/events_bugs.test

+21 −0
Original line number Diff line number Diff line 
create database if not exists events_test;

use events_test;

#

# START - BUG#16408: Events: crash for an event in a procedure

#

set @a=3;

CREATE PROCEDURE p_16 () CREATE EVENT e_16 ON SCHEDULE EVERY @a SECOND DO SET @a=5;

call p_16();

--echo "Here we used to crash!"

--error 1516

call p_16();

--error 1516

call p_16();

DROP EVENT e_16;

CALL p_16();

--error 1516

CALL p_16();

DROP PROCEDURE p_16;

DROP EVENT e_16;

#

# END   - BUG#16408: Events: crash for an event in a procedure

#



#

# Start - 16407: Events: Changes in sql_mode won't be taken into account

#