Merge branch 'mysql-5.5' into mysql-5.6

Tor Didriksen · Tor Didriksen · commit 483dccbf7d3a · 2014-11-17T16:24:28.000+01:00
Conflicts:
	cmake/info_macros.cmake.in
diff --git a/cmake/info_macros.cmake.in b/cmake/info_macros.cmake.in
@@ -23,11 +23,13 @@
 # If further variables are used in this file, add them to this list.
 
 SET(VERSION "@VERSION@")
+SET(MAJOR_VERSION "@MAJOR_VERSION@")
+SET(MINOR_VERSION "@MINOR_VERSION@")
+SET(PATCH_VERSION "@PATCH_VERSION@")
 SET(CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@")
 SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@")
 SET(CMAKE_GENERATOR "@CMAKE_GENERATOR@")
 SET(CMAKE_SIZEOF_VOID_P "@CMAKE_SIZEOF_VOID_P@")
-SET(BZR_EXECUTABLE "@BZR_EXECUTABLE@")
 SET(GIT_EXECUTABLE "@GIT_EXECUTABLE@")
 SET(CMAKE_CROSSCOMPILING "@CMAKE_CROSSCOMPILING@")
 SET(CMAKE_HOST_SYSTEM "@CMAKE_HOST_SYSTEM@")
@@ -45,41 +47,41 @@ SET(CMAKE_SYSTEM_PROCESSOR "@CMAKE_SYSTEM_PROCESSOR@")
 MACRO(CREATE_INFO_SRC target_dir)
   SET(INFO_SRC "${target_dir}/INFO_SRC")
 
+  SET(PERLSCRIPT
+    "use warnings; use POSIX qw(strftime); "
+    "print strftime \"%F %T %z\", localtime;")
+  EXECUTE_PROCESS(
+    COMMAND perl -e "${PERLSCRIPT}"
+    RESULT_VARIABLE result
+    OUTPUT_VARIABLE bdate
+    ERROR_VARIABLE error
+  )
+  IF(error)
+    MESSAGE(STATUS "Could not determine build-date: <${error}>")
+  ENDIF()
+
   IF(GIT_EXECUTABLE AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
     # Sources are in a GIT repository: Always update.
     EXECUTE_PROCESS(
-      COMMAND ${GIT_EXECUTABLE} log -1
+      COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-      OUTPUT_VARIABLE VERSION_INFO
-      RESULT_VARIABLE RESULT
+      OUTPUT_VARIABLE bname
     )
-    FILE(WRITE ${INFO_SRC} "git log -1: ${VERSION_INFO}\n")
+
     EXECUTE_PROCESS(
-      COMMAND ${GIT_EXECUTABLE} branch
+      COMMAND ${GIT_EXECUTABLE} log -1
+      --pretty="commit: %H%ndate: %ci%nbuild-date: ${bdate} %nshort: %h%nbranch: ${bname}"
       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
       OUTPUT_VARIABLE VERSION_INFO
-      RESULT_VARIABLE RESULT
     )
-    FILE(APPEND ${INFO_SRC} "${VERSION_INFO}\n")
-    FILE(APPEND ${INFO_SRC} "\nMySQL source ${VERSION}\n")
-  ELSEIF(BZR_EXECUTABLE AND EXISTS ${CMAKE_SOURCE_DIR}/.bzr)
-    # Sources are in a BZR repository: Always update.
-    # Add a timeout in case BZR hangs forever ...
-    EXECUTE_PROCESS(
-      COMMAND ${BZR_EXECUTABLE} version-info ${CMAKE_SOURCE_DIR}
-      OUTPUT_VARIABLE VERSION_INFO
-      RESULT_VARIABLE RESULT
-      ERROR_VARIABLE ERROR
-      TIMEOUT 10
-    )
-    IF(NOT RESULT EQUAL 0)
-      MESSAGE(STATUS "Error from ${BZR_EXECUTABLE}: ${ERROR}")
-      SET(BZR_EXECUTABLE)
-    ENDIF()
+
+    ## Output from git is quoted with "", remove them.
+    STRING(REPLACE "\"" "" VERSION_INFO "${VERSION_INFO}")
     FILE(WRITE ${INFO_SRC} "${VERSION_INFO}\n")
     # to debug, add: FILE(APPEND ${INFO_SRC} "\nResult ${RESULT}\n")
     # For better readability ...
-    FILE(APPEND ${INFO_SRC} "\nMySQL source ${VERSION}\n")
+    FILE(APPEND ${INFO_SRC}
+      "MySQL source ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}\n")
   ELSEIF(EXISTS ${INFO_SRC})
     # Outside a BZR tree, there is no need to change an existing "INFO_SRC",
     # it cannot be improved.
diff --git a/mysql-test/t/file_contents.test b/mysql-test/t/file_contents.test
@@ -63,7 +63,7 @@ $found_revision = "No line 'revision-id: .....'";
 open(I_SRC,"<","$dir_docs/INFO_SRC") or print "Cannot open 'INFO_SRC' in '$dir_docs' (starting from bindir '$dir_bin')\n";
 while(defined ($line = <I_SRC>)) {
   if ($line =~ m|^MySQL source \d\.\d\.\d+|) {$found_version = "Found MySQL version number";}
-  if ($line =~ m|^git log -1: commit \w{40}$|) {$found_revision = "Found GIT revision id";}
+  if ($line =~ m|^commit: \w{40}$|) {$found_revision = "Found GIT revision id";}
 }
 close I_SRC;
 print "INFO_SRC: $found_version / $found_revision\n";

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ $found_revision = "No line 'revision-id: .....'";`
`63`	`63`	`open(I_SRC,"<","$dir_docs/INFO_SRC") or print "Cannot open 'INFO_SRC' in '$dir_docs' (starting from bindir '$dir_bin')\n";`
`64`	`64`	`while(defined ($line = <I_SRC>)) {`
`65`	`65`	`if ($line =~ m\|^MySQL source \d\.\d\.\d+\|) {$found_version = "Found MySQL version number";}`
`66`		`- if ($line =~ m\|^git log -1: commit \w{40}$\|) {$found_revision = "Found GIT revision id";}`
	`66`	`+ if ($line =~ m\|^commit: \w{40}$\|) {$found_revision = "Found GIT revision id";}`
`67`	`67`	`}`
`68`	`68`	`close I_SRC;`
`69`	`69`	`print "INFO_SRC: $found_version / $found_revision\n";`