Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
60479953
Commit
60479953
authored
May 26, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
merge
sql/item.cc: Auto merged
parents
91427f24
80b0baa7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
2 deletions
+26
-2
mysql-test/r/union.result
mysql-test/r/union.result
+14
-0
mysql-test/t/union.test
mysql-test/t/union.test
+10
-0
sql/item.cc
sql/item.cc
+2
-2
No files found.
mysql-test/r/union.result
View file @
60479953
...
@@ -1235,6 +1235,20 @@ show columns from t2;
...
@@ -1235,6 +1235,20 @@ show columns from t2;
Field Type Null Key Default Extra
Field Type Null Key Default Extra
a varchar(3) YES NULL
a varchar(3) YES NULL
drop table t2, t1;
drop table t2, t1;
CREATE TABLE t1 (a mediumtext);
CREATE TABLE t2 (b varchar(20));
INSERT INTO t1 VALUES ('a'),('b');
SELECT left(a,100000000) FROM t1 UNION SELECT b FROM t2;
left(a,100000000)
a
b
create table t3 SELECT left(a,100000000) FROM t1 UNION SELECT b FROM t2;
show create table t3;
Table Create Table
t3 CREATE TABLE `t3` (
`left(a,100000000)` longtext
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop tables t1,t2,t3;
create table t1 ( id int not null auto_increment, primary key (id), col1 int);
create table t1 ( id int not null auto_increment, primary key (id), col1 int);
insert into t1 (col1) values (2),(3),(4),(5),(6);
insert into t1 (col1) values (2),(3),(4),(5),(6);
select 99 union all select id from t1 order by 1;
select 99 union all select id from t1 order by 1;
...
...
mysql-test/t/union.test
View file @
60479953
...
@@ -743,6 +743,16 @@ create table t2 select a from t1 union select b from t1;
...
@@ -743,6 +743,16 @@ create table t2 select a from t1 union select b from t1;
show
columns
from
t2
;
show
columns
from
t2
;
drop
table
t2
,
t1
;
drop
table
t2
,
t1
;
#
# correct conversion long string to TEXT (BUG#10025)
#
CREATE
TABLE
t1
(
a
mediumtext
);
CREATE
TABLE
t2
(
b
varchar
(
20
));
INSERT
INTO
t1
VALUES
(
'a'
),(
'b'
);
SELECT
left
(
a
,
100000000
)
FROM
t1
UNION
SELECT
b
FROM
t2
;
create
table
t3
SELECT
left
(
a
,
100000000
)
FROM
t1
UNION
SELECT
b
FROM
t2
;
show
create
table
t3
;
drop
tables
t1
,
t2
,
t3
;
#
#
# Bug #10032 Bug in parsing UNION with ORDER BY when one node does not use FROM
# Bug #10032 Bug in parsing UNION with ORDER BY when one node does not use FROM
...
...
sql/item.cc
View file @
60479953
...
@@ -3100,8 +3100,8 @@ Field *Item_type_holder::make_field_by_type(TABLE *table)
...
@@ -3100,8 +3100,8 @@ Field *Item_type_holder::make_field_by_type(TABLE *table)
enum_set_typelib
,
collation
.
collation
);
enum_set_typelib
,
collation
.
collation
);
case
MYSQL_TYPE_VAR_STRING
:
case
MYSQL_TYPE_VAR_STRING
:
table
->
db_create_options
|=
HA_OPTION_PACK_RECORD
;
table
->
db_create_options
|=
HA_OPTION_PACK_RECORD
;
return
new
Field_string
(
max_length
,
maybe_null
,
name
,
table
,
fld_type
=
MYSQL_TYPE_STRING
;
collation
.
collation
)
;
break
;
default:
default:
break
;
break
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment