← Back to branch summary

~ourdelta-core/ourdelta/trunk015fmt

« back to all changes in this revision

Viewing changes to mysql/5.0/baron_schwartz/innodb_locks_held/innodb_locks_held.patch

Merge from percona d6 (MySQL 5.0) branch.
microslow backward compatibility fixups

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql/5.0/baron_schwartz/innodb_locks_held/innodb_locks_held.patch
128
128
===================================================================
129
129
--- mysql-5.0.67.orig/sql/mysqld.cc
130
130
+++ mysql-5.0.67/sql/mysqld.cc
131
 
@@ -4961,6 +4961,8 @@ enum options_mysqld
 
131
@@ -4963,6 +4963,8 @@ enum options_mysqld
132
132
   OPT_INNODB_MAX_PURGE_LAG,
133
133
   OPT_INNODB_FILE_IO_THREADS,
134
134
   OPT_INNODB_LOCK_WAIT_TIMEOUT,
137
137
   OPT_INNODB_THREAD_CONCURRENCY,
138
138
   OPT_INNODB_COMMIT_CONCURRENCY,
139
139
   OPT_INNODB_FORCE_RECOVERY,
140
 
@@ -5292,6 +5294,14 @@ Disable with --skip-innodb-doublewrite."
 
140
@@ -5294,6 +5296,14 @@ Disable with --skip-innodb-doublewrite."
141
141
    (gptr*) &srv_flush_log_at_trx_commit,
142
142
    (gptr*) &srv_flush_log_at_trx_commit,
143
143
    0, GET_ULONG, OPT_ARG,  1, 0, 2, 0, 0, 0},
156
156
===================================================================
157
157
--- mysql-5.0.67.orig/sql/set_var.cc
158
158
+++ mysql-5.0.67/sql/set_var.cc
159
 
@@ -481,6 +481,12 @@ sys_var_long_ptr  sys_innodb_commit_conc
 
159
@@ -485,6 +485,12 @@ sys_var_long_ptr  sys_innodb_commit_conc
160
160
 sys_var_long_ptr  sys_innodb_flush_log_at_trx_commit(
161
161
                                         "innodb_flush_log_at_trx_commit",
162
162
                                         &srv_flush_log_at_trx_commit);
169
169
 #endif
170
170
 
171
171
 /* Condition pushdown to storage engine */
172
 
@@ -834,6 +840,8 @@ sys_var *sys_variables[]=
 
172
@@ -840,6 +846,8 @@ sys_var *sys_variables[]=
173
173
   &sys_innodb_thread_concurrency,
174
174
   &sys_innodb_commit_concurrency,
175
175
   &sys_innodb_flush_log_at_trx_commit,
178
178
 #endif
179
179
   &sys_trust_routine_creators,
180
180
   &sys_trust_function_creators,
181
 
@@ -949,6 +957,8 @@ struct show_var_st init_vars[]= {
 
181
@@ -955,6 +963,8 @@ struct show_var_st init_vars[]= {
182
182
   {"innodb_file_io_threads", (char*) &innobase_file_io_threads, SHOW_LONG },
183
183
   {"innodb_file_per_table", (char*) &innobase_file_per_table, SHOW_MY_BOOL},
184
184
   {sys_innodb_flush_log_at_trx_commit.name, (char*) &sys_innodb_flush_log_at_trx_commit, SHOW_SYS},