diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-09-10 02:22:44 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-09-10 02:22:44 +0300 |
| commit | b386f888da6eaf55c50d5ee9f8c2fa46c6b0cbf2 (patch) | |
| tree | b045cc181c0717a5a6787cfc01d4a6744ac330c6 /sql/sql_handler.cc | |
| parent | ed2c4854dd9d6b75f052d0f7e824b68cc68e35d0 (diff) | |
| download | mariadb-git-b386f888da6eaf55c50d5ee9f8c2fa46c6b0cbf2.tar.gz | |
post merge fixes
mysql-test/t/merge.test:
additional test
sql/item.h:
parameter to detect need of saving view field names
sql/item_subselect.cc:
arena fix
used nearest thd pointer
sql/item_sum.cc:
after merge fix
sql/mysql_priv.h:
after merge fix
sql/sql_base.cc:
fixed unique test
fixed postmerge arena mamgement
sql/sql_class.h:
mey method to detect conventional execution
sql/sql_handler.cc:
new parameter
sql/sql_lex.cc:
fixed postmerge arena mamgement
sql/sql_parse.cc:
fixed unique test
sql/sql_select.cc:
fixed postmerge arena mamgement
sql/sql_union.cc:
fixed postmerge arena mamgement
sql/sql_view.cc:
fixed postmerge arena mamgement
sql/table.cc:
fixed postmerge arena mamgement
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 0df3d617d7f..f95291d914e 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -249,7 +249,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); |