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
0e5eb364
Commit
0e5eb364
authored
Jun 10, 2010
by
Inaam Rana
Browse files
Options
Browse Files
Download
Plain Diff
merge from parent
parents
e7c672cb
50d0cd72
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
62 additions
and
6 deletions
+62
-6
mysql-test/suite/innodb/r/innodb_mysql.result
mysql-test/suite/innodb/r/innodb_mysql.result
+12
-0
mysql-test/suite/innodb/t/disabled.def
mysql-test/suite/innodb/t/disabled.def
+0
-1
mysql-test/suite/innodb/t/innodb_mysql.test
mysql-test/suite/innodb/t/innodb_mysql.test
+13
-0
mysql-test/suite/innodb_plugin/r/innodb_mysql.result
mysql-test/suite/innodb_plugin/r/innodb_mysql.result
+12
-0
mysql-test/suite/innodb_plugin/t/disabled.def
mysql-test/suite/innodb_plugin/t/disabled.def
+0
-1
mysql-test/suite/innodb_plugin/t/innodb_mysql.test
mysql-test/suite/innodb_plugin/t/innodb_mysql.test
+13
-0
mysql-test/t/ps_3innodb.test
mysql-test/t/ps_3innodb.test
+0
-4
storage/innobase/row/row0sel.c
storage/innobase/row/row0sel.c
+6
-0
storage/innodb_plugin/row/row0sel.c
storage/innodb_plugin/row/row0sel.c
+6
-0
No files found.
mysql-test/suite/innodb/r/innodb_mysql.result
View file @
0e5eb364
...
@@ -2378,4 +2378,16 @@ SELECT SECOND(c)-@bug47453 FROM t1 JOIN t2 ON d=a;
...
@@ -2378,4 +2378,16 @@ SELECT SECOND(c)-@bug47453 FROM t1 JOIN t2 ON d=a;
SECOND(c)-@bug47453
SECOND(c)-@bug47453
0
0
DROP TABLE t1, t2;
DROP TABLE t1, t2;
#
# Bug#38999 valgrind warnings for update statement in function compare_record()
#
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 values (1),(2),(3),(4),(5);
INSERT INTO t2 values (1);
SELECT * FROM t1 WHERE a = 2;
a
2
UPDATE t1,t2 SET t1.a = t1.a + 100 WHERE t1.a = 1;
DROP TABLE t1,t2;
End of 5.1 tests
End of 5.1 tests
mysql-test/suite/innodb/t/disabled.def
View file @
0e5eb364
...
@@ -9,4 +9,3 @@
...
@@ -9,4 +9,3 @@
# Do not use any TAB characters for whitespace.
# Do not use any TAB characters for whitespace.
#
#
##############################################################################
##############################################################################
innodb_multi_update: Bug #38999 2010-05-05 mmakela Valgrind warnings
mysql-test/suite/innodb/t/innodb_mysql.test
View file @
0e5eb364
...
@@ -618,5 +618,18 @@ SELECT SECOND(c)-@bug47453 FROM t1 JOIN t2 ON d=a;
...
@@ -618,5 +618,18 @@ SELECT SECOND(c)-@bug47453 FROM t1 JOIN t2 ON d=a;
DROP
TABLE
t1
,
t2
;
DROP
TABLE
t1
,
t2
;
--
echo
#
--
echo
# Bug#38999 valgrind warnings for update statement in function compare_record()
--
echo
#
CREATE
TABLE
t1
(
a
INT
PRIMARY
KEY
)
ENGINE
=
InnoDB
;
CREATE
TABLE
t2
(
a
INT
PRIMARY
KEY
)
ENGINE
=
InnoDB
;
INSERT
INTO
t1
values
(
1
),(
2
),(
3
),(
4
),(
5
);
INSERT
INTO
t2
values
(
1
);
SELECT
*
FROM
t1
WHERE
a
=
2
;
UPDATE
t1
,
t2
SET
t1
.
a
=
t1
.
a
+
100
WHERE
t1
.
a
=
1
;
DROP
TABLE
t1
,
t2
;
--
echo
End
of
5.1
tests
--
echo
End
of
5.1
tests
mysql-test/suite/innodb_plugin/r/innodb_mysql.result
View file @
0e5eb364
...
@@ -2378,4 +2378,16 @@ SELECT SECOND(c)-@bug47453 FROM t1 JOIN t2 ON d=a;
...
@@ -2378,4 +2378,16 @@ SELECT SECOND(c)-@bug47453 FROM t1 JOIN t2 ON d=a;
SECOND(c)-@bug47453
SECOND(c)-@bug47453
0
0
DROP TABLE t1, t2;
DROP TABLE t1, t2;
#
# Bug#38999 valgrind warnings for update statement in function compare_record()
#
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 values (1),(2),(3),(4),(5);
INSERT INTO t2 values (1);
SELECT * FROM t1 WHERE a = 2;
a
2
UPDATE t1,t2 SET t1.a = t1.a + 100 WHERE t1.a = 1;
DROP TABLE t1,t2;
End of 5.1 tests
End of 5.1 tests
mysql-test/suite/innodb_plugin/t/disabled.def
View file @
0e5eb364
...
@@ -9,4 +9,3 @@
...
@@ -9,4 +9,3 @@
# Do not use any TAB characters for whitespace.
# Do not use any TAB characters for whitespace.
#
#
##############################################################################
##############################################################################
innodb_multi_update: Bug #38999 2010-05-05 mmakela Valgrind warnings
mysql-test/suite/innodb_plugin/t/innodb_mysql.test
View file @
0e5eb364
...
@@ -618,5 +618,18 @@ SELECT SECOND(c)-@bug47453 FROM t1 JOIN t2 ON d=a;
...
@@ -618,5 +618,18 @@ SELECT SECOND(c)-@bug47453 FROM t1 JOIN t2 ON d=a;
DROP
TABLE
t1
,
t2
;
DROP
TABLE
t1
,
t2
;
--
echo
#
--
echo
# Bug#38999 valgrind warnings for update statement in function compare_record()
--
echo
#
CREATE
TABLE
t1
(
a
INT
PRIMARY
KEY
)
ENGINE
=
InnoDB
;
CREATE
TABLE
t2
(
a
INT
PRIMARY
KEY
)
ENGINE
=
InnoDB
;
INSERT
INTO
t1
values
(
1
),(
2
),(
3
),(
4
),(
5
);
INSERT
INTO
t2
values
(
1
);
SELECT
*
FROM
t1
WHERE
a
=
2
;
UPDATE
t1
,
t2
SET
t1
.
a
=
t1
.
a
+
100
WHERE
t1
.
a
=
1
;
DROP
TABLE
t1
,
t2
;
--
echo
End
of
5.1
tests
--
echo
End
of
5.1
tests
mysql-test/t/ps_3innodb.test
View file @
0e5eb364
...
@@ -8,10 +8,6 @@
...
@@ -8,10 +8,6 @@
# NOTE: PLEASE SEE ps_1general.test (bottom)
# NOTE: PLEASE SEE ps_1general.test (bottom)
# BEFORE ADDING NEW TEST CASES HERE !!!
# BEFORE ADDING NEW TEST CASES HERE !!!
# See Bug#38999 valgrind warnings for update statement in function
# compare_record()
--
source
include
/
not_valgrind
.
inc
use
test
;
use
test
;
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_innodb
.
inc
...
...
storage/innobase/row/row0sel.c
View file @
0e5eb364
...
@@ -2621,6 +2621,12 @@ row_sel_store_mysql_rec(
...
@@ -2621,6 +2621,12 @@ row_sel_store_mysql_rec(
prebuilt
->
blob_heap
=
NULL
;
prebuilt
->
blob_heap
=
NULL
;
}
}
/* init null bytes with default values as they might be
left uninitialized in some cases and this uninited bytes
might be copied into mysql record buffer that leads to
valgrind warnings */
memcpy
(
mysql_rec
,
prebuilt
->
default_rec
,
prebuilt
->
null_bitmap_len
);
for
(
i
=
0
;
i
<
prebuilt
->
n_template
;
i
++
)
{
for
(
i
=
0
;
i
<
prebuilt
->
n_template
;
i
++
)
{
templ
=
prebuilt
->
mysql_template
+
i
;
templ
=
prebuilt
->
mysql_template
+
i
;
...
...
storage/innodb_plugin/row/row0sel.c
View file @
0e5eb364
...
@@ -2678,6 +2678,12 @@ row_sel_store_mysql_rec(
...
@@ -2678,6 +2678,12 @@ row_sel_store_mysql_rec(
prebuilt
->
blob_heap
=
NULL
;
prebuilt
->
blob_heap
=
NULL
;
}
}
/* init null bytes with default values as they might be
left uninitialized in some cases and these uninited bytes
might be copied into mysql record buffer that leads to
valgrind warnings */
memcpy
(
mysql_rec
,
prebuilt
->
default_rec
,
prebuilt
->
null_bitmap_len
);
for
(
i
=
0
;
i
<
prebuilt
->
n_template
;
i
++
)
{
for
(
i
=
0
;
i
<
prebuilt
->
n_template
;
i
++
)
{
templ
=
prebuilt
->
mysql_template
+
i
;
templ
=
prebuilt
->
mysql_template
+
i
;
...
...
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