Drizzle

Merge lp:~brianaker/drizzle/bug786509-trunk into lp:~drizzle-trunk/drizzle/development

  1. bug786509-trunk
  2. Merge into development
Proposed by Brian Aker
Status: Merged
Approved by: Brian Aker
Approved revision: 2313
Merged at revision: 2317
Proposed branch: lp:~brianaker/drizzle/bug786509-trunk
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 40 lines (+8/-2)
3 files modified
drizzled/sql_yacc.yy (+4/-2)
tests/r/concat.result (+3/-0)
tests/t/concat.test (+1/-0)
To merge this branch: bzr merge lp:~brianaker/drizzle/bug786509-trunk
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+62518@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzled/sql_yacc.yy'
2--- drizzled/sql_yacc.yy 2011-04-28 02:29:52 +0000
3+++ drizzled/sql_yacc.yy 2011-05-26 16:58:43 +0000
4@@ -1,4 +1,6 @@
5-/* Copyright (C) 2000-2003 MySQL AB
6+/*
7+ Copyright (C) 2010-2011 Brian Aker
8+ Copyright (C) 2000-2003 MySQL AB
9
10 This program is free software; you can redistribute it and/or modify
11 it under the terms of the GNU General Public License as published by
12@@ -580,7 +582,7 @@
13 %nonassoc IN_SYM
14 %nonassoc IS NULL_SYM TRUE_SYM FALSE_SYM
15
16-%nonassoc CONCAT
17+%left CONCAT
18 %nonassoc '|'
19 %nonassoc '&'
20 %nonassoc SHIFT_LEFT SHIFT_RIGHT
21
22=== modified file 'tests/r/concat.result'
23--- tests/r/concat.result 2011-02-24 20:50:45 +0000
24+++ tests/r/concat.result 2011-05-26 16:58:43 +0000
25@@ -7,3 +7,6 @@
26 SELECT 1 || 2;
27 1 || 2
28 12
29+SELECT "this" || "dog" || "does" || "not" || "hunt";
30+"this" || "dog" || "does" || "not" || "hunt"
31+thisdogdoesnothunt
32
33=== modified file 'tests/t/concat.test'
34--- tests/t/concat.test 2011-02-24 20:50:45 +0000
35+++ tests/t/concat.test 2011-05-26 16:58:43 +0000
36@@ -3,3 +3,4 @@
37 SELECT "1" || "2";
38 SELECT 1 || 2;
39
40+SELECT "this" || "dog" || "does" || "not" || "hunt";