diff options
| author | unknown <holyfoot@mysql.com> | 2006-01-04 14:28:41 +0400 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-01-04 14:28:41 +0400 |
| commit | c000e8a11cb8943236a84918718764afb680cfbe (patch) | |
| tree | f0b1730b1c7ac39bb410c00d2b15f767b54ae083 /sql/mysqld.cc | |
| parent | 1aacfd4fb425eb933b2f9d52b0bf373f370370ca (diff) | |
| parent | 6b27acbdf41dd3c990af4627ddaf8fbfcd8eb4e6 (diff) | |
| download | mariadb-git-c000e8a11cb8943236a84918718764afb680cfbe.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
mysql-test/t/backup.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d6d54d180db..1284c76d5df 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2473,9 +2473,7 @@ static int my_message_sql(uint error, const char *str, myf MyFlags) { NET *net= &thd->net; net->report_error= 1; -#ifndef EMBEDDED_LIBRARY /* TODO query cache in embedded library*/ query_cache_abort(net); -#endif if (!net->last_error[0]) // Return only first message { strmake(net->last_error, str, sizeof(net->last_error)-1); |