diff options
| author | unknown <kostja@dipika.(none)> | 2008-02-19 14:53:22 +0300 |
|---|---|---|
| committer | unknown <kostja@dipika.(none)> | 2008-02-19 14:53:22 +0300 |
| commit | ead02981eae47130fe5d205a11336b3c00225be1 (patch) | |
| tree | 04e23b57dfe474c6eec621c1ff38cbb47a67058c /sql/sql_class.cc | |
| parent | da1a6127d61bf8ef7c4fd0c48afb2572260f9fb8 (diff) | |
| parent | 526798dbb55c79b62e795a1cf40062030e2342bd (diff) | |
| download | mariadb-git-ead02981eae47130fe5d205a11336b3c00225be1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into dipika.(none):/opt/local/work/mysql-5.1-2pc-opt-merge-push
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
Manual merge.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 176381e77c4..a24266c775c 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -264,7 +264,7 @@ const char *set_thd_proc_info(THD *thd, const char *info, extern "C" void **thd_ha_data(const THD *thd, const struct handlerton *hton) { - return (void **) thd->ha_data + hton->slot; + return (void **) &thd->ha_data[hton->slot].ha_ptr; } extern "C" @@ -2520,7 +2520,7 @@ bool select_dumpvar::send_data(List<Item> &items) suv->update(); } } - DBUG_RETURN(0); + DBUG_RETURN(thd->is_error()); } bool select_dumpvar::send_eof() |