diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-09-10 14:01:02 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-09-10 14:01:02 +0300 |
| commit | 28d840f6e2227ce68d49a66432abd48d4055e455 (patch) | |
| tree | ac6849ba97c2655adaad147d095a2875ae197d4a /sql/sql_handler.cc | |
| parent | b61e1f7f6d8d8f8a7d4745cd0277f0faec8f8b49 (diff) | |
| parent | 01b88943d01e60295f87d75f5963aa26478fd8f9 (diff) | |
| download | mariadb-git-28d840f6e2227ce68d49a66432abd48d4055e455.tar.gz | |
Merge
sql/sql_handler.cc:
Auto merged
mysql-test/r/view.result:
SCCS merged
mysql-test/t/view.test:
SCCS merged
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 4dc76ed6981..1443f9f9d5f 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -253,7 +253,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, it++; // Skip first NULL field - insert_fields(thd, tables, tables->db, tables->alias, &it, 0); + insert_fields(thd, tables, tables->db, tables->alias, &it, 0, 0); select_limit+=offset_limit; protocol->send_fields(&list, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF); |