diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-02-15 02:49:02 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-02-15 02:49:02 +0200 |
| commit | 93c1f96f7d694afcc90d1af7f5868f9e0a5777e0 (patch) | |
| tree | 6287deffb9d29608cfbc947946f62697fc2c4c21 /libmysqld | |
| parent | d44aef016cf55dd6852fe6669e309925d07b3df2 (diff) | |
| download | mariadb-git-93c1f96f7d694afcc90d1af7f5868f9e0a5777e0.tar.gz | |
Fix after merge from 3.23
Docs/manual.texi:
Added section about LOAD DATA LOCAL
libmysqld/lib_sql.cc:
Remove not used option
mysql-test/r/comments.result:
Updated results
sql/sql_parse.cc:
Fix queries / second
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 0097aa5068d..2a9a369e645 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -121,8 +121,6 @@ void start_embedded_conn1(NET * net) if (thd->max_join_size == HA_POS_ERROR) thd->options |= OPTION_BIG_SELECTS; - if (thd->options & OPTION_ANSI_MODE) - thd->client_capabilities|=CLIENT_IGNORE_SPACE; thd->proc_info=0; // Remove 'login' thd->command=COM_SLEEP; |