diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-10-07 14:18:09 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-10-07 14:18:09 +0300 |
| commit | 63c7276f365c4f00168d75e3a1d63bb959df1dc1 (patch) | |
| tree | ae1d8d4885a5aa3e83ca4246b189760e128283c3 /sql | |
| parent | 9def70036f82bc3d9338b1584226451bbe88ab96 (diff) | |
| download | mariadb-git-63c7276f365c4f00168d75e3a1d63bb959df1dc1.tar.gz | |
Fix for 'mysqladmin -w1 unknown-command'
Manual Changelog update
Docs/manual.texi:
Changelog
client/mysqladmin.c:
Fix for 'mysqladmin -w1 unknown-command'
libmysql/violite.c:
Fix for TCP_NODELAY
mysql-test/mysql-test-run.sh:
Portability fixes
sql/sql_lex.cc:
Cleanup
sql/sql_lex.h:
Cleanup
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_lex.cc | 2 | ||||
| -rw-r--r-- | sql/sql_lex.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index e0044a0710f..5c63fa32293 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -147,7 +147,7 @@ LEX *lex_start(THD *thd, uchar *buf,uint length) lex->in_sum_expr=0; lex->expr_list.empty(); lex->ftfunc_list.empty(); - lex->convert_set=(lex->thd=thd)->convert_set; + lex->convert_set=thd->convert_set; lex->yacc_yyss=lex->yacc_yyvs=0; lex->ignore_space=test(thd->sql_mode & MODE_IGNORE_SPACE); return lex; diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 10a99f920bd..7a4a5034b18 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -129,7 +129,6 @@ typedef struct st_lex { CONVERT *convert_set; LEX_USER *grant_user; gptr yacc_yyss,yacc_yyvs; - THD *thd; udf_func udf; HA_CHECK_OPT check_opt; // check/repair options HA_CREATE_INFO create_info; |