search

vincentor / google-mysql-tools

Automatically exported from code.google.com/p/google-mysql-tools
Apache License 2.0
0 stars 0 forks source link

changes in r49 to r50 not applied to mysql-5.0.37-patches? #8

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago 
What steps will reproduce the problem?
1.
2.
3.

What is the expected output? What do you see instead?

What version of the product are you using? On what operating system?
r50

Please provide any additional information below.
Index: mysql-patches/mysql-5.0.37-patches
===================================================================
--- mysql-patches/mysql-5.0.37-patches  (revision 50)
+++ mysql-patches/mysql-5.0.37-patches  (working copy)
@@ -73809,7 +73809,7 @@
 +  /* Export the semi-sync status. */
 +  if (semi_sync_slave && !semi_sync_status) {
 +    /* Semi-sync status is ON now. */
-+    thread_safe_add(rpl_semi_sync_slave_status, 1, &LOCK_stats);
++    thread_safe_add(rpl_semi_sync_slave_status, 1, &LOCK_status);
 +    semi_sync_status = true;
 +  }
 +
@@ -73911,7 +73911,7 @@
 +
 +  if (semi_sync_status) {
 +    /* Semi-sync status is OFF now. */
-+    thread_safe_sub(rpl_semi_sync_slave_status, 1, &LOCK_stats);
++    thread_safe_sub(rpl_semi_sync_slave_status, 1, &LOCK_status);
 +  }
 +
 +  delete mule;
@@ -75439,11 +75439,11 @@
 +                         char *packet_fixed_buffer) {
 +  if (flags & BINLOG_MIRROR_CLIENT) {
 +    /* One less mirror binlog client. */
-+    thread_safe_sub(rpl_mirror_binlog_clients, 1, &LOCK_stats);
++    thread_safe_sub(rpl_mirror_binlog_clients, 1, &LOCK_status);
 +  }
 +  if (flags & BINLOG_SEMI_SYNC) {
 +    /* One less semi-sync client. */
-+    thread_safe_sub(rpl_semi_sync_clients, 1, &LOCK_stats);
++    thread_safe_sub(rpl_semi_sync_clients, 1, &LOCK_status);
 +  }
 +  if (packet_fixed_buffer != NULL) {
 +    /* Release or free memory allocated for the packet */
@@ -75497,11 +75497,11 @@
 +
 +  if (flags & BINLOG_MIRROR_CLIENT) {
 +    /* One more mirror binlog clients. */
-+    thread_safe_increment(rpl_mirror_binlog_clients, &LOCK_stats);
++    thread_safe_increment(rpl_mirror_binlog_clients, &LOCK_status);
 +  }
 +  if (flags & BINLOG_SEMI_SYNC) {
 +    /* One more semi-sync clients. */
-+    thread_safe_increment(rpl_semi_sync_clients, &LOCK_stats);
++    thread_safe_increment(rpl_semi_sync_clients, &LOCK_status);
 +  }

  #ifndef DBUG_OFF

Original issue reported on code.google.com by freewiz...@gmail.com on 7 Jul 2007 at 9:26

GoogleCodeExporter commented 9 years ago 
Yes, I had to do that too to make it build properly on a CentOS 5.0 box.  My 
steps were:

1) Download mysql-community-2.0.37.src.rpm, install.  Move spec file aside. 
(Really
just getting the pristine mysql-2.0.37 tarball.)
2) Download mysql-2.0.22.src.rpm for CentOS 5, install.
3) Modify spec file to use version 2.0.37, adjust Release to suit your site 
needs,
then add a Changelog entry.
4) Modify spec file and add '%define runselftest 0' (on line 10).
5) Modify spec file by commenting out Patch3, Patch4, and Patch 8. Comment out 
the
%patch3, %patch4, and %patch8 macro calls.
6) Download the google mysql patch and put in the SOURCES/ directory.  I named 
it
mysql-5.0.37-google.patch
7) Add google patch to spec file by adding:
  Patch101: mysql-5.0.37-google.patch
8) Configure the patch to be applied by putting at the end of the existing 
%patch
macro calls:
  %patch101 -p1
9) Adjust the &LOCK_stats variables in two files.  Add this to the spec file 
right
before the first make:
  # Fix a Google patch bug where r50 didn't make it into final patch release:
  sed -i -e 's/\&LOCK_stats/\&LOCK_status/' sql/slave.cc sql/sql_repl.cc
10) Modify spec file to account for relocated man pages: Adjusted mysqld and
mysqlmanager man pages to be in man section 8.
11) Modify spec file to account for new man pages: Added a binary and several 
man
pages that were previously unpackaged, all in the server packaging section.

Then the rpms built properly on both x86 and x86_64 machines.

Original comment by mrballcb on 16 Nov 2007 at 11:24

GoogleCodeExporter commented 9 years ago 
To be fixed in the next patch that is published.

Original comment by mdcal...@gmail.com on 16 May 2008 at 10:21