← Back to branch summary

~linuxjedi/drizzle/trunk-fix-bison

« back to all changes in this revision

Viewing changes to plugin/innobase/xtrabackup/xtrabackup.cc

  • Committer: Continuous Integration
  • Date: 2012-04-01 02:50:12 UTC
  • mfrom: (2535.1.1 rf4)
  • Revision ID: ci@tangent.org-20120401025012-nn2bzq6zreq67yfy
modified:
  drizzled/drizzled.cc
  plugin/innobase/xtrabackup/xtrabackup.cc
pending merge tips: (use -v to see all merge revisions)
  Olaf van der Spek 2012-03-24 Fix some GCC 4.7 warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/xtrabackup/xtrabackup.cc
126
126
 
127
127
#include "xtrabackup_api.h"
128
128
 
129
 
 /* prototypes for static functions in original */
130
 
 
131
 
 ulint
132
 
 recv_find_max_checkpoint(
133
 
 /*=====================*/
134
 
                                         /* out: error code or DB_SUCCESS */
135
 
         log_group_t**  max_group,      /* out: max group */
136
 
         ulint*         max_field);     /* out: LOG_CHECKPOINT_1 or
137
 
                                         LOG_CHECKPOINT_2 */
138
 
 
139
 
 
140
 
 void
141
 
 os_file_set_nocache(
142
 
 /*================*/
143
 
         int            fd,             /* in: file descriptor to alter */
144
 
         const char*    file_name,      /* in: used in the diagnostic message */
145
 
         const char*    operation_name);        /* in: used in the diagnostic message,
146
 
                                         we call os_file_set_nocache()
147
 
                                         immediately after opening or creating
148
 
                                         a file, so this is either "open" or
149
 
                                         "create" */
150
 
 
151
129
 #include <fcntl.h>
152
130
 #include <regex.h>
153
131
 
535
513
thd_set_lock_wait_time(
536
514
/*===================*/
537
515
        drizzled::Session*      ,       /*!< in: thread handle (THD*) */
538
 
        ulint   );      /*!< in: time waited for the lock */
539
 
 
540
 
UNIV_INTERN
541
 
void
542
 
thd_set_lock_wait_time(
543
 
/*===================*/
544
 
        drizzled::Session*      ,       /*!< in: thread handle (THD*) */
545
516
        ulint   )       /*!< in: time waited for the lock */
546
517
{
547
518
  return;