summaryrefslogtreecommitdiff
path: root/sql/sql_error.cc
diff options
context:
space:
mode:
authorpem@mysql.telia.com <>2003-07-08 17:50:23 +0200
committerpem@mysql.telia.com <>2003-07-08 17:50:23 +0200
commit9c3a7a6ba3eb62b5134577e1a42a59c0f5d9ab05 (patch)
tree74630fcd49c30dc287ee12828be728366d6d070e /sql/sql_error.cc
parent3e99e79d878e9d747e91fa06ec20e971e34297d2 (diff)
parentc908b555ff3dae8511a7529f2cd8717d1f848c03 (diff)
downloadmariadb-git-9c3a7a6ba3eb62b5134577e1a42a59c0f5d9ab05.tar.gz
Merge 4.1 into 5.0 (first pass).
Diffstat (limited to 'sql/sql_error.cc')
-rw-r--r--sql/sql_error.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc
index db0dbe0dedc..3676f4644d2 100644
--- a/sql/sql_error.cc
+++ b/sql/sql_error.cc
@@ -184,7 +184,7 @@ my_bool mysqld_show_warnings(THD *thd, ulong levels_to_show)
DBUG_RETURN(1);
MYSQL_ERROR *err;
- SELECT_LEX *sel= &thd->lex.select_lex;
+ SELECT_LEX *sel= &thd->lex->select_lex;
ha_rows offset= sel->offset_limit, limit= sel->select_limit;
Protocol *protocol=thd->protocol;