← Back to branch summary

~ubuntu-branches/ubuntu/raring/mysql-5.5/raring-proposed

« back to all changes in this revision

Viewing changes to storage/innobase/include/fil0fil.h

  • 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/include/fil0fil.h
328
328
startup. */
329
329
UNIV_INTERN
330
330
void
331
 
fil_read_flushed_lsn_and_arch_log_no(
332
 
/*=================================*/
 
331
fil_read_first_page(
 
332
/*================*/
333
333
        os_file_t       data_file,              /*!< in: open data file */
334
334
        ibool           one_read_already,       /*!< in: TRUE if min and max
335
335
                                                parameters below already
336
336
                                                contain sensible data */
 
337
        ulint*          flags,                  /*!< out: tablespace flags */
337
338
#ifdef UNIV_LOG_ARCHIVE
338
 
        ulint*          min_arch_log_no,        /*!< in/out: */
339
 
        ulint*          max_arch_log_no,        /*!< in/out: */
 
339
        ulint*          min_arch_log_no,        /*!< out: min of archived
 
340
                                                log numbers in data files */
 
341
        ulint*          max_arch_log_no,        /*!< out: max of archived
 
342
                                                log numbers in data files */
340
343
#endif /* UNIV_LOG_ARCHIVE */
341
 
        ib_uint64_t*    min_flushed_lsn,        /*!< in/out: */
342
 
        ib_uint64_t*    max_flushed_lsn);       /*!< in/out: */
 
344
        ib_uint64_t*    min_flushed_lsn,        /*!< out: min of flushed
 
345
                                                lsn values in data files */
 
346
        ib_uint64_t*    max_flushed_lsn);       /*!< out: max of flushed
 
347
                                                lsn values in data files */
343
348
/*******************************************************************//**
344
349
Increments the count of pending insert buffer page merges, if space is not
345
350
being deleted.