diff options
| author | unknown <monty@mysql.com> | 2004-03-31 03:32:38 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-31 03:32:38 +0300 |
| commit | 93c70c07722d3e6edccd371e6c3a8b14d2f40750 (patch) | |
| tree | 0404bd0f500145286f101ddeb518678df83896d7 /sql/sql_base.cc | |
| parent | 2ac5a256fea5e620eccefab6636f0d29f89e56f0 (diff) | |
| download | mariadb-git-93c70c07722d3e6edccd371e6c3a8b14d2f40750.tar.gz | |
simple optimzation
Portability fixes
client/mysqltest.c:
Fixed that if error number 0 is included in --error, we will not generate an error message
include/mysql.h:
Portability fix
mysql-test/mysql-test-run.sh:
Portability fix
mysql-test/r/heap_btree.result:
Portability fix
mysql-test/r/rpl_error_ignored_table.result:
Portability fix
mysql-test/t/heap_btree.test:
Portability fix
mysql-test/t/rpl_error_ignored_table.test:
Portability fix
sql/sql_base.cc:
simple optimzation
sql/sql_yacc.yy:
simple optimzation
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index c5cd124bf43..60c2938ba4e 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2293,14 +2293,14 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name, DBUG_RETURN(-1); #endif Field **ptr=table->field,*field; - TABLE *natural_join_table; + TABLE *natural_join_table= 0; + thd->used_tables|=table->map; - if (table->outer_join || - !tables->natural_join || - tables->natural_join->table->outer_join) - natural_join_table= NULL; - else + if (!table->outer_join && + tables->natural_join && + !tables->natural_join->table->outer_join) natural_join_table= tables->natural_join->table; + while ((field = *ptr++)) { /* Skip duplicate field names if NATURAL JOIN is used */ |