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
f90c056b
Commit
f90c056b
authored
17 years ago
by
istruewing@chilla.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into chilla.local:/home/mydev/mysql-5.1-bug24985
parents
1b64741b
49884979
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
1 deletion
+33
-1
mysql-test/r/heap_btree.result
mysql-test/r/heap_btree.result
+12
-0
mysql-test/t/heap_btree.test
mysql-test/t/heap_btree.test
+17
-0
storage/heap/ha_heap.cc
storage/heap/ha_heap.cc
+4
-1
No files found.
mysql-test/r/heap_btree.result
View file @
f90c056b
...
...
@@ -295,6 +295,18 @@ A 1
B 0
C 0
DROP TABLE t1;
CREATE TABLE t1 (
c1 ENUM('1', '2'),
UNIQUE USING BTREE(c1)
) ENGINE= MEMORY DEFAULT CHARSET= utf8;
INSERT INTO t1 VALUES('1'), ('2');
DROP TABLE t1;
CREATE TABLE t1 (
c1 SET('1', '2'),
UNIQUE USING BTREE(c1)
) ENGINE= MEMORY DEFAULT CHARSET= utf8;
INSERT INTO t1 VALUES('1'), ('2');
DROP TABLE t1;
End of 4.1 tests
CREATE TABLE t1(val INT, KEY USING BTREE(val)) ENGINE=memory;
INSERT INTO t1 VALUES(0);
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/heap_btree.test
View file @
f90c056b
...
...
@@ -196,6 +196,23 @@ UPDATE t1 SET c2= c2 + 1 WHERE c1 = 'A';
SELECT
*
FROM
t1
;
DROP
TABLE
t1
;
#
# Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
# causes incorrect duplicate entries
#
CREATE
TABLE
t1
(
c1
ENUM
(
'1'
,
'2'
),
UNIQUE
USING
BTREE
(
c1
)
)
ENGINE
=
MEMORY
DEFAULT
CHARSET
=
utf8
;
INSERT
INTO
t1
VALUES
(
'1'
),
(
'2'
);
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
c1
SET
(
'1'
,
'2'
),
UNIQUE
USING
BTREE
(
c1
)
)
ENGINE
=
MEMORY
DEFAULT
CHARSET
=
utf8
;
INSERT
INTO
t1
VALUES
(
'1'
),
(
'2'
);
DROP
TABLE
t1
;
--
echo
End
of
4.1
tests
#
...
...
This diff is collapsed.
Click to expand it.
storage/heap/ha_heap.cc
View file @
f90c056b
...
...
@@ -627,7 +627,10 @@ int ha_heap::create(const char *name, TABLE *table_arg,
seg
->
length
=
(
uint
)
key_part
->
length
;
seg
->
flag
=
key_part
->
key_part_flag
;
seg
->
charset
=
field
->
charset
();
if
(
field
->
flags
&
(
ENUM_FLAG
|
SET_FLAG
))
seg
->
charset
=
&
my_charset_bin
;
else
seg
->
charset
=
field
->
charset
();
if
(
field
->
null_ptr
)
{
seg
->
null_bit
=
field
->
null_bit
;
...
...
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