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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
551bfe51
Commit
551bfe51
authored
Oct 25, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime
parents
7555c16a
35ca78a0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
93 additions
and
6 deletions
+93
-6
mysql-test/r/select.result
mysql-test/r/select.result
+35
-0
mysql-test/t/select.test
mysql-test/t/select.test
+48
-0
server-tools/instance-manager/mysqlmanager.cc
server-tools/instance-manager/mysqlmanager.cc
+3
-0
sql/sql_base.cc
sql/sql_base.cc
+1
-1
sql/sql_table.cc
sql/sql_table.cc
+6
-5
No files found.
mysql-test/r/select.result
View file @
551bfe51
...
@@ -4081,6 +4081,41 @@ SELECT `x` FROM v3;
...
@@ -4081,6 +4081,41 @@ 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
create table t1(a INT, KEY (a));
create table t1(a INT, KEY (a));
INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
INSERT INTO t1 VALUES (1),(2),(3),(4),(5);
...
...
mysql-test/t/select.test
View file @
551bfe51
...
@@ -3473,6 +3473,54 @@ DROP VIEW v1, v2, v3;
...
@@ -3473,6 +3473,54 @@ 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
#
#
...
...
server-tools/instance-manager/mysqlmanager.cc
View file @
551bfe51
...
@@ -79,6 +79,9 @@ int main(int argc, char *argv[])
...
@@ -79,6 +79,9 @@ int main(int argc, char *argv[])
{
{
int
return_value
;
int
return_value
;
puts
(
"
\n
"
"WARNING: This program is deprecated and will be removed in 6.0.
\n
"
);
/* Initialize. */
/* Initialize. */
MY_INIT
(
argv
[
0
]);
MY_INIT
(
argv
[
0
]);
...
...
sql/sql_base.cc
View file @
551bfe51
...
@@ -7393,7 +7393,7 @@ open_new_frm(THD *thd, TABLE_SHARE *share, const char *alias,
...
@@ -7393,7 +7393,7 @@ open_new_frm(THD *thd, TABLE_SHARE *share, const char *alias,
else
else
{
{
/* only VIEWs are supported now */
/* only VIEWs are supported now */
my_error
(
ER_FRM_UNKNOWN_TYPE
,
MYF
(
0
),
share
->
path
,
parser
->
type
()
->
str
);
my_error
(
ER_FRM_UNKNOWN_TYPE
,
MYF
(
0
),
share
->
path
.
str
,
parser
->
type
()
->
str
);
goto
err
;
goto
err
;
}
}
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
...
...
sql/sql_table.cc
View file @
551bfe51
...
@@ -2380,8 +2380,8 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
...
@@ -2380,8 +2380,8 @@ mysql_prepare_create_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
...
@@ -5200,7 +5200,8 @@ bool alter_table_manage_keys(TABLE *table, int indexes_were_disabled,
...
@@ -5200,7 +5200,8 @@ bool alter_table_manage_keys(TABLE *table, int indexes_were_disabled,
if
(
error
==
HA_ERR_WRONG_COMMAND
)
if
(
error
==
HA_ERR_WRONG_COMMAND
)
{
{
push_warning_printf
(
current_thd
,
MYSQL_ERROR
::
WARN_LEVEL_NOTE
,
push_warning_printf
(
current_thd
,
MYSQL_ERROR
::
WARN_LEVEL_NOTE
,
ER_ILLEGAL_HA
,
ER
(
ER_ILLEGAL_HA
),
table
->
s
->
table_name
);
ER_ILLEGAL_HA
,
ER
(
ER_ILLEGAL_HA
),
table
->
s
->
table_name
.
str
);
error
=
0
;
error
=
0
;
}
else
if
(
error
)
}
else
if
(
error
)
table
->
file
->
print_error
(
error
,
MYF
(
0
));
table
->
file
->
print_error
(
error
,
MYF
(
0
));
...
@@ -5392,7 +5393,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
...
@@ -5392,7 +5393,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
{
{
if
(
def
->
change
&&
!
def
->
field
)
if
(
def
->
change
&&
!
def
->
field
)
{
{
my_error
(
ER_BAD_FIELD_ERROR
,
MYF
(
0
),
def
->
change
,
table
->
s
->
table_name
);
my_error
(
ER_BAD_FIELD_ERROR
,
MYF
(
0
),
def
->
change
,
table
->
s
->
table_name
.
str
);
goto
err
;
goto
err
;
}
}
/*
/*
...
@@ -5427,7 +5428,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
...
@@ -5427,7 +5428,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
}
}
if
(
!
find
)
if
(
!
find
)
{
{
my_error
(
ER_BAD_FIELD_ERROR
,
MYF
(
0
),
def
->
after
,
table
->
s
->
table_name
);
my_error
(
ER_BAD_FIELD_ERROR
,
MYF
(
0
),
def
->
after
,
table
->
s
->
table_name
.
str
);
goto
err
;
goto
err
;
}
}
find_it
.
after
(
def
);
// Put element after this
find_it
.
after
(
def
);
// Put element after this
...
@@ -5437,7 +5438,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
...
@@ -5437,7 +5438,7 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
if
(
alter_info
->
alter_list
.
elements
)
if
(
alter_info
->
alter_list
.
elements
)
{
{
my_error
(
ER_BAD_FIELD_ERROR
,
MYF
(
0
),
my_error
(
ER_BAD_FIELD_ERROR
,
MYF
(
0
),
alter_info
->
alter_list
.
head
()
->
name
,
table
->
s
->
table_name
);
alter_info
->
alter_list
.
head
()
->
name
,
table
->
s
->
table_name
.
str
);
goto
err
;
goto
err
;
}
}
if
(
!
new_create_list
.
elements
)
if
(
!
new_create_list
.
elements
)
...
...
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