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
0bf436a0
Commit
0bf436a0
authored
Oct 14, 2005
by
bar@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/usr/home/bar/mysql-4.1.b13751
into mysql.com:/usr/home/bar/mysql-5.0.char1
parents
ea26f5e2
5df9c6c2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
54 additions
and
1 deletion
+54
-1
mysql-test/r/ctype_utf8.result
mysql-test/r/ctype_utf8.result
+5
-0
mysql-test/r/rpl_multi_update2.result
mysql-test/r/rpl_multi_update2.result
+13
-0
mysql-test/t/ctype_utf8.test
mysql-test/t/ctype_utf8.test
+8
-0
mysql-test/t/rpl_multi_update2.test
mysql-test/t/rpl_multi_update2.test
+27
-0
sql/item_func.cc
sql/item_func.cc
+1
-1
No files found.
mysql-test/r/ctype_utf8.result
View file @
0bf436a0
...
...
@@ -1126,3 +1126,8 @@ a
i
い
drop table t1,t2;
set names 'latin1';
create table t1 (a varchar(255)) default charset=utf8;
select * from t1 where find_in_set('-1', a);
a
drop table t1;
mysql-test/r/rpl_multi_update2.result
View file @
0bf436a0
...
...
@@ -4,6 +4,7 @@ reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
drop table if exists t1,t2;
CREATE TABLE t1 (
a int unsigned not null auto_increment primary key,
b int unsigned
...
...
@@ -40,3 +41,15 @@ SELECT * FROM t2 ORDER BY a;
a b
1 0
2 1
drop table t1,t2;
reset master;
CREATE TABLE t1 ( a INT );
INSERT INTO t1 VALUES (0);
UPDATE t1, (SELECT 3 as b) AS x SET t1.a = x.b;
select * from t1;
a
3
select * from t1;
a
3
drop table t1;
mysql-test/t/ctype_utf8.test
View file @
0bf436a0
...
...
@@ -851,6 +851,14 @@ insert into t1 values (_utf8 0x5b);
select
hex
(
a
)
from
t1
;
drop
table
t1
;
#
# Bug#13751 find_in_set: Illegal mix of collations
#
set
names
'latin1'
;
create
table
t1
(
a
varchar
(
255
))
default
charset
=
utf8
;
select
*
from
t1
where
find_in_set
(
'-1'
,
a
);
drop
table
t1
;
# End of 4.1 tests
#
...
...
mysql-test/t/rpl_multi_update2.test
View file @
0bf436a0
...
...
@@ -4,6 +4,10 @@
source
include
/
master
-
slave
.
inc
;
--
disable_warnings
drop
table
if
exists
t1
,
t2
;
--
enable_warnings
CREATE
TABLE
t1
(
a
int
unsigned
not
null
auto_increment
primary
key
,
b
int
unsigned
...
...
@@ -32,4 +36,27 @@ sync_with_master;
SELECT
*
FROM
t1
ORDER
BY
a
;
SELECT
*
FROM
t2
ORDER
BY
a
;
connection
master
;
drop
table
t1
,
t2
;
sync_slave_with_master
;
#
# BUG#13236 multi-update with subquery & --replicate-ignore-table
#
reset
master
;
connection
master
;
CREATE
TABLE
t1
(
a
INT
);
INSERT
INTO
t1
VALUES
(
0
);
UPDATE
t1
,
(
SELECT
3
as
b
)
AS
x
SET
t1
.
a
=
x
.
b
;
select
*
from
t1
;
sync_slave_with_master
;
connection
slave
;
select
*
from
t1
;
connection
master
;
drop
table
t1
;
sync_slave_with_master
;
# End of 4.1 tests
sql/item_func.cc
View file @
0bf436a0
...
...
@@ -2351,7 +2351,7 @@ void Item_func_find_in_set::fix_length_and_dec()
}
}
}
agg_arg_c
ollations_for_comparison
(
cmp_collation
,
args
,
2
);
agg_arg_c
harsets
(
cmp_collation
,
args
,
2
,
MY_COLL_CMP_CONV
);
}
static
const
char
separator
=
','
;
...
...
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