Drizzle

Merge lp:~posulliv/drizzle/bug610543 into lp:~drizzle-trunk/drizzle/development

  1. bug610543
  2. Merge into development
Proposed by Padraig O'Sullivan
Status: Merged
Approved by: Brian Aker
Approved revision: 1669
Merged at revision: 1670
Proposed branch: lp:~posulliv/drizzle/bug610543
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 20 lines (+8/-2)
1 file modified
drizzled/sql_lex.cc (+8/-2)
To merge this branch: bzr merge lp:~posulliv/drizzle/bug610543
Reviewer Review Type Date Requested Status
Monty Taylor Approve
Review via email: mp+31079@code.launchpad.net

Description of the change

Fix for crashing bug.

To post a comment you must log in.
Revision history for this message
Monty Taylor (mordred) wrote :

Yes. This fixes it for me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzled/sql_lex.cc'
2--- drizzled/sql_lex.cc 2010-06-24 05:34:43 +0000
3+++ drizzled/sql_lex.cc 2010-07-27 19:03:45 +0000
4@@ -1860,8 +1860,14 @@
5 for this.
6 */
7 LEX::LEX()
8- :result(0), yacc_yyss(0), yacc_yyvs(0),
9- sql_command(SQLCOM_END), option_type(OPT_DEFAULT), is_lex_started(0)
10+ :
11+ result(0),
12+ yacc_yyss(0),
13+ yacc_yyvs(0),
14+ charset(NULL),
15+ sql_command(SQLCOM_END),
16+ option_type(OPT_DEFAULT),
17+ is_lex_started(0)
18 {
19 reset_query_tables_list(true);
20 statement= NULL;