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

Merge lp:~laurynas-biveinis/percona-server/fix-32-bit-assert into lp:percona-server/5.5

  1. fix-32-bit-assert
  2. Merge into 5.5
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 132
Proposed branch: lp:~laurynas-biveinis/percona-server/fix-32-bit-assert
Merge into: lp:percona-server/5.5
Diff against target: 21 lines (+2/-2)
1 file modified
slow_extended.patch (+2/-2)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/fix-32-bit-assert
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+65640@code.launchpad.net

Description of the change

Fix the failure of debug configuration on 32-bit systems:

Sys_var_enum::Sys_var_enum(const char*, const char*, int, ptrdiff_t,
size_t, CMD_LINE, const char**, uint, PolyLock*,
sys_var::binlog_status_enum, bool (*)(sys_var*, THD*, set_var*), bool
(*)(sys_var*, THD*, enum_var_type), uint, const char*): Assertion
`size == sizeof(ulong)' failed.

The cause is the type of opt_slow_query_log_timestamp_precision, which
must be ulong in order to be Sys_var_enum variable.

Jenkins results at
http://jenkins.percona.com/job/percona-server-5.5-param/21/

Although there is Natty 32 bit failure, it seems unrelated and well past the original failure.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'slow_extended.patch'
2--- slow_extended.patch 2011-06-20 08:13:54 +0000
3+++ slow_extended.patch 2011-06-23 11:24:33 +0000
4@@ -431,7 +431,7 @@
5 +my_bool opt_log_slow_sp_statements= 0;
6 +my_bool opt_slow_query_log_timestamp_always= 0;
7 +ulonglong opt_slow_query_log_use_global_control= 0;
8-+ulonglong opt_slow_query_log_timestamp_precision= 0;
9++ulong opt_slow_query_log_timestamp_precision= 0;
10 my_bool lower_case_file_system= 0;
11 my_bool opt_large_pages= 0;
12 my_bool opt_super_large_pages= 0;
13@@ -478,7 +478,7 @@
14 +extern my_bool opt_log_slow_sp_statements;
15 +extern my_bool opt_slow_query_log_timestamp_always;
16 +extern ulonglong opt_slow_query_log_use_global_control;
17-+extern ulonglong opt_slow_query_log_timestamp_precision;
18++extern ulong opt_slow_query_log_timestamp_precision;
19 extern my_bool sp_automatic_privileges, opt_noacl;
20 extern my_bool opt_old_style_user_limits, trust_function_creators;
21 extern uint opt_crash_binlog_innodb;

Subscribers

People subscribed via source and target branches