← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mariadb-5.5/trusty-proposed

« back to all changes in this revision

Viewing changes to sql/table.h

  • Committer: Package Import Robot
  • Author(s): James Page, Otto Kekäläinen
  • Date: 2014-02-17 16:51:52 UTC
  • mfrom: (2.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20140217165152-k315d3175g865kkx
Tags: 5.5.35-1
http://bugs.debian.org/737597
http://bugs.debian.org/733002
http://bugs.debian.org/734426
http://bugs.debian.org/735284
http://bugs.debian.org/736480
http://bugs.debian.org/732967
[ Otto Kekäläinen ]
* New upstream release, fixing the following security issues:
  - Buffer overflow in client/mysql.cc (Closes: #737597).
    - CVE-2014-0001
  - http://www.oracle.com/technetwork/topics/security/cpujan2014-1972949.html
    - CVE-2013-5891
    - CVE-2013-5908
    - CVE-2014-0386
    - CVE-2014-0393
    - CVE-2014-0401
    - CVE-2014-0402
    - CVE-2014-0412
    - CVE-2014-0420
    - CVE-2014-0437
* Upstream https://mariadb.atlassian.net/browse/MDEV-4902
  fixes compatibility with Bison 3.0 (Closes: #733002)
* Updated Russian debconf translation (Closes: #734426)
* Updated Japanese debconf translation (Closes: #735284)
* Updated French debconf translation (Closes: #736480)
* Renamed SONAME properly (Closes: #732967)

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/table.h
953
953
  INDEX_HINT_FORCE
954
954
};
955
955
 
 
956
 
956
957
#define      CHECK_ROW_FOR_NULLS_TO_REJECT   (1 << 0)
957
958
#define      REJECT_ROW_DUE_TO_NULL_FIELDS   (1 << 1)
958
959
 
 
960
/* Bitmap of table's fields */
 
961
typedef Bitmap<MAX_FIELDS> Field_map;
 
962
 
959
963
struct TABLE
960
964
{
961
965
  TABLE() {}                               /* Remove gcc warning */
1149
1153
  */
1150
1154
  bool force_index_group;
1151
1155
  bool distinct,const_table,no_rows, used_for_duplicate_elimination;
 
1156
  /**
 
1157
    Forces DYNAMIC Aria row format for internal temporary tables.
 
1158
  */
 
1159
  bool keep_row_order;
1152
1160
 
1153
1161
  /**
1154
1162
     If set, the optimizer has found that row retrieval should access index 
1450
1458
 
1451
1459
#define JOIN_TYPE_LEFT  1
1452
1460
#define JOIN_TYPE_RIGHT 2
 
1461
#define JOIN_TYPE_OUTER 4       /* Marker that this is an outer join */
1453
1462
 
1454
1463
#define VIEW_SUID_INVOKER               0
1455
1464
#define VIEW_SUID_DEFINER               1
2129
2138
 
2130
2139
  bool single_table_updatable();
2131
2140
 
 
2141
  bool is_inner_table_of_outer_join()
 
2142
  {
 
2143
    for (TABLE_LIST *tbl= this; tbl; tbl= tbl->embedding)
 
2144
    {
 
2145
      if (tbl->outer_join)
 
2146
        return true;
 
2147
    }
 
2148
    return false;
 
2149
  } 
 
2150
 
2132
2151
private:
2133
2152
  bool prep_check_option(THD *thd, uint8 check_opt_type);
2134
2153
  bool prep_where(THD *thd, Item **conds, bool no_where_clause);