Commit 5fd99149 authored by Sergey Petrunia's avatar Sergey Petrunia
Browse files

Merge

parents 5249c049 5b8c8a6c

mysql-test/r/xa.result

+1 −0
Original line number Diff line number Diff line
@@ -73,4 +73,5 @@ xa end 'a','c'; 
ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected

xa rollback 'a','c';

xa start 'a','c';

drop table t1;

End of 5.0 tests

mysql-test/t/xa.test

+1 −0
Original line number Diff line number Diff line
@@ -116,5 +116,6 @@ xa start 'a','c'; 
--disconnect con1

--disconnect con3

--connection default

drop table t1;



--echo End of 5.0 tests

sql/CMakeLists.txt

+3 −12
Original line number Diff line number Diff line
@@ -28,9 +28,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
                    ${CMAKE_SOURCE_DIR}/bdb/build_win32

                    ${CMAKE_SOURCE_DIR}/bdb/dbinc)



SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc 

							${CMAKE_SOURCE_DIR}/sql/message.h 

							${CMAKE_SOURCE_DIR}/sql/sql_yacc.h 

SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/sql_yacc.h 

                            ${CMAKE_SOURCE_DIR}/sql/sql_yacc.cc

                            ${CMAKE_SOURCE_DIR}/include/mysql_version.h

                            ${CMAKE_SOURCE_DIR}/sql/lex_hash.h
@@ -120,13 +118,6 @@ ADD_CUSTOM_COMMAND( 
	DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc

)



# Windows message file

ADD_CUSTOM_COMMAND(

	SOURCE ${PROJECT_SOURCE_DIR}/sql/message.mc

	OUTPUT message.rc message.h

	COMMAND mc ARGS ${PROJECT_SOURCE_DIR}/sql/message.mc

	DEPENDS ${PROJECT_SOURCE_DIR}/sql/message.mc)



# Gen_lex_hash

# About "mysqlclient_notls", see note in "client/CMakeLists.txt"

ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
@@ -141,7 +132,7 @@ ADD_DEPENDENCIES(mysqld${MYSQLD_EXE_SUFFIX} gen_lex_hash) 


# Remove the auto-generated files as part of 'Clean Solution'

SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES 

                         "lex_hash.h;message.rc;message.h;sql_yacc.h;sql_yacc.cc")

                         "lex_hash.h;sql_yacc.h;sql_yacc.cc")



ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)

ADD_DEPENDENCIES(udf_example strings)

sql/MSG00001.bin

0 → 100644
+184 B

File added.

No diff preview for this file type.

View file

sql/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -118,7 +118,8 @@ DEFS = -DMYSQL_SERVER \ 


BUILT_SOURCES =		sql_yacc.cc sql_yacc.h lex_hash.h

EXTRA_DIST =		$(BUILT_SOURCES) nt_servc.cc nt_servc.h \

			message.mc examples/CMakeLists.txt CMakeLists.txt \

			message.mc message.h message.rc MSG00001.bin \

			examples/CMakeLists.txt CMakeLists.txt \

			udf_example.c udf_example.def

DISTCLEANFILES =        lex_hash.h sql_yacc.output