"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "sql/table.h" between
mariadb-10.2.21.tar.gz and mariadb-10.2.22.tar.gz

About: MariaDB is a relational database management system (a drop-in replacement for MySQL). Stable (GA) release (10.2).

table.h  (mariadb-10.2.21):table.h  (mariadb-10.2.22)
#ifndef TABLE_INCLUDED #ifndef TABLE_INCLUDED
#define TABLE_INCLUDED #define TABLE_INCLUDED
/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. /* Copyright (c) 2000, 2017, Oracle and/or its affiliates.
Copyright (c) 2009, 2018, MariaDB Copyright (c) 2009, 2019, MariaDB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License. the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
skipping to change at line 616 skipping to change at line 616
should correspond to each other. should correspond to each other.
To ensure this one can use set_table_cache() methods. To ensure this one can use set_table_cache() methods.
*/ */
LEX_STRING table_cache_key; LEX_STRING table_cache_key;
LEX_STRING db; /* Pointer to db */ LEX_STRING db; /* Pointer to db */
LEX_STRING table_name; /* Table name (for open) */ LEX_STRING table_name; /* Table name (for open) */
LEX_STRING path; /* Path to .frm file (from datadir) */ LEX_STRING path; /* Path to .frm file (from datadir) */
LEX_STRING normalized_path; /* unpack_filename(path) */ LEX_STRING normalized_path; /* unpack_filename(path) */
LEX_STRING connect_string; LEX_STRING connect_string;
const char* orig_table_name; /* Original table name for this tmp tabl
e */
const char* error_table_name() const /* Get table name for error messages */
{
return tmp_table ? (
orig_table_name ?
orig_table_name :
"(temporary)") :
table_name.str;
}
/* /*
Set of keys in use, implemented as a Bitmap. Set of keys in use, implemented as a Bitmap.
Excludes keys disabled by ALTER TABLE ... DISABLE KEYS. Excludes keys disabled by ALTER TABLE ... DISABLE KEYS.
*/ */
key_map keys_in_use; key_map keys_in_use;
key_map keys_for_keyread; key_map keys_for_keyread;
ha_rows min_rows, max_rows; /* create information */ ha_rows min_rows, max_rows; /* create information */
ulong avg_row_length; /* create information */ ulong avg_row_length; /* create information */
ulong mysql_version; /* 0 if .frm is created before 5.0 */ ulong mysql_version; /* 0 if .frm is created before 5.0 */
ulong reclength; /* Recordlength */ ulong reclength; /* Recordlength */
skipping to change at line 1872 skipping to change at line 1862
List of nodes in a nested join tree, that should be considered as List of nodes in a nested join tree, that should be considered as
leaves with respect to name resolution. The leaves are: views, leaves with respect to name resolution. The leaves are: views,
top-most nodes representing NATURAL/USING joins, subqueries, and top-most nodes representing NATURAL/USING joins, subqueries, and
base tables. All of these TABLE_LIST instances contain a base tables. All of these TABLE_LIST instances contain a
materialized list of columns. The list is local to a subquery. materialized list of columns. The list is local to a subquery.
*/ */
TABLE_LIST *next_name_resolution_table; TABLE_LIST *next_name_resolution_table;
/* Index names in a "... JOIN ... USE/IGNORE INDEX ..." clause. */ /* Index names in a "... JOIN ... USE/IGNORE INDEX ..." clause. */
List<Index_hint> *index_hints; List<Index_hint> *index_hints;
TABLE *table; /* opened table */ TABLE *table; /* opened table */
uint table_id; /* table id (from binlog) for opened table */ ulonglong table_id; /* table id (from binlog) for opened table */
/* /*
select_result for derived table to pass it from table creation to table select_result for derived table to pass it from table creation to table
filling procedure filling procedure
*/ */
select_union *derived_result; select_union *derived_result;
/* Stub used for materialized derived tables. */ /* Stub used for materialized derived tables. */
table_map map; /* ID bit of table (1,2,4,8,16...) */ table_map map; /* ID bit of table (1,2,4,8,16...) */
table_map get_map() table_map get_map()
{ {
return jtbm_subselect? table_map(1) << jtbm_table_no : table->map; return jtbm_subselect? table_map(1) << jtbm_table_no : table->map;
 End of changes. 3 change blocks. 
13 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)