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
6d15d42e
Commit
6d15d42e
authored
17 years ago
by
malff@lambda.weblab
Browse files
Options
Browse Files
Download
Plain Diff
Merge lambda.weblab:/home/malff/TREE/mysql-5.0-base
into lambda.weblab:/home/malff/TREE/mysql-5.0-rt-merge
parents
53b1c3a2
b2264ff8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
84 additions
and
1 deletion
+84
-1
mysql-test/r/select.result
mysql-test/r/select.result
+35
-0
mysql-test/t/select.test
mysql-test/t/select.test
+48
-0
sql/sql_table.cc
sql/sql_table.cc
+1
-1
No files found.
mysql-test/r/select.result
View file @
6d15d42e
...
@@ -4096,4 +4096,39 @@ SELECT `x` FROM v3;
...
@@ -4096,4 +4096,39 @@ SELECT `x` FROM v3;
x
x
1
1
DROP VIEW v1, v2, v3;
DROP VIEW v1, v2, v3;
#
# Bug#30736: Row Size Too Large Error Creating a Table and
# Inserting Data.
#
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;
CREATE TABLE t1(
c1 DECIMAL(10, 2),
c2 FLOAT);
INSERT INTO t1 VALUES (0, 1), (2, 3), (4, 5);
CREATE TABLE t2(
c3 DECIMAL(10, 2))
SELECT
c1 * c2 AS c3
FROM t1;
SELECT * FROM t1;
c1 c2
0.00 1
2.00 3
4.00 5
SELECT * FROM t2;
c3
0.00
6.00
20.00
DROP TABLE t1;
DROP TABLE t2;
End of 5.0 tests
End of 5.0 tests
This diff is collapsed.
Click to expand it.
mysql-test/t/select.test
View file @
6d15d42e
...
@@ -3484,4 +3484,52 @@ DROP VIEW v1, v2, v3;
...
@@ -3484,4 +3484,52 @@ DROP VIEW v1, v2, v3;
--
enable_ps_protocol
--
enable_ps_protocol
###########################################################################
--
echo
--
echo
#
--
echo
# Bug#30736: Row Size Too Large Error Creating a Table and
--
echo
# Inserting Data.
--
echo
#
--
disable_warnings
DROP
TABLE
IF
EXISTS
t1
;
DROP
TABLE
IF
EXISTS
t2
;
--
enable_warnings
--
echo
CREATE
TABLE
t1
(
c1
DECIMAL
(
10
,
2
),
c2
FLOAT
);
--
echo
INSERT
INTO
t1
VALUES
(
0
,
1
),
(
2
,
3
),
(
4
,
5
);
--
echo
CREATE
TABLE
t2
(
c3
DECIMAL
(
10
,
2
))
SELECT
c1
*
c2
AS
c3
FROM
t1
;
--
echo
SELECT
*
FROM
t1
;
--
echo
SELECT
*
FROM
t2
;
--
echo
DROP
TABLE
t1
;
DROP
TABLE
t2
;
--
echo
###########################################################################
--
echo
End
of
5.0
tests
--
echo
End
of
5.0
tests
This diff is collapsed.
Click to expand it.
sql/sql_table.cc
View file @
6d15d42e
...
@@ -955,8 +955,8 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
...
@@ -955,8 +955,8 @@ static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
sql_field
->
length
=
dup_field
->
char_length
;
sql_field
->
length
=
dup_field
->
char_length
;
sql_field
->
pack_length
=
dup_field
->
pack_length
;
sql_field
->
pack_length
=
dup_field
->
pack_length
;
sql_field
->
key_length
=
dup_field
->
key_length
;
sql_field
->
key_length
=
dup_field
->
key_length
;
sql_field
->
create_length_to_internal_length
();
sql_field
->
decimals
=
dup_field
->
decimals
;
sql_field
->
decimals
=
dup_field
->
decimals
;
sql_field
->
create_length_to_internal_length
();
sql_field
->
unireg_check
=
dup_field
->
unireg_check
;
sql_field
->
unireg_check
=
dup_field
->
unireg_check
;
/*
/*
We're making one field from two, the result field will have
We're making one field from two, the result field will have
...
...
This diff is collapsed.
Click to expand it.
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