summaryrefslogtreecommitdiff
path: root/sql/table.h
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2004-07-01 23:46:43 +0300
committerunknown <bell@sanja.is.com.ua>2004-07-01 23:46:43 +0300
commit148eecbd4008b4d47e5167e10503b2cc82f9a3d1 (patch)
tree241036a1db78a5e5d9dd04868679ea2b066ecf65 /sql/table.h
parentc92670d80b3674fa025e373e0498eccbb407f873 (diff)
downloadmariadb-git-148eecbd4008b4d47e5167e10503b2cc82f9a3d1.tar.gz
fixed join_nested test independence of environment
spaces at line end in fresh definitions removed fixed printing of nested joins (BUG#4352) mysql-test/r/join_nested.result: fixed join_nested test independence of environment print of nested join test added mysql-test/t/join_nested.test: fixed join_nested test independence of environment print of nested join test added sql/sql_lex.h: space at line end in fresh definition removed sql/sql_select.cc: fixed printing of nested joins sql/table.h: spaces at line end in fresh definitions removed method for table printing
Diffstat (limited to 'sql/table.h')
-rw-r--r--sql/table.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/sql/table.h b/sql/table.h
index c59b5a03bc4..5c54e553d73 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -173,11 +173,11 @@ typedef struct st_table_list
{
struct st_table_list *next;
char *db, *alias, *real_name;
- char *option; /* Used by cache index */
+ char *option; /* Used by cache index */
Item *on_expr; /* Used with outer join */
struct st_table_list *natural_join; /* natural join on this table*/
/* ... join ... USE INDEX ... IGNORE INDEX */
- List<String> *use_index, *ignore_index;
+ List<String> *use_index, *ignore_index;
TABLE *table; /* opened table */
st_table_list *table_list; /* pointer to node of list of all tables */
class st_select_lex_unit *derived; /* SELECT_LEX_UNIT of derived table */
@@ -191,24 +191,26 @@ typedef struct st_table_list
bool force_index; /* prefer index over table scan */
bool ignore_leaves; /* preload only non-leaf nodes */
table_map dep_tables; /* tables the table depends on */
- table_map on_expr_dep_tables; /* tables on expression depends on */
+ table_map on_expr_dep_tables; /* tables on expression depends on */
struct st_nested_join *nested_join; /* if the element is a nested join */
st_table_list *embedding; /* nested join containing the table */
- List<struct st_table_list> *join_list;/* join list the table belongs to */
+ List<struct st_table_list> *join_list;/* join list the table belongs to */
bool cacheable_table; /* stop PS caching */
/* used in multi-upd privelege check */
bool table_in_update_from_clause;
+
+ void print(THD *thd, String *str);
} TABLE_LIST;
typedef struct st_nested_join
{
List<TABLE_LIST> join_list; /* list of elements in the nested join */
table_map used_tables; /* bitmap of tables in the nested join */
- table_map not_null_tables; /* tables that rejects nulls */
+ table_map not_null_tables; /* tables that rejects nulls */
struct st_join_table *first_nested;/* the first nested table in the plan */
uint counter; /* to count tables in the nested join */
} NESTED_JOIN;
-
+
typedef struct st_changed_table_list
{
struct st_changed_table_list *next;