Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~laurynas-biveinis/percona-server/ubuntu-13.10-5.1 into lp:percona-server/5.1

  1. ubuntu-13.10-5.1
  2. Merge into 5.1
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Sergei Glushchenko
Approved revision: no longer in the source branch.
Merged at revision: 599
Proposed branch: lp:~laurynas-biveinis/percona-server/ubuntu-13.10-5.1
Merge into: lp:percona-server/5.1
Diff against target: 71 lines (+6/-6)
5 files modified
Percona-Server/mysys/md5.c (+1/-1)
Percona-Server/sql/field.cc (+2/-2)
Percona-Server/storage/myisam/mi_checksum.c (+1/-2)
Percona-Server/storage/myisam/mi_key.c (+1/-1)
UDF/configure.ac (+1/-0)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/ubuntu-13.10-5.1
Reviewer Review Type Date Requested Status
Sergei Glushchenko (community) g2 Approve
Review via email: mp+192855@code.launchpad.net

Description of the change

Fix Percona Server 5.1 build on Ubuntu 13.10.

587. By Laurynas Biveinis 34 minutes ago

    Fix http://bugs.mysql.com/bug.php?id=69407 / bug 1186190 (Build
    warnings with mysql) by backporting the fix from 5.5.
586. By Laurynas Biveinis 1 hour ago

    Fix http://bugs.mysql.com/bug.php?id=68909 / bug 1244154 (In
    my_MD5Final in mysys/md5.c, ctx is not properly zeroed as intended) by
    backporting its fix from 5.5.
585. By Laurynas Biveinis 1 hour ago

    Fix bug 1244110 (Top-level make fails in UDF autoreconf with Automake
    1.13) by adding a conditional AM_PROG_AR call to UDF/configure.ac as
    it's done in 5.5+.

http://jenkins.percona.com/job/percona-server-5.1-param/585/

To post a comment you must log in.
Revision history for this message
Sergei Glushchenko (sergei.glushchenko) wrote :

Approve

review: Approve (g2)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/mysys/md5.c'
2--- Percona-Server/mysys/md5.c 2013-03-19 12:29:12 +0000
3+++ Percona-Server/mysys/md5.c 2013-10-28 10:46:49 +0000
4@@ -176,7 +176,7 @@
5 putu32(ctx->buf[1], digest + 4);
6 putu32(ctx->buf[2], digest + 8);
7 putu32(ctx->buf[3], digest + 12);
8- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
9+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
10 }
11
12 #ifndef ASM_MD5
13
14=== modified file 'Percona-Server/sql/field.cc'
15--- Percona-Server/sql/field.cc 2013-06-03 03:53:55 +0000
16+++ Percona-Server/sql/field.cc 2013-10-28 10:46:49 +0000
17@@ -7701,7 +7701,7 @@
18 if (!String::needs_conversion(length, cs, field_charset, &dummy_offset))
19 {
20 Field_blob::store_length(length);
21- bmove(ptr+packlength,(char*) &from,sizeof(char*));
22+ bmove(ptr+packlength, &from, sizeof(char*));
23 return 0;
24 }
25 if (tmpstr.copy(from, length, cs))
26@@ -8356,7 +8356,7 @@
27 value.copy(from, length, cs);
28 from= value.ptr();
29 }
30- bmove(ptr + packlength, (char*) &from, sizeof(char*));
31+ bmove(ptr + packlength, &from, sizeof(char*));
32 }
33 return 0;
34
35
36=== modified file 'Percona-Server/storage/myisam/mi_checksum.c'
37--- Percona-Server/storage/myisam/mi_checksum.c 2013-03-19 12:29:12 +0000
38+++ Percona-Server/storage/myisam/mi_checksum.c 2013-10-28 10:46:49 +0000
39@@ -33,8 +33,7 @@
40 length=_mi_calc_blob_length(rec->length-
41 portable_sizeof_char_ptr,
42 buf);
43- memcpy((char*) &pos, buf+rec->length- portable_sizeof_char_ptr,
44- sizeof(char*));
45+ memcpy(&pos, buf+rec->length- portable_sizeof_char_ptr, sizeof(char*));
46 break;
47 }
48 case FIELD_VARCHAR:
49
50=== modified file 'Percona-Server/storage/myisam/mi_key.c'
51--- Percona-Server/storage/myisam/mi_key.c 2013-03-19 12:29:12 +0000
52+++ Percona-Server/storage/myisam/mi_key.c 2013-10-28 10:46:49 +0000
53@@ -419,7 +419,7 @@
54 goto err;
55 #endif
56 memcpy(record+keyseg->start+keyseg->bit_start,
57- (char*) &blob_ptr,sizeof(char*));
58+ &blob_ptr,sizeof(char*));
59 memcpy(blob_ptr,key,length);
60 blob_ptr+=length;
61
62
63=== modified file 'UDF/configure.ac'
64--- UDF/configure.ac 2010-12-17 15:26:10 +0000
65+++ UDF/configure.ac 2013-10-28 10:46:49 +0000
66@@ -1,4 +1,5 @@
67 AC_INIT([maatkit-udf], [0.1], [http://code.google.com/p/maatkit/issues/list])
68+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
69 AM_INIT_AUTOMAKE([foreign -Wall -Werror])
70 LT INIT
71 AC_PROG_LIBTOOL

Subscribers

People subscribed via source and target branches