~percona-dev/percona-server/release-5.5.11-20.2-fix-bug-764138

« back to all changes in this revision

Viewing changes to innodb_overwrite_relay_log_info.patch

  • Committer: Ignacio Nin
  • Date: 2011-03-27 18:30:06 UTC
  • mfrom: (88.2.3 5.5.10)
  • Revision ID: ignacio.nin@percona.com-20110327183006-ij0o2pdyhzaerish
Merge 5.5.10 changes

Merge 5.5.10 changes to release-5.5.9-20.1 in order to create release-5.5.10-20.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
56
56
 static my_bool innobase_rollback_on_timeout            = FALSE;
57
57
 static my_bool innobase_create_status_file             = FALSE;
58
58
 static my_bool innobase_stats_on_metadata              = TRUE;
59
 
@@ -2202,6 +2222,89 @@
 
59
@@ -2221,6 +2241,89 @@
60
60
        }
61
61
 #endif /* DBUG_OFF */
62
62
 
146
146
        /* Check that values don't overflow on 32-bit systems. */
147
147
        if (sizeof(ulint) == 4) {
148
148
                if (innobase_buffer_pool_size > UINT_MAX32) {
149
 
@@ -2500,6 +2603,76 @@
 
149
@@ -2519,6 +2622,76 @@
150
150
                goto mem_free_and_error;
151
151
        }
152
152
 
223
223
        innobase_old_blocks_pct = buf_LRU_old_ratio_update(
224
224
                innobase_old_blocks_pct, TRUE);
225
225
 
226
 
@@ -2612,6 +2785,25 @@
 
226
@@ -2631,6 +2804,25 @@
227
227
        trx_t*  trx)    /*!< in: transaction handle */
228
228
 {
229
229
        if (trx_is_started(trx)) {
249
249
 
250
250
                trx_commit_for_mysql(trx);
251
251
        }
252
 
@@ -10917,6 +11109,12 @@
 
252
@@ -10990,6 +11182,12 @@
253
253
   "The common part for InnoDB table spaces.",
254
254
   NULL, NULL, NULL);
255
255
 
262
262
 static MYSQL_SYSVAR_BOOL(doublewrite, innobase_use_doublewrite,
263
263
   PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
264
264
   "Enable InnoDB doublewrite buffer (enabled by default). "
265
 
@@ -11368,6 +11566,7 @@
 
265
@@ -11448,6 +11646,7 @@
266
266
   MYSQL_SYSVAR(old_blocks_pct),
267
267
   MYSQL_SYSVAR(old_blocks_time),
268
268
   MYSQL_SYSVAR(open_files),