← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to fix_innodb_for_backup.patch

fix fatal bug at --backup when added --stats

Show diffs side-by-side

added added

removed removed

Lines of Context:
fix_innodb_for_backup.patch
225
225
                size += UNIV_PAGE_SIZE;
226
226
diff -ru a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h
227
227
--- a/innobase/include/srv0srv.h        2008-12-19 02:19:36.000000000 +0900
228
 
+++ b/innobase/include/srv0srv.h        2009-08-04 18:30:17.000000000 +0900
 
228
+++ b/innobase/include/srv0srv.h        2009-09-03 15:08:25.000000000 +0900
229
229
@@ -57,6 +57,8 @@
230
230
 extern ibool   srv_file_per_table;
231
231
 extern ibool    srv_locks_unsafe_for_binlog;
235
235
 extern ulint   srv_n_data_files;
236
236
 extern char**  srv_data_file_names;
237
237
 extern ulint*  srv_data_file_sizes;
238
 
@@ -131,6 +133,8 @@
 
238
@@ -131,6 +133,9 @@
239
239
 extern ulong   srv_max_purge_lag;
240
240
 extern ibool   srv_use_awe;
241
241
 extern ibool   srv_use_adaptive_hash_indexes;
242
242
+
243
243
+extern ibool   srv_read_only;
 
244
+extern ibool   srv_fake_write;
244
245
 /*-------------------------------------------*/
245
246
 
246
247
 extern ulint   srv_n_rows_inserted;
460
461
        mem_pool_mutex_enter();
461
462
diff -ru a/innobase/os/os0file.c b/innobase/os/os0file.c
462
463
--- a/innobase/os/os0file.c     2008-12-19 02:19:36.000000000 +0900
463
 
+++ b/innobase/os/os0file.c     2009-08-25 21:06:35.000000000 +0900
 
464
+++ b/innobase/os/os0file.c     2009-09-03 15:09:36.000000000 +0900
464
465
@@ -435,7 +435,7 @@
465
466
 }
466
467
 
488
489
 #else
489
490
        ssize_t ret;
490
491
+
491
 
+       if (srv_read_only)
 
492
+       if (srv_fake_write)
492
493
+               return(TRUE);
493
494
        
494
495
        ret = os_file_pwrite(file, buf, n, offset, offset_high);
555
556
 
556
557
diff -ru a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c
557
558
--- a/innobase/srv/srv0srv.c    2008-12-19 02:19:37.000000000 +0900
558
 
+++ b/innobase/srv/srv0srv.c    2009-08-04 18:31:14.000000000 +0900
 
559
+++ b/innobase/srv/srv0srv.c    2009-09-03 15:09:01.000000000 +0900
559
560
@@ -86,6 +86,8 @@
560
561
                                                 i.e. do not use next-key locking
561
562
                                                 except on duplicate key checking and
565
566
 ulint  srv_n_data_files = 0;
566
567
 char** srv_data_file_names = NULL;
567
568
 ulint* srv_data_file_sizes = NULL;     /* size in database pages */ 
568
 
@@ -322,6 +324,7 @@
 
569
@@ -322,6 +324,8 @@
569
570
 ibool  srv_use_awe                     = FALSE;
570
571
 ibool  srv_use_adaptive_hash_indexes   = TRUE;
571
572
 
572
573
+ibool  srv_read_only   = FALSE;
 
574
+ibool  srv_fake_write  = FALSE;
573
575
 /*-------------------------------------------*/
574
576
 ulong  srv_n_spin_wait_rounds  = 20;
575
577
 ulong  srv_n_free_tickets_to_enter = 500;