← Back to branch summary

~ubuntu-branches/ubuntu/precise/mysql-5.5/precise-201203300109

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-02-14 23:59:22 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120214235922-cux5uek1e5l0hje9
Tags: 5.5.20-0ubuntu1
https://launchpad.net/bugs/688541
https://launchpad.net/bugs/907465
https://launchpad.net/bugs/917542
https://launchpad.net/bugs/912487
http://bugs.debian.org/659566
* New upstream release.
* d/mysql-server-5.5.mysql.upstart: Fix stop on to make sure mysql is
  fully stopped before shutdown commences. (LP: #688541) Also simplify
  start on as it is redundant.
* d/control: Depend on upstart version which has apparmor profile load
  script to prevent failure on upgrade from lucid to precise.
  (LP: #907465)
* d/apparmor-profile: need to allow /run since that is the true path
  of /var/run files. (LP: #917542)
* d/control: mysql-server-5.5 has files in it that used to be owned
  by libmysqlclient-dev, so it must break/replace it. (LP: #912487)
* d/rules, d/control: 5.5.20 Fixes segfault on tests with gcc 4.6,
  change compiler back to system default.
* d/rules: Turn off embedded libedit/readline.(Closes: #659566)

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/srv/srv0start.c
733
733
        ibool   one_created     = FALSE;
734
734
        ulint   size;
735
735
        ulint   size_high;
 
736
        ulint   flags;
736
737
        ulint   rounded_size_pages;
737
738
        char    name[10000];
738
739
 
914
915
                                return(DB_ERROR);
915
916
                        }
916
917
skip_size_check:
917
 
                        fil_read_flushed_lsn_and_arch_log_no(
918
 
                                files[i], one_opened,
 
918
                        fil_read_first_page(
 
919
                                files[i], one_opened, &flags,
919
920
#ifdef UNIV_LOG_ARCHIVE
920
921
                                min_arch_log_no, max_arch_log_no,
921
922
#endif /* UNIV_LOG_ARCHIVE */
922
923
                                min_flushed_lsn, max_flushed_lsn);
 
924
 
 
925
                        if (UNIV_PAGE_SIZE
 
926
                            != fsp_flags_get_page_size(flags)) {
 
927
 
 
928
                                ut_print_timestamp(stderr);
 
929
                                fprintf(stderr,
 
930
                                        " InnoDB: Error: data file %s"
 
931
                                        " uses page size %lu,\n",
 
932
                                        name,
 
933
                                        fsp_flags_get_page_size(flags));
 
934
                                ut_print_timestamp(stderr);
 
935
                                fprintf(stderr,
 
936
                                        " InnoDB: but the only supported"
 
937
                                        " page size in this release is=%lu\n",
 
938
                                        (ulong) UNIV_PAGE_SIZE);
 
939
 
 
940
                                return(DB_ERROR);
 
941
                        }
 
942
 
923
943
                        one_opened = TRUE;
924
944
                } else {
925
945
                        /* We created the data file and now write it full of