Merge lp:drizzle/7.0 into lp:~drizzle-trunk/drizzle/development

Proposed by Brian Aker on 2011-04-03
Status: Merged
Approved by: Brian Aker on 2011-04-03
Approved revision: 2243
Merged at revision: 2264
Proposed branch: lp:drizzle/7.0
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 169 lines (+72/-2) (has conflicts)
5 files modified
drizzled/sql_yacc.yy (+19/-1)
drizzled/symbol_hash.gperf (+3/-1)
plugin/transaction_log/plugin.am (+13/-0)
tests/suite/mysql_compatibility/r/character_sets.result (+16/-0)
tests/suite/mysql_compatibility/t/character_sets.test (+21/-0)
Text conflict in plugin/transaction_log/plugin.am
To merge this branch: bzr merge lp:drizzle/7.0
Reviewer Review Type Date Requested Status
Drizzle Merge Team 2011-04-03 Pending
Review via email: mp+56067@code.launchpad.net

Description of the change

Update stable to trunk.

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 '.bzrignore'
2=== modified file 'drizzled/sql_yacc.yy'
3--- drizzled/sql_yacc.yy 2011-03-29 12:45:08 +0000
4+++ drizzled/sql_yacc.yy 2011-04-03 06:49:32 +0000
5@@ -237,6 +237,7 @@
6 %token CATALOG_SYM
7 %token CHAIN_SYM /* SQL-2003-N */
8 %token CHANGE_SYM
9+%token CHARSET
10 %token CHAR_SYM /* SQL-2003-R */
11 %token CHECKSUM_SYM
12 %token CHECK_SYM /* SQL-2003-R */
13@@ -470,7 +471,7 @@
14 %token SERIAL_SYM
15 %token SESSION_SYM /* SQL-2003-N */
16 %token SERVER_SYM
17-%token SET_SYM /* SQL-2003-R */
18+%token SET_SYM /* SQL-2003-R */
19 %token SET_VAR
20 %token SHARE_SYM
21 %token SHOW
22@@ -537,6 +538,7 @@
23 %token USING /* SQL-2003-R */
24 %token UTC_DATE_SYM
25 %token UTC_TIMESTAMP_SYM
26+%token UTF8_SYM
27 %token UUID_SYM
28 %token VALUES /* SQL-2003-R */
29 %token VALUE_SYM /* SQL-2003-R */
30@@ -1074,9 +1076,25 @@
31 {
32 parser::buildEngineOption(&Lex, $1.str, $3);
33 }
34+ | default_charset
35 | default_collation
36 ;
37
38+charset:
39+ CHAR_SYM SET_SYM {}
40+ | CHARSET {}
41+ ;
42+
43+charset_name_or_default:
44+ UTF8_SYM { }
45+ | DEFAULT { }
46+ ;
47+
48+default_charset:
49+ opt_default charset opt_equal charset_name_or_default
50+ {
51+ }
52+
53 default_collation:
54 opt_default COLLATE_SYM opt_equal collation_name_or_default
55 {
56
57=== modified file 'drizzled/symbol_hash.gperf'
58--- drizzled/symbol_hash.gperf 2011-02-24 20:50:45 +0000
59+++ drizzled/symbol_hash.gperf 2011-04-03 06:49:32 +0000
60@@ -52,7 +52,7 @@
61 >, GREATER_THAN
62 <<, SHIFT_LEFT
63 >>, SHIFT_RIGHT
64-# Access likes this
65+# Access likes this, keep everything supported below this
66 ACTION, ACTION
67 ADD, ADD_SYM
68 AFTER, AFTER_SYM
69@@ -89,6 +89,7 @@
70 CHANGE, CHANGE_SYM
71 CHAR, CHAR_SYM
72 CHARACTER, CHAR_SYM
73+CHARSET, CHARSET
74 CHECK, CHECK_SYM
75 CHECKSUM, CHECKSUM_SYM
76 CLOSE, CLOSE_SYM
77@@ -384,6 +385,7 @@
78 USING, USING
79 UTC_DATE, UTC_DATE_SYM
80 UTC_TIMESTAMP, UTC_TIMESTAMP_SYM
81+UTF8, UTF8_SYM
82 UUID, UUID_SYM
83 VALUE, VALUE_SYM
84 VALUES, VALUES
85
86=== modified file 'plugin/transaction_log/plugin.am'
87--- plugin/transaction_log/plugin.am 2011-04-01 22:59:12 +0000
88+++ plugin/transaction_log/plugin.am 2011-04-03 06:49:32 +0000
89@@ -30,15 +30,28 @@
90 plugin/transaction_log/utilities/transaction_manager.cc \
91 plugin/transaction_log/utilities/transaction_log_connection.cc
92
93+<<<<<<< TREE
94 plugin_transaction_log_utilities_drizzletrx_LDADD = \
95 drizzled/message/libdrizzledmessage.la \
96 drizzled/internal/libinternal.la \
97 drizzled/algorithm/libhash.la \
98 drizzled/util/libutil.la \
99 libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la \
100+=======
101+plugin_transaction_log_utilities_drizzletrx_LDADD = \
102+ $(top_builddir)/drizzled/message/libdrizzledmessage.la \
103+ ${top_builddir}/drizzled/internal/libinternal.la \
104+ ${top_builddir}/drizzled/algorithm/libhash.la \
105+ ${top_builddir}/drizzled/util/libutil.la \
106+ ${top_builddir}/libdrizzle/libdrizzle.la \
107+>>>>>>> MERGE-SOURCE
108 ${LIBPROTOBUF} \
109 ${LIBUUID} \
110 ${LTLIBINTL} \
111 $(GCOV_LIBS)
112
113+<<<<<<< TREE
114 plugin_transaction_log_utilities_drizzletrx_CXXFLAGS = ${AM_CXXFLAGS} ${PROTOSKIP_WARNINGS} ${NO_WERROR} ${LIBDRIZZLE_CPPFLAGS}
115+=======
116+plugin_transaction_log_utilities_drizzletrx_CXXFLAGS = ${AM_CXXFLAGS} ${PROTOSKIP_WARNINGS} ${NO_WERROR}
117+>>>>>>> MERGE-SOURCE
118
119=== modified file 'tests/lib/drizzle_test_run/dtr_test_execution.py'
120=== modified file 'tests/lib/randgen/randgen_test_execution.py'
121=== modified file 'tests/lib/sys_mgmt/codeTree.py'
122=== added file 'tests/suite/mysql_compatibility/r/character_sets.result'
123--- tests/suite/mysql_compatibility/r/character_sets.result 1970-01-01 00:00:00 +0000
124+++ tests/suite/mysql_compatibility/r/character_sets.result 2011-04-03 06:49:32 +0000
125@@ -0,0 +1,16 @@
126+CREATE TABLE `test1` (
127+`c1` varchar(10) NOT NULL
128+) DEFAULT CHARSET=latin1;
129+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your Drizzle server version for the right syntax to use near 'latin1' at line 2
130+CREATE TABLE `test2` (
131+`c1` varchar(10) NOT NULL
132+) DEFAULT CHARSET=utf8;
133+DROP TABLE test2;
134+CREATE TABLE `test2` (
135+`c1` varchar(10) NOT NULL
136+) DEFAULT CHARSET utf8;
137+DROP TABLE test2;
138+CREATE TABLE `test2` (
139+`c1` varchar(10) NOT NULL
140+) DEFAULT CHARSET DEFAULT;
141+DROP TABLE test2;
142
143=== added file 'tests/suite/mysql_compatibility/t/character_sets.test'
144--- tests/suite/mysql_compatibility/t/character_sets.test 1970-01-01 00:00:00 +0000
145+++ tests/suite/mysql_compatibility/t/character_sets.test 2011-04-03 06:49:32 +0000
146@@ -0,0 +1,21 @@
147+# Make sure we parse/toss errrors on character sets
148+--error ER_PARSE_ERROR
149+CREATE TABLE `test1` (
150+ `c1` varchar(10) NOT NULL
151+ ) DEFAULT CHARSET=latin1;
152+
153+
154+CREATE TABLE `test2` (
155+ `c1` varchar(10) NOT NULL
156+ ) DEFAULT CHARSET=utf8;
157+DROP TABLE test2;
158+
159+CREATE TABLE `test2` (
160+ `c1` varchar(10) NOT NULL
161+ ) DEFAULT CHARSET utf8;
162+DROP TABLE test2;
163+
164+CREATE TABLE `test2` (
165+ `c1` varchar(10) NOT NULL
166+ ) DEFAULT CHARSET DEFAULT;
167+DROP TABLE test2;
168
169=== modified file 'tests/test-run.pl'