diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-11-09 14:55:32 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-11-09 14:55:32 -0500 |
| commit | f0e24c795fbceb3d7ad060934e1e399ec939a3f8 (patch) | |
| tree | 80d51cbfd49ff9e193edbb78843eb3e2ebbae2c9 /sql/sql_prepare.cc | |
| parent | 69aee07373c19b5e5615c9a99574c000d0b3c95c (diff) | |
| parent | 10397af9c519b8238599a1ff9fed0d3e871c50e7 (diff) | |
| download | mariadb-git-f0e24c795fbceb3d7ad060934e1e399ec939a3f8.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-community
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge
sql/ha_ndbcluster.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
sql/sql_parse.cc:
Manual merge.
sql/sql_select.cc:
Manual merge.
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 0d31dbe3a8b..46a063db67f 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2867,7 +2867,7 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len) lex_start(thd); error= parse_sql(thd, &lip, NULL) || - thd->net.report_error || + thd->is_error() || init_param_array(this); lex->set_trg_event_type_for_tables(); |