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
9cc7d75e
Commit
9cc7d75e
authored
Oct 14, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b13751
parents
0dc3105a
1e11d278
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
mysql-test/r/ctype_utf8.result
mysql-test/r/ctype_utf8.result
+5
-0
mysql-test/t/ctype_utf8.test
mysql-test/t/ctype_utf8.test
+8
-0
sql/item_func.cc
sql/item_func.cc
+1
-1
No files found.
mysql-test/r/ctype_utf8.result
View file @
9cc7d75e
...
@@ -1056,3 +1056,8 @@ hex(a)
...
@@ -1056,3 +1056,8 @@ hex(a)
5B
5B
E880BD
E880BD
drop table t1;
drop table t1;
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/t/ctype_utf8.test
View file @
9cc7d75e
...
@@ -865,4 +865,12 @@ insert into t1 values (_utf8 0x5b);
...
@@ -865,4 +865,12 @@ insert into t1 values (_utf8 0x5b);
select
hex
(
a
)
from
t1
;
select
hex
(
a
)
from
t1
;
drop
table
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
# End of 4.1 tests
sql/item_func.cc
View file @
9cc7d75e
...
@@ -1454,7 +1454,7 @@ void Item_func_find_in_set::fix_length_and_dec()
...
@@ -1454,7 +1454,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
=
','
;
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