merge 5.5 -> 5.6

Tor Didriksen · Tor Didriksen · commit 1513ca211154 · 2013-06-14T16:57:08.000+02:00
diff --git a/include/my_global.h b/include/my_global.h
@@ -374,9 +374,9 @@ C_MODE_END
 #ifdef _some_old_compiler_that_does_not_understand_the_construct_below_
 #define compile_time_assert(X)  do { } while(0)
 #else
-#define compile_time_assert(X)                                              \
-  do                                                                        \
-  {                                                                         \
+#define compile_time_assert(X)                                  \
+  do                                                            \
+  {                                                             \
     typedef char compile_time_assert[(X) ? 1 : -1] __attribute__((unused)); \
   } while(0)
 #endif
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -64,6 +64,11 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY}
  ${LIBNSL} ${LIBM} ${LIBRT})
 DTRACE_INSTRUMENT(mysys)
 
+# Need explicit pthread for gcc -fsanitize=address
+IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
+  TARGET_LINK_LIBRARIES(mysys pthread)
+ENDIF()
+
 ADD_EXECUTABLE(thr_lock thr_lock.c)
 TARGET_LINK_LIBRARIES(thr_lock mysys)
 SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN")
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/sql/field.cc b/sql/field.cc
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, 2013 Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2013 Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
@@ -391,7 +391,8 @@ uint filename_to_tablename(const char *from, char *to, uint to_length
   DBUG_ENTER("filename_to_tablename");
   DBUG_PRINT("enter", ("from '%s'", from));
 
-  if (!memcmp(from, tmp_file_prefix, tmp_file_prefix_length))
+  if (strlen(from) >= tmp_file_prefix_length &&
+      !memcmp(from, tmp_file_prefix, tmp_file_prefix_length))
   {
     /* Temporary table name. */
     res= (strnmov(to, from, to_length) - to);
diff --git a/support-files/build-tags b/support-files/build-tags
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 rm -f TAGS
-filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|\.yy$\|\.hpp$'
+filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$\|\.hpp$'
 
 list="find . -type f"
 bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root -R --kind=file --versioned"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.`
	`1`	`+/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.`
`2`	`2`
`3`	`3`	`This program is free software; you can redistribute it and/or modify`
`4`	`4`	`it under the terms of the GNU General Public License as published by`
Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,8 @@ uint filename_to_tablename(const char from, char to, uint to_length`
`391`	`391`	`DBUG_ENTER("filename_to_tablename");`
`392`	`392`	`DBUG_PRINT("enter", ("from '%s'", from));`
`393`	`393`
`394`		`- if (!memcmp(from, tmp_file_prefix, tmp_file_prefix_length))`
	`394`	`+ if (strlen(from) >= tmp_file_prefix_length &&`
	`395`	`+ !memcmp(from, tmp_file_prefix, tmp_file_prefix_length))`
`395`	`396`	`{`
`396`	`397`	`/* Temporary table name. */`
`397`	`398`	`res= (strnmov(to, from, to_length) - to);`