Skip to content

Commit b520feb

Browse files
BuggynoursBuggynours
committed
Resolving conflict on ha_connect.cc
2 parents 0e270f7 + fdd9af5 commit b520feb

File tree

7 files changed

+401
-14
lines changed

7 files changed

+401
-14
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,10 @@ storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result
281281
*.vcproj.*
282282
*.vcproj.*.*
283283
*.vcproj.*.*.*
284+
*.vcxproj
285+
*.vcxproj.*
286+
*.vcxproj.*.*
287+
*.vcxproj.*.*.*
284288

285289
# Build results
286290
[Dd]ebug/

‎storage/connect/ha_connect.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
#define JSONMAX 10 // JSON Default max grp size
170170

171171
extern "C" {
172-
char version[]= "Version 1.03.0007 June 03, 2015";
172+
char version[]= "Version 1.03.0007 July 05, 2015";
173173
#if defined(__WIN__)
174174
char compver[]= "Version 1.03.0007 " __DATE__ " " __TIME__;
175175
char slash= '\\';
@@ -2237,7 +2237,9 @@ bool ha_connect::MakeKeyWhere(PGLOBAL g, PSTRG qry, OPVAL op, char q,
22372237
case OP_EQ:
22382238
case OP_GT:
22392239
case OP_GE:
2240-
oom|= qry->Append((PSZ)GetValStr(op, false));
2240+
case OP_LT:
2241+
case OP_LE:
2242+
oom |= qry->Append((PSZ)GetValStr(op, false));
22412243
break;
22422244
default:
22432245
oom|= qry->Append(" ??? ");

‎storage/connect/mysql-test/connect/r/endian.result

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
SET time_zone='+00:00';
2+
#
3+
# Testing little endian table
4+
#
5+
CREATE TABLE t1
6+
(
7+
fig INT(4) NOT NULL FIELD_FORMAT='C',
8+
name CHAR(10) NOT NULL,
9+
birth DATE NOT NULL FIELD_FORMAT='L',
10+
id CHAR(5) NOT NULL FIELD_FORMAT='L2',
11+
salary DOUBLE(9,2) NOT NULL DEFAULT 0.00 FIELD_FORMAT='LF',
12+
dept INT(4) NOT NULL FIELD_FORMAT='L2'
13+
) ENGINE=CONNECT TABLE_TYPE=BIN BLOCK_SIZE=5 FILE_NAME='Testbal.dat';
14+
SELECT * FROM t1;
15+
fig name birth id salary dept
16+
5500 ARCHIBALD 1980-01-25 3789 4380.50 318
17+
123 OLIVER 1953-08-10 23456 3400.68 2158
18+
3123 FOO 2002-07-23 888 0.00 318
19+
INSERT INTO t1 VALUES (5555,'RONALD','1980-02-26','3333',4444.44,555);
20+
SELECT * FROM t1;
21+
fig name birth id salary dept
22+
5500 ARCHIBALD 1980-01-25 3789 4380.50 318
23+
123 OLIVER 1953-08-10 23456 3400.68 2158
24+
3123 FOO 2002-07-23 888 0.00 318
25+
5555 RONALD 1980-02-26 3333 4444.44 555
26+
DROP TABLE t1;
27+
CREATE TABLE t1
28+
(
29+
fig INT(4) NOT NULL FIELD_FORMAT='C',
30+
name CHAR(10) NOT NULL,
31+
birth DATE NOT NULL,
32+
id CHAR(5) NOT NULL FIELD_FORMAT='S',
33+
salary DOUBLE(9,2) NOT NULL DEFAULT 0.00 FIELD_FORMAT='F',
34+
dept INT(4) NOT NULL FIELD_FORMAT='S'
35+
) ENGINE=CONNECT TABLE_TYPE=BIN BLOCK_SIZE=5 FILE_NAME='Testbal.dat' OPTION_LIST='Endian=Little';
36+
SELECT * FROM t1;
37+
fig name birth id salary dept
38+
5500 ARCHIBALD 1980-01-25 3789 4380.50 318
39+
123 OLIVER 1953-08-10 23456 3400.68 2158
40+
3123 FOO 2002-07-23 888 0.00 318
41+
5555 RONALD 1980-02-26 3333 4444.44 555
42+
#
43+
# Testing big endian table
44+
#
45+
CREATE TABLE t2 (
46+
fig INT(4) NOT NULL FIELD_FORMAT='C',
47+
name CHAR(10) NOT NULL,
48+
birth DATE NOT NULL FIELD_FORMAT='B',
49+
id CHAR(5) NOT NULL FIELD_FORMAT='BS',
50+
salary DOUBLE(9,2) NOT NULL DEFAULT 0.00 FIELD_FORMAT='BF',
51+
dept INT(4) NOT NULL FIELD_FORMAT='B2'
52+
) ENGINE=CONNECT TABLE_TYPE=BIN BLOCK_SIZE=5 FILE_NAME='Testbal.bin';
53+
INSERT INTO t2 SELECT * FROM t1;
54+
SELECT * FROM t2;
55+
fig name birth id salary dept
56+
5500 ARCHIBALD 1980-01-25 3789 4380.50 318
57+
123 OLIVER 1953-08-10 23456 3400.68 2158
58+
3123 FOO 2002-07-23 888 0.00 318
59+
5555 RONALD 1980-02-26 3333 4444.44 555
60+
DROP TABLE t2;
61+
CREATE TABLE t2 (
62+
fig INT(4) NOT NULL FIELD_FORMAT='C',
63+
name CHAR(10) NOT NULL,
64+
birth DATE NOT NULL,
65+
id CHAR(5) NOT NULL FIELD_FORMAT='S',
66+
salary DOUBLE(9,2) NOT NULL DEFAULT 0.00 FIELD_FORMAT='F',
67+
dept INT(4) NOT NULL FIELD_FORMAT='2'
68+
) ENGINE=CONNECT TABLE_TYPE=BIN BLOCK_SIZE=5 FILE_NAME='Testbal.bin' OPTION_LIST='Endian=Big';
69+
SELECT * FROM t2;
70+
fig name birth id salary dept
71+
5500 ARCHIBALD 1980-01-25 3789 4380.50 318
72+
123 OLIVER 1953-08-10 23456 3400.68 2158
73+
3123 FOO 2002-07-23 888 0.00 318
74+
5555 RONALD 1980-02-26 3333 4444.44 555
75+
DROP TABLE t2;
76+
CREATE TABLE t2 (
77+
fig CHAR(4) NOT NULL,
78+
name CHAR(10) NOT NULL,
79+
birth DATE NOT NULL,
80+
id SMALLINT(5) NOT NULL,
81+
salary DOUBLE(9,2) NOT NULL DEFAULT 0.00 FIELD_FORMAT='F',
82+
dept SMALLINT(4) NOT NULL
83+
) ENGINE=CONNECT TABLE_TYPE=BIN BLOCK_SIZE=5 FILE_NAME='Testbal.bin' OPTION_LIST='Endian=Big';
84+
SELECT * FROM t2;
85+
fig name birth id salary dept
86+
5500 ARCHIBALD 1980-01-25 3789 4380.50 318
87+
123 OLIVER 1953-08-10 23456 3400.68 2158
88+
3123 FOO 2002-07-23 888 0.00 318
89+
5555 RONALD 1980-02-26 3333 4444.44 555
90+
DROP TABLE t2;
91+
CREATE TABLE t2 (
92+
fig INT(4) NOT NULL FIELD_FORMAT='C',
93+
name CHAR(10) NOT NULL,
94+
birth DATE NOT NULL FIELD_FORMAT='B',
95+
id CHAR(5) NOT NULL FIELD_FORMAT='BS',
96+
salary DOUBLE(9,2) NOT NULL DEFAULT 0.00 FIELD_FORMAT='BF',
97+
dept SMALLINT(4) NOT NULL FIELD_FORMAT='B'
98+
) ENGINE=CONNECT TABLE_TYPE=BIN BLOCK_SIZE=5 FILE_NAME='Testbal.bin';
99+
SELECT * FROM t2;
100+
fig name birth id salary dept
101+
5500 ARCHIBALD 1980-01-25 3789 4380.50 318
102+
123 OLIVER 1953-08-10 23456 3400.68 2158
103+
3123 FOO 2002-07-23 888 0.00 318
104+
5555 RONALD 1980-02-26 3333 4444.44 555
105+
DROP TABLE t1, t2;

‎storage/connect/mysql-test/connect/r/mysql_index.result

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
#
2+
# Make remote table
3+
#
4+
CREATE TABLE t1 (
5+
id int(11) NOT NULL,
6+
msg char(100) DEFAULT NULL,
7+
PRIMARY KEY (id)
8+
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
9+
INSERT INTO t1 VALUES(1,'Un'),(3,'Trois'),(5,'Cinq');
10+
INSERT INTO t1 VALUES(2,'Two'),(4,'Four'),(6,'Six');
11+
SELECT * FROM t1;
12+
id msg
13+
1 Un
14+
3 Trois
15+
5 Cinq
16+
2 Two
17+
4 Four
18+
6 Six
19+
#
20+
# Make local MYSQL table with indexed id column
21+
#
22+
CREATE TABLE t2 (
23+
id int(11) NOT NULL,
24+
msg char(100) DEFAULT NULL,
25+
PRIMARY KEY (id)
26+
) ENGINE=CONNECT DEFAULT CHARSET=latin1 TABLE_TYPE=MYSQL TABNAME=t1;
27+
#
28+
# Testing SELECT, etc.
29+
#
30+
SELECT * FROM t2;
31+
id msg
32+
1 Un
33+
3 Trois
34+
5 Cinq
35+
2 Two
36+
4 Four
37+
6 Six
38+
SELECT * FROM t2 WHERE id = 3;
39+
id msg
40+
3 Trois
41+
SELECT * FROM t2 WHERE id IN (2,4);
42+
id msg
43+
2 Two
44+
4 Four
45+
SELECT * FROM t2 WHERE id IN (2,4) AND msg = 'Two';
46+
id msg
47+
2 Two
48+
SELECT * FROM t2 WHERE id > 3;
49+
id msg
50+
5 Cinq
51+
4 Four
52+
6 Six
53+
SELECT * FROM t2 WHERE id >= 3;
54+
id msg
55+
3 Trois
56+
5 Cinq
57+
4 Four
58+
6 Six
59+
SELECT * FROM t2 WHERE id < 3;
60+
id msg
61+
1 Un
62+
2 Two
63+
SELECT * FROM t2 WHERE id < 3 OR id > 4;
64+
id msg
65+
1 Un
66+
2 Two
67+
5 Cinq
68+
6 Six
69+
SELECT * FROM t2 WHERE id <= 3;
70+
id msg
71+
1 Un
72+
2 Two
73+
3 Trois
74+
SELECT * FROM t2 WHERE id BETWEEN 3 AND 5;
75+
id msg
76+
3 Trois
77+
4 Four
78+
5 Cinq
79+
SELECT * FROM t2 WHERE id > 2 AND id < 6;
80+
id msg
81+
3 Trois
82+
4 Four
83+
5 Cinq
84+
SELECT * FROM t2 ORDER BY id;
85+
id msg
86+
1 Un
87+
2 Two
88+
3 Trois
89+
4 Four
90+
5 Cinq
91+
6 Six
92+
UPDATE t2 SET msg = 'Five' WHERE id = 5;
93+
Warnings:
94+
Note 1105 t1: 1 affected rows
95+
SELECT * FROM t2;
96+
id msg
97+
1 Un
98+
3 Trois
99+
5 Five
100+
2 Two
101+
4 Four
102+
6 Six
103+
DELETE FROM t2 WHERE id = 4;
104+
Warnings:
105+
Note 1105 t1: 1 affected rows
106+
SELECT * FROM t2;
107+
id msg
108+
1 Un
109+
3 Trois
110+
5 Five
111+
2 Two
112+
6 Six
113+
DROP TABLE t2;
114+
DROP TABLE t1;

‎storage/connect/mysql-test/connect/t/endian.test

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
let $MYSQLD_DATADIR= `select @@datadir`;
2+
3+
--copy_file $MTR_SUITE_DIR/std_data/Testbal.dat $MYSQLD_DATADIR/test/Testbal.dat
4+
5+
SET time_zone='+00:00';
6+
7+
--echo #
8+
--echo # Testing little endian table
9+
--echo #
10+
CREATE TABLE t1
11+
(
12+
fig INT(4) NOT NULL FIELD_FORMAT='C',
13+
name CHAR(10) NOT NULL,
14+
birth DATE NOT NULL FIELD_FORMAT='L',
15+
id CHAR(5) NOT NULL FIELD_FORMAT='L2',
16+
salary DOUBLE(9,2) NOT NULL DEFAULT 0.00 FIELD_FORMAT='LF',
17+
dept INT(4) NOT NULL FIELD_FORMAT='L2'
18+
) ENGINE=CONNECT TABLE_TYPE=BIN BLOCK_SIZE=5 FILE_NAME='Testbal.dat';
19+
SELECT * FROM t1;
20+
INSERT INTO t1 VALUES (5555,'RONALD','1980-02-26','3333',4444.44,555);
21+
SELECT * FROM t1;
22+
23+
DROP TABLE t1;
24+
CREATE TABLE t1
25+
(
26+
fig INT(4) NOT NULL FIELD_FORMAT='C',
27+
name CHAR(10) NOT NULL,
28+
birth DATE NOT NULL,
29+
id CHAR(5) NOT NULL FIELD_FORMAT='S',
30+
salary DOUBLE(9,2) NOT NULL DEFAULT 0.00 FIELD_FORMAT='F',
31+
dept INT(4) NOT NULL FIELD_FORMAT='S'
32+
) ENGINE=CONNECT TABLE_TYPE=BIN BLOCK_SIZE=5 FILE_NAME='Testbal.dat' OPTION_LIST='Endian=Little';
33+
SELECT * FROM t1;
34+
35+
--echo #
36+
--echo # Testing big endian table
37+
--echo #
38+
CREATE TABLE t2 (
39+
fig INT(4) NOT NULL FIELD_FORMAT='C',
40+
name CHAR(10) NOT NULL,
41+
birth DATE NOT NULL FIELD_FORMAT='B',
42+
id CHAR(5) NOT NULL FIELD_FORMAT='BS',
43+
salary DOUBLE(9,2) NOT NULL DEFAULT 0.00 FIELD_FORMAT='BF',
44+
dept INT(4) NOT NULL FIELD_FORMAT='B2'
45+
) ENGINE=CONNECT TABLE_TYPE=BIN BLOCK_SIZE=5 FILE_NAME='Testbal.bin';
46+
INSERT INTO t2 SELECT * FROM t1;
47+
SELECT * FROM t2;
48+
49+
DROP TABLE t2;
50+
CREATE TABLE t2 (
51+
fig INT(4) NOT NULL FIELD_FORMAT='C',
52+
name CHAR(10) NOT NULL,
53+
birth DATE NOT NULL,
54+
id CHAR(5) NOT NULL FIELD_FORMAT='S',
55+
salary DOUBLE(9,2) NOT NULL DEFAULT 0.00 FIELD_FORMAT='F',
56+
dept INT(4) NOT NULL FIELD_FORMAT='2'
57+
) ENGINE=CONNECT TABLE_TYPE=BIN BLOCK_SIZE=5 FILE_NAME='Testbal.bin' OPTION_LIST='Endian=Big';
58+
SELECT * FROM t2;
59+
60+
DROP TABLE t2;
61+
CREATE TABLE t2 (
62+
fig CHAR(4) NOT NULL,
63+
name CHAR(10) NOT NULL,
64+
birth DATE NOT NULL,
65+
id SMALLINT(5) NOT NULL,
66+
salary DOUBLE(9,2) NOT NULL DEFAULT 0.00 FIELD_FORMAT='F',
67+
dept SMALLINT(4) NOT NULL
68+
) ENGINE=CONNECT TABLE_TYPE=BIN BLOCK_SIZE=5 FILE_NAME='Testbal.bin' OPTION_LIST='Endian=Big';
69+
SELECT * FROM t2;
70+
71+
DROP TABLE t2;
72+
CREATE TABLE t2 (
73+
fig INT(4) NOT NULL FIELD_FORMAT='C',
74+
name CHAR(10) NOT NULL,
75+
birth DATE NOT NULL FIELD_FORMAT='B',
76+
id CHAR(5) NOT NULL FIELD_FORMAT='BS',
77+
salary DOUBLE(9,2) NOT NULL DEFAULT 0.00 FIELD_FORMAT='BF',
78+
dept SMALLINT(4) NOT NULL FIELD_FORMAT='B'
79+
) ENGINE=CONNECT TABLE_TYPE=BIN BLOCK_SIZE=5 FILE_NAME='Testbal.bin';
80+
SELECT * FROM t2;
81+
82+
DROP TABLE t1, t2;
83+
84+
#
85+
# Clean up
86+
#
87+
--remove_file $MYSQLD_DATADIR/test/Testbal.dat
88+
--remove_file $MYSQLD_DATADIR/test/Testbal.bin

0 commit comments

Comments
 (0)