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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
e4e141cf
Commit
e4e141cf
authored
Jun 07, 2007
by
gkodinov/kgeorge@magare.gmz
Browse files
Options
Browse Files
Download
Plain Diff
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B28878-5.0-opt
parents
b9090113
b1e936b9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
69 additions
and
1 deletion
+69
-1
mysql-test/r/innodb_mysql.result
mysql-test/r/innodb_mysql.result
+36
-0
mysql-test/t/innodb_mysql.test
mysql-test/t/innodb_mysql.test
+31
-0
sql/field.cc
sql/field.cc
+2
-1
No files found.
mysql-test/r/innodb_mysql.result
View file @
e4e141cf
...
...
@@ -617,4 +617,40 @@ EXPLAIN SELECT COUNT(*) FROM t2 WHERE stat_id IN (1,3) AND acct_id=785;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 range idx1,idx2 idx1 9 NULL 2 Using where; Using index
DROP TABLE t1,t2;
CREATE TABLE t1 (a CHAR(2), KEY (a)) ENGINE = InnoDB DEFAULT CHARSET=UTF8;
INSERT INTO t1 VALUES ('uk'),('bg');
SELECT * FROM t1 WHERE a = 'uk';
a
uk
DELETE FROM t1 WHERE a = 'uk';
SELECT * FROM t1 WHERE a = 'uk';
a
UPDATE t1 SET a = 'us' WHERE a = 'uk';
SELECT * FROM t1 WHERE a = 'uk';
a
CREATE TABLE t2 (a CHAR(2), KEY (a)) ENGINE = InnoDB;
INSERT INTO t2 VALUES ('uk'),('bg');
SELECT * FROM t2 WHERE a = 'uk';
a
uk
DELETE FROM t2 WHERE a = 'uk';
SELECT * FROM t2 WHERE a = 'uk';
a
INSERT INTO t2 VALUES ('uk');
UPDATE t2 SET a = 'us' WHERE a = 'uk';
SELECT * FROM t2 WHERE a = 'uk';
a
CREATE TABLE t3 (a CHAR(2), KEY (a)) ENGINE = MyISAM;
INSERT INTO t3 VALUES ('uk'),('bg');
SELECT * FROM t3 WHERE a = 'uk';
a
uk
DELETE FROM t3 WHERE a = 'uk';
SELECT * FROM t3 WHERE a = 'uk';
a
INSERT INTO t3 VALUES ('uk');
UPDATE t3 SET a = 'us' WHERE a = 'uk';
SELECT * FROM t3 WHERE a = 'uk';
a
DROP TABLE t1,t2,t3;
End of 5.0 tests
mysql-test/t/innodb_mysql.test
View file @
e4e141cf
...
...
@@ -597,4 +597,35 @@ EXPLAIN SELECT COUNT(*) FROM t2 WHERE stat_id IN (1,3) AND acct_id=785;
DROP
TABLE
t1
,
t2
;
#
# Bug #25866: Getting "#HY000 Can't find record in..." on and INSERT
#
CREATE
TABLE
t1
(
a
CHAR
(
2
),
KEY
(
a
))
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
UTF8
;
INSERT
INTO
t1
VALUES
(
'uk'
),(
'bg'
);
SELECT
*
FROM
t1
WHERE
a
=
'uk'
;
DELETE
FROM
t1
WHERE
a
=
'uk'
;
SELECT
*
FROM
t1
WHERE
a
=
'uk'
;
UPDATE
t1
SET
a
=
'us'
WHERE
a
=
'uk'
;
SELECT
*
FROM
t1
WHERE
a
=
'uk'
;
CREATE
TABLE
t2
(
a
CHAR
(
2
),
KEY
(
a
))
ENGINE
=
InnoDB
;
INSERT
INTO
t2
VALUES
(
'uk'
),(
'bg'
);
SELECT
*
FROM
t2
WHERE
a
=
'uk'
;
DELETE
FROM
t2
WHERE
a
=
'uk'
;
SELECT
*
FROM
t2
WHERE
a
=
'uk'
;
INSERT
INTO
t2
VALUES
(
'uk'
);
UPDATE
t2
SET
a
=
'us'
WHERE
a
=
'uk'
;
SELECT
*
FROM
t2
WHERE
a
=
'uk'
;
CREATE
TABLE
t3
(
a
CHAR
(
2
),
KEY
(
a
))
ENGINE
=
MyISAM
;
INSERT
INTO
t3
VALUES
(
'uk'
),(
'bg'
);
SELECT
*
FROM
t3
WHERE
a
=
'uk'
;
DELETE
FROM
t3
WHERE
a
=
'uk'
;
SELECT
*
FROM
t3
WHERE
a
=
'uk'
;
INSERT
INTO
t3
VALUES
(
'uk'
);
UPDATE
t3
SET
a
=
'us'
WHERE
a
=
'uk'
;
SELECT
*
FROM
t3
WHERE
a
=
'uk'
;
DROP
TABLE
t1
,
t2
,
t3
;
--
echo
End
of
5.0
tests
sql/field.cc
View file @
e4e141cf
...
...
@@ -6249,7 +6249,8 @@ uint Field_string::get_key_image(char *buff, uint length, imagetype type_arg)
length
/
field_charset
->
mbmaxlen
);
memcpy
(
buff
,
ptr
,
bytes
);
if
(
bytes
<
length
)
bzero
(
buff
+
bytes
,
length
-
bytes
);
field_charset
->
cset
->
fill
(
field_charset
,
buff
+
bytes
,
length
-
bytes
,
field_charset
->
pad_char
);
return
bytes
;
}
...
...
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