List:Commits« Previous MessageNext Message »
From:Marc Alff Date:March 9 2010 10:04pm
Subject:bzr push into mysql-6.0-codebase-bugfixing branch (marc.alff:3801 to 3802)
View as plain text  
 3802 Marc Alff	2010-03-09 [merge]
      Merge mysql-next-mr-bugfixing (revno 3121) --> mysql-6.0-codebase-bugfixing

    modified:
      include/mysql/psi/mysql_thread.h
      libmysql_r/Makefile.am
 3801 Tor Didriksen	2010-03-09 [merge]
      merge 50888 from next-mr-bugfixing

    modified:
      mysql-test/r/type_timestamp.result
      mysql-test/t/type_timestamp.test
      sql/item.h
=== modified file 'include/mysql/psi/mysql_thread.h'
--- a/include/mysql/psi/mysql_thread.h	2010-03-07 18:54:05 +0000
+++ b/include/mysql/psi/mysql_thread.h	2010-03-09 22:03:08 +0000
@@ -192,6 +192,8 @@ typedef struct st_mysql_cond mysql_cond_
   on some platforms.
   The proper fix would be to cut these extra dependencies in the calling code.
   DISABLE_MYSQL_THREAD_H is a work around to limit dependencies.
+  DISABLE_MYSQL_PRLOCK_H is similar, and is used to disable specifically
+  the prlock wrappers.
 */
 #ifndef DISABLE_MYSQL_THREAD_H
 
@@ -748,6 +750,7 @@ static inline int inline_mysql_rwlock_in
   return my_rwlock_init(&that->m_rwlock, NULL);
 }
 
+#ifndef DISABLE_MYSQL_PRLOCK_H
 static inline int inline_mysql_prlock_init(
 #ifdef HAVE_PSI_INTERFACE
   PSI_rwlock_key key,
@@ -762,6 +765,7 @@ static inline int inline_mysql_prlock_in
 #endif
   return rw_pr_init(&that->m_prlock);
 }
+#endif
 
 static inline int inline_mysql_rwlock_destroy(
   mysql_rwlock_t *that)
@@ -776,6 +780,7 @@ static inline int inline_mysql_rwlock_de
   return rwlock_destroy(&that->m_rwlock);
 }
 
+#ifndef DISABLE_MYSQL_PRLOCK_H
 static inline int inline_mysql_prlock_destroy(
   mysql_prlock_t *that)
 {
@@ -788,6 +793,7 @@ static inline int inline_mysql_prlock_de
 #endif
   return rw_pr_destroy(&that->m_prlock);
 }
+#endif
 
 static inline int inline_mysql_rwlock_rdlock(
   mysql_rwlock_t *that
@@ -815,6 +821,7 @@ static inline int inline_mysql_rwlock_rd
   return result;
 }
 
+#ifndef DISABLE_MYSQL_PRLOCK_H
 static inline int inline_mysql_prlock_rdlock(
   mysql_prlock_t *that
 #ifdef HAVE_PSI_INTERFACE
@@ -840,6 +847,7 @@ static inline int inline_mysql_prlock_rd
 #endif
   return result;
 }
+#endif
 
 static inline int inline_mysql_rwlock_wrlock(
   mysql_rwlock_t *that
@@ -867,6 +875,7 @@ static inline int inline_mysql_rwlock_wr
   return result;
 }
 
+#ifndef DISABLE_MYSQL_PRLOCK_H
 static inline int inline_mysql_prlock_wrlock(
   mysql_prlock_t *that
 #ifdef HAVE_PSI_INTERFACE
@@ -892,6 +901,7 @@ static inline int inline_mysql_prlock_wr
 #endif
   return result;
 }
+#endif
 
 static inline int inline_mysql_rwlock_tryrdlock(
   mysql_rwlock_t *that
@@ -919,6 +929,7 @@ static inline int inline_mysql_rwlock_tr
   return result;
 }
 
+#ifndef DISABLE_MYSQL_PRLOCK_H
 static inline int inline_mysql_prlock_tryrdlock(
   mysql_prlock_t *that
 #ifdef HAVE_PSI_INTERFACE
@@ -944,6 +955,7 @@ static inline int inline_mysql_prlock_tr
 #endif
   return result;
 }
+#endif
 
 static inline int inline_mysql_rwlock_trywrlock(
   mysql_rwlock_t *that
@@ -971,6 +983,7 @@ static inline int inline_mysql_rwlock_tr
   return result;
 }
 
+#ifndef DISABLE_MYSQL_PRLOCK_H
 static inline int inline_mysql_prlock_trywrlock(
   mysql_prlock_t *that
 #ifdef HAVE_PSI_INTERFACE
@@ -996,6 +1009,7 @@ static inline int inline_mysql_prlock_tr
 #endif
   return result;
 }
+#endif
 
 static inline int inline_mysql_rwlock_unlock(
   mysql_rwlock_t *that)
@@ -1014,6 +1028,7 @@ static inline int inline_mysql_rwlock_un
   return result;
 }
 
+#ifndef DISABLE_MYSQL_PRLOCK_H
 static inline int inline_mysql_prlock_unlock(
   mysql_prlock_t *that)
 {
@@ -1030,6 +1045,7 @@ static inline int inline_mysql_prlock_un
   result= rw_pr_unlock(&that->m_prlock);
   return result;
 }
+#endif
 
 static inline int inline_mysql_cond_init(
 #ifdef HAVE_PSI_INTERFACE

=== modified file 'libmysql_r/Makefile.am'
--- a/libmysql_r/Makefile.am	2009-01-07 10:58:33 +0000
+++ b/libmysql_r/Makefile.am	2010-03-09 22:03:08 +0000
@@ -20,9 +20,11 @@
 #
 # This file is public domain and comes with NO WARRANTY of any kind
 
-target = libmysqlclient_r.la
-target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
-LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
+target = 	libmysqlclient_r.la
+target_defs = 	-DDISABLE_MYSQL_PRLOCK_H -DDONT_USE_RAID \
+		-DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
+
+LIBS = 		@LIBS@ @ZLIB_LIBS@ @openssl_libs@
 
 AM_CPPFLAGS =	-I$(top_srcdir)/include \
 		$(openssl_includes) @ZLIB_INCLUDES@


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100309220308-jfk89xfm17jzt13s.bundle
Thread
bzr push into mysql-6.0-codebase-bugfixing branch (marc.alff:3801 to 3802) Marc Alff9 Mar