← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mysql-5.5/quantal-security

« back to all changes in this revision

Viewing changes to sql/ha_partition.h

  • Committer: Package Import Robot
  • Author(s): Seth Arnold
  • Date: 2013-04-18 18:15:39 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20130418181539-7uo1w041b4h2ulbs
Tags: 5.5.31-0ubuntu0.12.10.1
https://launchpad.net/bugs/1170516
* SECURITY UPDATE: Update to 5.5.31 to fix security issues (LP: #1170516)
  - http://www.oracle.com/technetwork/topics/security/cpuapr2013-1899555.html
* debian/patches/71_disable_rpl_tests.patch: refreshed.
* debian/patches/fix-mysqldump-test.patch: removed, fixed differently
  upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/ha_partition.h
2
2
#define HA_PARTITION_INCLUDED
3
3
 
4
4
/*
5
 
   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
 
5
   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
6
6
 
7
7
  This program is free software; you can redistribute it and/or modify
8
8
  it under the terms of the GNU General Public License as published by
25
25
#include "queues.h"             /* QUEUE */
26
26
 
27
27
enum partition_keywords
28
 
{ 
 
28
{
29
29
  PKW_HASH= 0, PKW_RANGE, PKW_LIST, PKW_KEY, PKW_MAXVALUE, PKW_LINEAR,
30
 
  PKW_COLUMNS
 
30
  PKW_COLUMNS, PKW_ALGORITHM
31
31
};
32
32
 
33
33
 
34
34
#define PARTITION_BYTES_IN_POS 2
35
 
#define PARTITION_ENABLED_TABLE_FLAGS (HA_FILE_BASED | HA_REC_NOT_IN_SEQ)
 
35
#define PARTITION_ENABLED_TABLE_FLAGS (HA_FILE_BASED | \
 
36
                                       HA_REC_NOT_IN_SEQ | \
 
37
                                       HA_CAN_REPAIR)
36
38
#define PARTITION_DISABLED_TABLE_FLAGS (HA_CAN_GEOMETRY | \
37
39
                                        HA_CAN_FULLTEXT | \
38
40
                                        HA_DUPLICATE_POS | \
84
86
  */
85
87
  KEY *m_curr_key_info[3];              // Current index
86
88
  uchar *m_rec0;                        // table->record[0]
 
89
  const uchar *m_err_rec;               // record which gave error
87
90
  QUEUE m_queue;                        // Prio queue used by sorted read
88
91
  /*
89
92
    Since the partition handler is a handler on top of other handlers, it
1102
1105
    virtual bool check_and_repair(THD *thd);
1103
1106
    virtual bool auto_repair() const;
1104
1107
    virtual bool is_crashed() const;
 
1108
    virtual int check_for_upgrade(HA_CHECK_OPT *check_opt);
1105
1109
 
1106
1110
    private:
1107
1111
    int handle_opt_partitions(THD *thd, HA_CHECK_OPT *check_opt, uint flags);
 
1112
    int handle_opt_part(THD *thd, HA_CHECK_OPT *check_opt, uint part_id,
 
1113
                        uint flag);
 
1114
    /**
 
1115
      Check if the rows are placed in the correct partition.  If the given
 
1116
      argument is true, then move the rows to the correct partition.
 
1117
    */
 
1118
    int check_misplaced_rows(uint read_part_id, bool repair);
 
1119
    void append_row_to_str(String &str);
1108
1120
    public:
1109
1121
  /*
1110
1122
    -------------------------------------------------------------------------