diff options
| author | timour@mysql.com <> | 2006-03-06 11:41:19 +0200 |
|---|---|---|
| committer | timour@mysql.com <> | 2006-03-06 11:41:19 +0200 |
| commit | 593bd1d3b8bed1164ba3274488f4ab93f2a95ff5 (patch) | |
| tree | 0eaaef247d07eafc443600f3470cc5302e4799d2 /sql/table.h | |
| parent | 33e7d20f370d3bd6905c10b47c0acd23dec79e4a (diff) | |
| parent | 103604ed06e8002f31b20bcd0f1d1ca97a6f43f8 (diff) | |
| download | mariadb-git-593bd1d3b8bed1164ba3274488f4ab93f2a95ff5.tar.gz | |
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-bug-15229
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index cd511e7b5ee..9d6e4764de3 100644 --- a/sql/table.h +++ b/sql/table.h @@ -787,7 +787,7 @@ public: GRANT_INFO *grant(); Item *create_item(THD *thd) { return field_it->create_item(thd); } Field *field() { return field_it->field(); } - Natural_join_column *get_or_create_column_ref(bool *is_created); + Natural_join_column *get_or_create_column_ref(TABLE_LIST *parent_table_ref); Natural_join_column *get_natural_column_ref(); }; |