diff options
| author | unknown <timour@mysql.com> | 2006-03-06 11:41:19 +0200 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2006-03-06 11:41:19 +0200 |
| commit | cda64c11d7db595b8d211c899c0ccbb8fa79bb64 (patch) | |
| tree | 0eaaef247d07eafc443600f3470cc5302e4799d2 /sql/table.h | |
| parent | bb453729b8860fca3f3064287fecf566faa35397 (diff) | |
| parent | de1e87bbcd5ca4f830e7af42da34ef0d3228b28e (diff) | |
| download | mariadb-git-cda64c11d7db595b8d211c899c0ccbb8fa79bb64.tar.gz | |
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-bug-15229
mysql-test/r/join.result:
Auto merged
mysql-test/t/join.test:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/sql_base.cc:
SCCS merged
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(); }; |