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
53cfea39
Commit
53cfea39
authored
Feb 15, 2011
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql-5.1-innodb to mysql-5.5-innodb.
parents
8586497e
6ae8c575
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
63 additions
and
1 deletion
+63
-1
mysql-test/suite/innodb/r/innodb_bug59307.result
mysql-test/suite/innodb/r/innodb_bug59307.result
+28
-0
mysql-test/suite/innodb/t/innodb_bug59307.test
mysql-test/suite/innodb/t/innodb_bug59307.test
+32
-0
storage/innobase/include/sync0rw.ic
storage/innobase/include/sync0rw.ic
+0
-1
storage/innobase/sync/sync0rw.c
storage/innobase/sync/sync0rw.c
+3
-0
No files found.
mysql-test/suite/innodb/r/innodb_bug59307.result
0 → 100644
View file @
53cfea39
CREATE TABLE t1 (
t1_int INT,
t1_time TIME
) ENGINE=innodb;
CREATE TABLE t2 (
t2_int int PRIMARY KEY,
t2_int2 INT
) ENGINE=INNODB;
INSERT INTO t2 VALUES ();
Warnings:
Warning 1364 Field 't2_int' doesn't have a default value
INSERT INTO t1 VALUES ();
SELECT *
FROM t1 AS t1a
WHERE NOT EXISTS
(SELECT *
FROM t1 AS t1b
WHERE t1b.t1_int NOT IN
(SELECT t2.t2_int
FROM t2
WHERE t1b.t1_time LIKE t1b.t1_int
OR t1b.t1_time <> t2.t2_int2
AND 6=7
)
)
;
t1_int t1_time
DROP TABLE t1,t2;
mysql-test/suite/innodb/t/innodb_bug59307.test
0 → 100644
View file @
53cfea39
--
source
include
/
have_innodb
.
inc
# Bug #59307 uninitialized value in rw_lock_set_writer_id_and_recursion_flag()
# when Valgrind instrumentation (UNIV_DEBUG_VALGRIND) is not enabled
CREATE
TABLE
t1
(
t1_int
INT
,
t1_time
TIME
)
ENGINE
=
innodb
;
CREATE
TABLE
t2
(
t2_int
int
PRIMARY
KEY
,
t2_int2
INT
)
ENGINE
=
INNODB
;
INSERT
INTO
t2
VALUES
();
INSERT
INTO
t1
VALUES
();
SELECT
*
FROM
t1
AS
t1a
WHERE
NOT
EXISTS
(
SELECT
*
FROM
t1
AS
t1b
WHERE
t1b
.
t1_int
NOT
IN
(
SELECT
t2
.
t2_int
FROM
t2
WHERE
t1b
.
t1_time
LIKE
t1b
.
t1_int
OR
t1b
.
t1_time
<>
t2
.
t2_int2
AND
6
=
7
)
)
;
DROP
TABLE
t1
,
t2
;
storage/innobase/include/sync0rw.ic
View file @
53cfea39
...
@@ -280,7 +280,6 @@ rw_lock_set_writer_id_and_recursion_flag(
...
@@ -280,7 +280,6 @@ rw_lock_set_writer_id_and_recursion_flag(
local_thread = lock->writer_thread;
local_thread = lock->writer_thread;
success = os_compare_and_swap_thread_id(
success = os_compare_and_swap_thread_id(
&lock->writer_thread, local_thread, curr_thread);
&lock->writer_thread, local_thread, curr_thread);
UNIV_MEM_VALID(&success, sizeof(success));
ut_a(success);
ut_a(success);
lock->recursive = recursive;
lock->recursive = recursive;
...
...
storage/innobase/sync/sync0rw.c
View file @
53cfea39
...
@@ -271,6 +271,9 @@ rw_lock_create_func(
...
@@ -271,6 +271,9 @@ rw_lock_create_func(
contains garbage at initialization and cannot be used for
contains garbage at initialization and cannot be used for
recursive x-locking. */
recursive x-locking. */
lock
->
recursive
=
FALSE
;
lock
->
recursive
=
FALSE
;
/* Silence Valgrind when UNIV_DEBUG_VALGRIND is not enabled. */
memset
((
void
*
)
&
lock
->
writer_thread
,
0
,
sizeof
lock
->
writer_thread
);
UNIV_MEM_INVALID
(
&
lock
->
writer_thread
,
sizeof
lock
->
writer_thread
);
#ifdef UNIV_SYNC_DEBUG
#ifdef UNIV_SYNC_DEBUG
UT_LIST_INIT
(
lock
->
debug_list
);
UT_LIST_INIT
(
lock
->
debug_list
);
...
...
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