~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/srv/srv0start.c

[patch 098/129] Merge patch for revision 1903 from InnoDB SVN:
revno: 1903
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6105
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6103
committer: calvin
timestamp: Tue 2009-10-27 22:05:52 +0000
message:
  branches/zip: backport r3848 from 6.0 branch
  
  ----
      branches/6.0: innobase_start_or_create_for_mysql(): Make the 10 MB
      minimum tablespace limit independent of UNIV_PAGE_SIZE. (Bug #41490)
modified:
  srv/srv0start.c                2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fsrv%2Fsrv0start.c
diff:
=== modified file 'srv/srv0start.c'

Show diffs side-by-side

added added

removed removed

Lines of Context:
1372
1372
                sum_of_new_sizes += srv_data_file_sizes[i];
1373
1373
        }
1374
1374
 
1375
 
        if (sum_of_new_sizes < 640) {
 
1375
        if (sum_of_new_sizes < 10485760 / UNIV_PAGE_SIZE) {
1376
1376
                fprintf(stderr,
1377
1377
                        "InnoDB: Error: tablespace size must be"
1378
1378
                        " at least 10 MB\n");