diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-01-22 15:52:15 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-01-22 15:52:15 +0200 |
| commit | ea65c36c19225f91a686c4cc33b1fe1527f1e785 (patch) | |
| tree | ae0f1a98a4c8478360e9c365fbd767264d164a43 /sql/table.cc | |
| parent | 3b31ad35321a15ef22c4170a26e1060ca6313e44 (diff) | |
| download | mariadb-git-ea65c36c19225f91a686c4cc33b1fe1527f1e785.tar.gz | |
Fixed compiler warnings
Fixed wrong merge that disabled 'make test'
Renamed all suppress files to end in '.supp'
Don't give "skipped %d bytes from file" warnings in 5.0
mysql-test/purify.supp:
Rename: mysql-test/suppress.purify -> mysql-test/purify.supp
support-files/compiler_warnings.supp:
Rename: support-files/disabled_compiler_warnings.txt -> support-files/compiler_warnings.supp
Makefile.am:
Added back missing cd from wrong merge
heap/hp_write.c:
Fixed compiler warning
mysql-test/r/mysqlbinlog.result:
Fixed test case to drop all used tables at start and used tables after each test group
mysql-test/t/mysqlbinlog.test:
Fixed test case to drop all used tables at start and used tables after each test group
sql/net_serv.cc:
Don't give "skipped %d bytes from file" warnings in 5.0
(The proper fix for this is in 5.1)
sql/table.cc:
Fixed compiler warning
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 4f1b8e6c833..f220c6e4cb5 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2915,7 +2915,8 @@ Field_iterator_table_ref::get_or_create_column_ref(TABLE_LIST *parent_table_ref) uint field_count; TABLE_LIST *add_table_ref= parent_table_ref ? parent_table_ref : table_ref; - + LINT_INIT(field_count); + if (field_it == &table_field_it) { /* The field belongs to a stored table. */ |