diff options
author | unknown <monty@mysql.com> | 2004-09-03 21:43:04 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-09-03 21:43:04 +0300 |
commit | d0211cf5beae33c7f33d7aab6acebe13892af47c (patch) | |
tree | c31fa248fd578ef7653342364a6cf7d8bedf1f0b /sql/table.h | |
parent | 10d0dca6b4a1be61df17cc017d8073d6543ecf26 (diff) | |
download | mariadb-git-d0211cf5beae33c7f33d7aab6acebe13892af47c.tar.gz |
Cleanup of new code pushed into 5.0 since last pull
Merged the different find_xxxx_table_in_list functions to one + some inline functions
mysql-test/r/view.result:
Fix result (remove not used view from show tables)
sql/item_subselect.cc:
Remove not used functions
sql/item_subselect.h:
Remove not used functions
sql/mysql_priv.h:
Merged the different find_xxxx_table_in_list functions to one + some inline functions
sql/sql_acl.cc:
More debugging + simple cleanups
sql/sql_base.cc:
Merged the different find_xxxx_table_in_list functions to one + some inline functions
Indentation cleanups & more comments
sql/sql_delete.cc:
Namechange
sql/sql_insert.cc:
Simple optimizations & Style cleanups
Merged common code (in mysql_prepare_insert_check_table)
sql/sql_lex.cc:
function name changes
More comments
sql/sql_parse.cc:
Function name changes
Made check_one_table_access returning bool
More debugging in 'check_access'
Added function 'check_some_access', which is used when creating a view
sql/sql_prepare.cc:
Resetting flag directly after test makes code easier to read
sql/sql_select.cc:
Code simplifications
sql/sql_show.cc:
Indentation cleanups.
Fixed typo in name
sql/sql_update.cc:
Function name change
sql/sql_view.cc:
Simple optimizations.
Style fixes.
Remove view_field_names[]
Simplified 'check_key_in_view()'
sql/table.cc:
Simplified new code in openfrm()
variable name change i -> item
Indentation changes
sql/table.h:
Fixed typo in variable name
Method name change in field iterator: end() -> end_of_fields()
tests/client_test.c:
Changed number to macro
Diffstat (limited to 'sql/table.h')
-rw-r--r-- | sql/table.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/table.h b/sql/table.h index 5e00820a6e5..02e470a69e0 100644 --- a/sql/table.h +++ b/sql/table.h @@ -172,7 +172,7 @@ struct st_table { #define JOIN_TYPE_RIGHT 2 #define VIEW_ALGORITHM_UNDEFINED 0 -#define VIEW_ALGORITHM_TMEPTABLE 1 +#define VIEW_ALGORITHM_TMPTABLE 1 #define VIEW_ALGORITHM_MERGE 2 struct st_lex; @@ -255,7 +255,7 @@ public: virtual ~Field_iterator() {} virtual void set(TABLE_LIST *)= 0; virtual void next()= 0; - virtual bool end()= 0; + virtual bool end_of_fields()= 0; /* Return 1 at end of list */ virtual const char *name()= 0; virtual Item *item(THD *)= 0; virtual Field *field()= 0; @@ -270,7 +270,7 @@ public: void set(TABLE_LIST *table) { ptr= table->table->field; } void set_table(TABLE *table) { ptr= table->field; } void next() { ptr++; } - bool end() { return test(*ptr); } + bool end_of_fields() { return *ptr == 0; } const char *name(); Item *item(THD *thd); Field *field() { return *ptr; } @@ -284,7 +284,7 @@ public: Field_iterator_view() :ptr(0), array_end(0) {} void set(TABLE_LIST *table); void next() { ptr++; } - bool end() { return ptr < array_end; } + bool end_of_fields() { return ptr == array_end; } const char *name(); Item *item(THD *thd) { return *ptr; } Field *field() { return 0; } |