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
ce2403e6
Commit
ce2403e6
authored
Jul 19, 2010
by
Davi Arnaut
Browse files
Options
Browse Files
Download
Plain Diff
Merge into mysql-trunk-merge..
parents
d4885416
0c974ba5
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
98 additions
and
12 deletions
+98
-12
mysql-test/suite/innodb/r/innodb_bug54044.result
mysql-test/suite/innodb/r/innodb_bug54044.result
+3
-0
mysql-test/suite/innodb/r/innodb_mysql.result
mysql-test/suite/innodb/r/innodb_mysql.result
+8
-0
mysql-test/suite/innodb/t/innodb_bug54044.test
mysql-test/suite/innodb/t/innodb_bug54044.test
+11
-0
mysql-test/suite/innodb/t/innodb_mysql.test
mysql-test/suite/innodb/t/innodb_mysql.test
+14
-0
sql/sql_table.cc
sql/sql_table.cc
+15
-5
storage/innobase/dict/dict0crea.c
storage/innobase/dict/dict0crea.c
+15
-3
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+22
-2
storage/innobase/os/os0file.c
storage/innobase/os/os0file.c
+10
-2
No files found.
mysql-test/suite/innodb/r/innodb_bug54044.result
0 → 100644
View file @
ce2403e6
CREATE TEMPORARY TABLE table_54044 ENGINE = INNODB
AS SELECT IF(NULL IS NOT NULL, NULL, NULL);
ERROR HY000: Can't create table 'test.table_54044' (errno: -1)
mysql-test/suite/innodb/r/innodb_mysql.result
View file @
ce2403e6
...
@@ -2538,6 +2538,14 @@ ORDER BY f1 DESC LIMIT 5;
...
@@ -2538,6 +2538,14 @@ ORDER BY f1 DESC LIMIT 5;
id select_type table type possible_keys key key_len ref rows Extra
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 range f2,f4 f4 1 NULL 11 Using where
1 SIMPLE t1 range f2,f4 f4 1 NULL 11 Using where
DROP TABLE t1;
DROP TABLE t1;
#
# Bug#54117 crash in thr_multi_unlock, temporary table
#
CREATE TEMPORARY TABLE t1(a INT) ENGINE = InnoDB;
LOCK TABLES t1 READ;
ALTER TABLE t1 COMMENT 'test';
UNLOCK TABLES;
DROP TABLE t1;
End of 5.1 tests
End of 5.1 tests
#
#
# Test for bug #39932 "create table fails if column for FK is in different
# Test for bug #39932 "create table fails if column for FK is in different
...
...
mysql-test/suite/innodb/t/innodb_bug54044.test
0 → 100644
View file @
ce2403e6
# This is the test for bug #54044. Special handle MYSQL_TYPE_NULL type
# during create table, so it will not trigger assertion failure.
--
source
include
/
have_innodb
.
inc
# This 'create table' operation should fail because of
# using NULL datatype
--
error
ER_CANT_CREATE_TABLE
CREATE
TEMPORARY
TABLE
table_54044
ENGINE
=
INNODB
AS
SELECT
IF
(
NULL
IS
NOT
NULL
,
NULL
,
NULL
);
mysql-test/suite/innodb/t/innodb_mysql.test
View file @
ce2403e6
...
@@ -737,6 +737,20 @@ ORDER BY f1 DESC LIMIT 5;
...
@@ -737,6 +737,20 @@ ORDER BY f1 DESC LIMIT 5;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
--
echo
#
--
echo
# Bug#54117 crash in thr_multi_unlock, temporary table
--
echo
#
CREATE
TEMPORARY
TABLE
t1
(
a
INT
)
ENGINE
=
InnoDB
;
LOCK
TABLES
t1
READ
;
ALTER
TABLE
t1
COMMENT
'test'
;
UNLOCK
TABLES
;
DROP
TABLE
t1
;
--
echo
End
of
5.1
tests
--
echo
End
of
5.1
tests
...
...
sql/sql_table.cc
View file @
ce2403e6
...
@@ -7339,12 +7339,22 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
...
@@ -7339,12 +7339,22 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
if
(
table
->
s
->
tmp_table
!=
NO_TMP_TABLE
)
if
(
table
->
s
->
tmp_table
!=
NO_TMP_TABLE
)
{
{
/* Close lock if this is a transactional table */
/* Close lock if this is a transactional table */
if
(
thd
->
lock
&&
if
(
thd
->
lock
)
!
(
thd
->
locked_tables_mode
==
LTM_LOCK_TABLES
||
thd
->
locked_tables_mode
==
LTM_PRELOCKED_UNDER_LOCK_TABLES
))
{
{
mysql_unlock_tables
(
thd
,
thd
->
lock
);
if
(
thd
->
locked_tables_mode
!=
LTM_LOCK_TABLES
&&
thd
->
lock
=
0
;
thd
->
locked_tables_mode
!=
LTM_PRELOCKED_UNDER_LOCK_TABLES
)
{
mysql_unlock_tables
(
thd
,
thd
->
lock
);
thd
->
lock
=
0
;
}
else
{
/*
If LOCK TABLES list is not empty and contains this table,
unlock the table and remove the table from this list.
*/
mysql_lock_remove
(
thd
,
thd
->
lock
,
table
);
}
}
}
/* Remove link to old table and rename the new one */
/* Remove link to old table and rename the new one */
close_temporary_table
(
thd
,
table
,
1
,
1
);
close_temporary_table
(
thd
,
table
,
1
,
1
);
...
...
storage/innobase/dict/dict0crea.c
View file @
ce2403e6
...
@@ -240,17 +240,29 @@ dict_build_table_def_step(
...
@@ -240,17 +240,29 @@ dict_build_table_def_step(
ibool
is_path
;
ibool
is_path
;
mtr_t
mtr
;
mtr_t
mtr
;
ulint
space
=
0
;
ulint
space
=
0
;
ibool
file_per_table
;
ut_ad
(
mutex_own
(
&
(
dict_sys
->
mutex
)));
ut_ad
(
mutex_own
(
&
(
dict_sys
->
mutex
)));
table
=
node
->
table
;
table
=
node
->
table
;
dict_hdr_get_new_id
(
&
table
->
id
,
NULL
,
/* Cache the global variable "srv_file_per_table" to
srv_file_per_table
?
&
space
:
NULL
);
a local variable before using it. Please note
"srv_file_per_table" is not under dict_sys mutex
protection, and could be changed while executing
this function. So better to cache the current value
to a local variable, and all future reference to
"srv_file_per_table" should use this local variable. */
file_per_table
=
srv_file_per_table
;
dict_hdr_get_new_id
(
&
table
->
id
,
NULL
,
NULL
);
thr_get_trx
(
thr
)
->
table_id
=
table
->
id
;
thr_get_trx
(
thr
)
->
table_id
=
table
->
id
;
if
(
srv_file_per_table
)
{
if
(
file_per_table
)
{
/* Get a new space id if srv_file_per_table is set */
dict_hdr_get_new_id
(
NULL
,
NULL
,
&
space
);
if
(
UNIV_UNLIKELY
(
space
==
ULINT_UNDEFINED
))
{
if
(
UNIV_UNLIKELY
(
space
==
ULINT_UNDEFINED
))
{
return
(
DB_ERROR
);
return
(
DB_ERROR
);
}
}
...
...
storage/innobase/handler/ha_innodb.cc
View file @
ce2403e6
...
@@ -4128,6 +4128,11 @@ get_innobase_type_from_mysql_type(
...
@@ -4128,6 +4128,11 @@ get_innobase_type_from_mysql_type(
case
MYSQL_TYPE_BLOB
:
case
MYSQL_TYPE_BLOB
:
case
MYSQL_TYPE_LONG_BLOB
:
case
MYSQL_TYPE_LONG_BLOB
:
return
(
DATA_BLOB
);
return
(
DATA_BLOB
);
case
MYSQL_TYPE_NULL
:
/* MySQL currently accepts "NULL" datatype, but will
reject such datatype in the next release. We will cope
with it and not trigger assertion failure in 5.1 */
break
;
default:
default:
ut_error
;
ut_error
;
}
}
...
@@ -6175,7 +6180,22 @@ create_table_def(
...
@@ -6175,7 +6180,22 @@ create_table_def(
field
=
form
->
field
[
i
];
field
=
form
->
field
[
i
];
col_type
=
get_innobase_type_from_mysql_type
(
&
unsigned_type
,
col_type
=
get_innobase_type_from_mysql_type
(
&
unsigned_type
,
field
);
field
);
if
(
!
col_type
)
{
push_warning_printf
(
(
THD
*
)
trx
->
mysql_thd
,
MYSQL_ERROR
::
WARN_LEVEL_WARN
,
ER_CANT_CREATE_TABLE
,
"Error creating table '%s' with "
"column '%s'. Please check its "
"column type and try to re-create "
"the table with an appropriate "
"column type."
,
table
->
name
,
(
char
*
)
field
->
field_name
);
goto
err_col
;
}
if
(
field
->
null_ptr
)
{
if
(
field
->
null_ptr
)
{
nulls_allowed
=
0
;
nulls_allowed
=
0
;
}
else
{
}
else
{
...
@@ -6233,7 +6253,7 @@ create_table_def(
...
@@ -6233,7 +6253,7 @@ create_table_def(
if
(
dict_col_name_is_reserved
(
field
->
field_name
)){
if
(
dict_col_name_is_reserved
(
field
->
field_name
)){
my_error
(
ER_WRONG_COLUMN_NAME
,
MYF
(
0
),
my_error
(
ER_WRONG_COLUMN_NAME
,
MYF
(
0
),
field
->
field_name
);
field
->
field_name
);
err_col:
dict_mem_table_free
(
table
);
dict_mem_table_free
(
table
);
trx_commit_for_mysql
(
trx
);
trx_commit_for_mysql
(
trx
);
...
...
storage/innobase/os/os0file.c
View file @
ce2403e6
...
@@ -1445,7 +1445,11 @@ os_file_create_func(
...
@@ -1445,7 +1445,11 @@ os_file_create_func(
/* When srv_file_per_table is on, file creation failure may not
/* When srv_file_per_table is on, file creation failure may not
be critical to the whole instance. Do not crash the server in
be critical to the whole instance. Do not crash the server in
case of unknown errors. */
case of unknown errors.
Please note "srv_file_per_table" is a global variable with
no explicit synchronization protection. It could be
changed during this execution path. It might not have the
same value as the one when building the table definition */
if
(
srv_file_per_table
)
{
if
(
srv_file_per_table
)
{
retry
=
os_file_handle_error_no_exit
(
name
,
retry
=
os_file_handle_error_no_exit
(
name
,
create_mode
==
OS_FILE_CREATE
?
create_mode
==
OS_FILE_CREATE
?
...
@@ -1532,7 +1536,11 @@ os_file_create_func(
...
@@ -1532,7 +1536,11 @@ os_file_create_func(
/* When srv_file_per_table is on, file creation failure may not
/* When srv_file_per_table is on, file creation failure may not
be critical to the whole instance. Do not crash the server in
be critical to the whole instance. Do not crash the server in
case of unknown errors. */
case of unknown errors.
Please note "srv_file_per_table" is a global variable with
no explicit synchronization protection. It could be
changed during this execution path. It might not have the
same value as the one when building the table definition */
if
(
srv_file_per_table
)
{
if
(
srv_file_per_table
)
{
retry
=
os_file_handle_error_no_exit
(
name
,
retry
=
os_file_handle_error_no_exit
(
name
,
create_mode
==
OS_FILE_CREATE
?
create_mode
==
OS_FILE_CREATE
?
...
...
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