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
a04d9fa9
Commit
a04d9fa9
authored
May 24, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
parents
59c2b970
b056eac6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
1 deletion
+28
-1
mysql-test/r/heap.result
mysql-test/r/heap.result
+13
-0
mysql-test/t/heap.test
mysql-test/t/heap.test
+12
-0
plugin/fulltext/Makefile.am
plugin/fulltext/Makefile.am
+1
-1
storage/heap/hp_create.c
storage/heap/hp_create.c
+2
-0
No files found.
mysql-test/r/heap.result
View file @
a04d9fa9
...
...
@@ -718,3 +718,16 @@ Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length I
t1 MEMORY 10 Fixed 0 11 0 # 0 0 NULL NULL NULL NULL latin1_swedish_ci NULL
t2 MEMORY 10 Fixed 0 12 0 # 0 0 NULL NULL NULL NULL latin1_swedish_ci NULL
drop table t1, t2;
CREATE TABLE t1(a VARCHAR(1), b VARCHAR(2), c VARCHAR(256),
KEY(a), KEY(b), KEY(c)) ENGINE=MEMORY;
INSERT INTO t1 VALUES('a','aa',REPEAT('a', 256)),('a','aa',REPEAT('a',256));
SELECT COUNT(*) FROM t1 WHERE a='a';
COUNT(*)
2
SELECT COUNT(*) FROM t1 WHERE b='aa';
COUNT(*)
2
SELECT COUNT(*) FROM t1 WHERE c=REPEAT('a',256);
COUNT(*)
2
DROP TABLE t1;
mysql-test/t/heap.test
View file @
a04d9fa9
...
...
@@ -458,4 +458,16 @@ create table t2 (c varchar(10)) engine=memory;
show
table
status
like
't_'
;
drop
table
t1
,
t2
;
#
# BUG#18233 - Memory tables INDEX USING HASH (a,b) returns 1 row on
# SELECT WHERE a= AND b=
#
CREATE
TABLE
t1
(
a
VARCHAR
(
1
),
b
VARCHAR
(
2
),
c
VARCHAR
(
256
),
KEY
(
a
),
KEY
(
b
),
KEY
(
c
))
ENGINE
=
MEMORY
;
INSERT
INTO
t1
VALUES
(
'a'
,
'aa'
,
REPEAT
(
'a'
,
256
)),(
'a'
,
'aa'
,
REPEAT
(
'a'
,
256
));
SELECT
COUNT
(
*
)
FROM
t1
WHERE
a
=
'a'
;
SELECT
COUNT
(
*
)
FROM
t1
WHERE
b
=
'aa'
;
SELECT
COUNT
(
*
)
FROM
t1
WHERE
c
=
REPEAT
(
'a'
,
256
);
DROP
TABLE
t1
;
# End of 5.0 tests
plugin/fulltext/Makefile.am
View file @
a04d9fa9
...
...
@@ -6,4 +6,4 @@ noinst_LTLIBRARIES= mypluglib.la
#pkglib_LTLIBRARIES= mypluglib.la
mypluglib_la_SOURCES
=
plugin_example.c
mypluglib_la_LDFLAGS
=
-module
-rpath
$(pkglibdir)
mypluglib_la_CFLAGS
=
-DMYSQL_DYNAMIC_PLUGIN
storage/heap/hp_create.c
View file @
a04d9fa9
...
...
@@ -85,6 +85,7 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef,
if
(
!
my_binary_compare
(
keyinfo
->
seg
[
j
].
charset
))
keyinfo
->
flag
|=
HA_END_SPACE_KEY
;
keyinfo
->
flag
|=
HA_VAR_LENGTH_KEY
;
length
+=
2
;
/* Save number of bytes used to store length */
keyinfo
->
seg
[
j
].
bit_start
=
1
;
break
;
...
...
@@ -95,6 +96,7 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef,
if
(
!
my_binary_compare
(
keyinfo
->
seg
[
j
].
charset
))
keyinfo
->
flag
|=
HA_END_SPACE_KEY
;
keyinfo
->
flag
|=
HA_VAR_LENGTH_KEY
;
length
+=
2
;
/* Save number of bytes used to store length */
keyinfo
->
seg
[
j
].
bit_start
=
2
;
/*
...
...
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