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
288c2637
Commit
288c2637
authored
19 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
parents
bd197673
67d94b1c
No related merge requests found
Changes
31
Hide whitespace changes
Inline
Side-by-side
Showing
31 changed files
with
172 additions
and
51 deletions
+172
-51
configure.in
configure.in
+2
-2
include/m_ctype.h
include/m_ctype.h
+1
-0
include/my_sys.h
include/my_sys.h
+1
-0
innobase/srv/srv0start.c
innobase/srv/srv0start.c
+2
-1
mysql-test/lib/mtr_cases.pl
mysql-test/lib/mtr_cases.pl
+13
-14
mysql-test/lib/mtr_misc.pl
mysql-test/lib/mtr_misc.pl
+9
-0
mysql-test/lib/mtr_process.pl
mysql-test/lib/mtr_process.pl
+28
-12
mysql-test/lib/mtr_report.pl
mysql-test/lib/mtr_report.pl
+0
-1
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+19
-12
mysys/charset.c
mysys/charset.c
+18
-0
ndb/tools/Makefile.am
ndb/tools/Makefile.am
+1
-1
ndb/tools/ndb_config.cpp
ndb/tools/ndb_config.cpp
+0
-0
sql/item.cc
sql/item.cc
+13
-5
sql/item.h
sql/item.h
+1
-1
sql/sql_prepare.cc
sql/sql_prepare.cc
+2
-2
strings/ctype-big5.c
strings/ctype-big5.c
+2
-0
strings/ctype-bin.c
strings/ctype-bin.c
+1
-0
strings/ctype-cp932.c
strings/ctype-cp932.c
+2
-0
strings/ctype-czech.c
strings/ctype-czech.c
+1
-0
strings/ctype-euc_kr.c
strings/ctype-euc_kr.c
+2
-0
strings/ctype-extra.c
strings/ctype-extra.c
+1
-0
strings/ctype-gb2312.c
strings/ctype-gb2312.c
+2
-0
strings/ctype-gbk.c
strings/ctype-gbk.c
+2
-0
strings/ctype-latin1.c
strings/ctype-latin1.c
+3
-0
strings/ctype-sjis.c
strings/ctype-sjis.c
+2
-0
strings/ctype-tis620.c
strings/ctype-tis620.c
+2
-0
strings/ctype-uca.c
strings/ctype-uca.c
+34
-0
strings/ctype-ucs2.c
strings/ctype-ucs2.c
+2
-0
strings/ctype-ujis.c
strings/ctype-ujis.c
+2
-0
strings/ctype-utf8.c
strings/ctype-utf8.c
+3
-0
strings/ctype-win1250ch.c
strings/ctype-win1250ch.c
+1
-0
No files found.
configure.in
View file @
288c2637
...
...
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb
AM_INIT_AUTOMAKE
(
mysql, 4.1.1
4
)
AM_INIT_AUTOMAKE
(
mysql, 4.1.1
5
)
AM_CONFIG_HEADER
(
config.h
)
PROTOCOL_VERSION
=
10
...
...
@@ -16,7 +16,7 @@ SHARED_LIB_VERSION=14:0:0
# ndb version
NDB_VERSION_MAJOR
=
4
NDB_VERSION_MINOR
=
1
NDB_VERSION_BUILD
=
1
4
NDB_VERSION_BUILD
=
1
5
NDB_VERSION_STATUS
=
""
# Set all version vars based on $VERSION. How do we do this more elegant ?
...
...
This diff is collapsed.
Click to expand it.
include/m_ctype.h
View file @
288c2637
...
...
@@ -220,6 +220,7 @@ typedef struct charset_info_st
uint
mbmaxlen
;
uint16
min_sort_char
;
uint16
max_sort_char
;
/* For LIKE optimization */
my_bool
escape_with_backslash_is_dangerous
;
MY_CHARSET_HANDLER
*
cset
;
MY_COLLATION_HANDLER
*
coll
;
...
...
This diff is collapsed.
Click to expand it.
include/my_sys.h
View file @
288c2637
...
...
@@ -788,6 +788,7 @@ extern my_bool init_compiled_charsets(myf flags);
extern
void
add_compiled_collation
(
CHARSET_INFO
*
cs
);
extern
ulong
escape_string_for_mysql
(
CHARSET_INFO
*
charset_info
,
char
*
to
,
const
char
*
from
,
ulong
length
);
extern
char
*
bare_str_to_hex
(
char
*
to
,
const
char
*
from
,
uint
len
);
#ifdef __WIN__
#define BACKSLASH_MBTAIL
/* File system character set */
...
...
This diff is collapsed.
Click to expand it.
innobase/srv/srv0start.c
View file @
288c2637
...
...
@@ -1052,7 +1052,8 @@ innobase_start_or_create_for_mysql(void)
fprintf
(
stderr
,
"InnoDB: Error: You have specified innodb_buffer_pool_awe_mem_mb
\n
"
"InnoDB: in my.cnf, but AWE can only be used in Windows 2000 and later.
\n
"
);
"InnoDB: in my.cnf, but AWE can only be used in Windows 2000 and later.
\n
"
"InnoDB: To use AWE, InnoDB must be compiled with __WIN2000__ defined.
\n
"
);
return
(
DB_ERROR
);
}
...
...
This diff is collapsed.
Click to expand it.
mysql-test/lib/mtr_cases.pl
View file @
288c2637
...
...
@@ -53,21 +53,20 @@ sub collect_test_cases ($) {
else
{
# ----------------------------------------------------------------------
#
Skip
some tests listed in disabled.def
#
Disable
some tests listed in disabled.def
# ----------------------------------------------------------------------
my
%
skiplist
;
my
$skipfile
=
"
$testdir
/disabled.def
";
if
(
open
(
SKIPFILE
,
$skipfile
)
)
my
%
disabled
;
if
(
open
(
DISABLED
,
"
$testdir
/disabled.def
"
)
)
{
while
(
<
SKIPFILE
>
)
while
(
<
DISABLED
>
)
{
chomp
;
if
(
/^\s*(\S+)\s*:\s*(.*?)\s*$/
)
{
$
skiplist
{
$1
}
=
$2
;
$
disabled
{
$1
}
=
$2
;
}
}
close
SKIPFILE
;
close
DISABLED
;
}
foreach
my
$elem
(
sort
readdir
(
TESTDIR
)
)
{
...
...
@@ -75,7 +74,7 @@ sub collect_test_cases ($) {
next
if
!
defined
$tname
;
next
if
$::opt_do_test
and
!
defined
mtr_match_prefix
(
$elem
,
$::opt_do_test
);
collect_one_test_case
(
$testdir
,
$resdir
,
$tname
,
$elem
,
$cases
,
\%
skiplist
);
collect_one_test_case
(
$testdir
,
$resdir
,
$tname
,
$elem
,
$cases
,
\%
disabled
);
}
closedir
TESTDIR
;
}
...
...
@@ -119,7 +118,7 @@ sub collect_one_test_case($$$$$$) {
my
$tname
=
shift
;
my
$elem
=
shift
;
my
$cases
=
shift
;
my
$
skiplist
=
shift
;
my
$
disabled
=
shift
;
my
$path
=
"
$testdir
/
$elem
";
...
...
@@ -188,7 +187,7 @@ sub collect_one_test_case($$$$$$) {
my
$slave_mi_file
=
"
$testdir
/
$tname
.slave-mi
";
my
$master_sh
=
"
$testdir
/
$tname
-master.sh
";
my
$slave_sh
=
"
$testdir
/
$tname
-slave.sh
";
my
$disabled
=
"
$testdir
/
$tname
.disabled
";
my
$disabled
_file
=
"
$testdir
/
$tname
.disabled
";
$tinfo
->
{'
master_opt
'}
=
$::glob_win32
?
["
--default-time-zone=+3:00
"]
:
[]
;
$tinfo
->
{'
slave_opt
'}
=
$::glob_win32
?
["
--default-time-zone=+3:00
"]
:
[]
;
...
...
@@ -292,18 +291,18 @@ sub collect_one_test_case($$$$$$) {
}
# FIXME why this late?
if
(
$
skiplist
->
{
$tname
}
)
if
(
$
disabled
->
{
$tname
}
)
{
$tinfo
->
{'
skip
'}
=
1
;
$tinfo
->
{'
disable
'}
=
1
;
# Sub type of 'skip'
$tinfo
->
{'
comment
'}
=
$
skiplist
->
{
$tname
}
if
$skiplist
->
{
$tname
};
$tinfo
->
{'
comment
'}
=
$
disabled
->
{
$tname
}
if
$disabled
->
{
$tname
};
}
if
(
-
f
$disabled
)
if
(
-
f
$disabled
_file
)
{
$tinfo
->
{'
skip
'}
=
1
;
$tinfo
->
{'
disable
'}
=
1
;
# Sub type of 'skip'
$tinfo
->
{'
comment
'}
=
mtr_fromfile
(
$disabled
);
$tinfo
->
{'
comment
'}
=
mtr_fromfile
(
$disabled
_file
);
}
# We can't restart a running server that may be in use
...
...
This diff is collapsed.
Click to expand it.
mysql-test/lib/mtr_misc.pl
View file @
288c2637
...
...
@@ -7,6 +7,7 @@
use
strict
;
sub
mtr_full_hostname
();
sub
mtr_short_hostname
();
sub
mtr_init_args
($);
sub
mtr_add_arg
($$);
sub
mtr_path_exists
(@);
...
...
@@ -21,6 +22,7 @@ sub mtr_exe_exists(@);
# We want the fully qualified host name and hostname() may have returned
# only the short name. So we use the resolver to find out.
# Note that this might fail on some platforms
sub
mtr_full_hostname
()
{
...
...
@@ -35,6 +37,13 @@ sub mtr_full_hostname () {
return
$hostname
;
}
sub
mtr_short_hostname
()
{
my
$hostname
=
hostname
();
$hostname
=~
s/\..+$//
;
return
$hostname
;
}
# FIXME move to own lib
sub
mtr_init_args
($)
{
...
...
This diff is collapsed.
Click to expand it.
mysql-test/lib/mtr_process.pl
View file @
288c2637
...
...
@@ -186,8 +186,8 @@ sub spawn_parent_impl {
if
(
$mode
eq
'
run
'
or
$mode
eq
'
test
'
)
{
my
$exit_value
=
-
1
;
my
$signal_num
=
0
;
my
$dumped_core
=
0
;
#
my $signal_num= 0;
#
my $dumped_core= 0;
if
(
$mode
eq
'
run
'
)
{
...
...
@@ -199,9 +199,10 @@ sub spawn_parent_impl {
mtr_error
("
$path
(
$pid
) got lost somehow
");
}
$exit_value
=
$?
>>
8
;
$signal_num
=
$?
&
127
;
$dumped_core
=
$?
&
128
;
$exit_value
=
$?
;
# $exit_value= $? >> 8;
# $signal_num= $? & 127;
# $dumped_core= $? & 128;
return
$exit_value
;
}
...
...
@@ -229,9 +230,10 @@ sub spawn_parent_impl {
if
(
$ret_pid
==
$pid
)
{
# We got termination of mysqltest, we are done
$exit_value
=
$?
>>
8
;
$signal_num
=
$?
&
127
;
$dumped_core
=
$?
&
128
;
$exit_value
=
$?
;
# $exit_value= $? >> 8;
# $signal_num= $? & 127;
# $dumped_core= $? & 128;
last
;
}
...
...
@@ -473,6 +475,7 @@ sub mtr_stop_mysqld_servers ($) {
}
else
{
# Server is dead, we remove the pidfile if any
# Race, could have been removed between I tested with -f
# and the unlink() below, so I better check again with -f
...
...
@@ -502,10 +505,12 @@ sub mtr_stop_mysqld_servers ($) {
# that for true Win32 processes, kill(0,$pid) will not return 1.
# ----------------------------------------------------------------------
start_reap_all
();
# Avoid zombies
SIGNAL:
foreach
my
$sig
(
15
,
9
)
{
my
$retries
=
10
;
# 10 seconds
my
$retries
=
20
;
# FIXME 20 seconds, this is silly!
kill
(
$sig
,
keys
%
mysqld_pids
);
while
(
$retries
--
and
kill
(
0
,
keys
%
mysqld_pids
)
)
{
...
...
@@ -514,6 +519,8 @@ sub mtr_stop_mysqld_servers ($) {
}
}
stop_reap_all
();
# Get into control again
# ----------------------------------------------------------------------
# Now, we check if all we can find using kill(0,$pid) are dead,
# and just assume the rest are. We cleanup socket and PID files.
...
...
@@ -632,7 +639,8 @@ sub mtr_mysqladmin_shutdown () {
$mysql_admin_pids
{
$pid
}
=
1
;
}
# We wait blocking, we wait for the last one anyway
# As mysqladmin is such a simple program, we trust it to terminate.
# I.e. we wait blocking, and wait wait for them all before we go on.
while
(
keys
%
mysql_admin_pids
)
{
foreach
my
$pid
(
keys
%
mysql_admin_pids
)
...
...
@@ -651,7 +659,8 @@ sub mtr_mysqladmin_shutdown () {
my
$timeout
=
20
;
# 20 seconds max
my
$res
=
1
;
# If we just fall through, we are done
# in the sense that the servers don't
# listen to their ports any longer
TIME:
while
(
$timeout
--
)
{
...
...
@@ -669,6 +678,8 @@ sub mtr_mysqladmin_shutdown () {
last
;
# If we got here, we are done
}
$timeout
or
mtr_debug
("
At least one server is still listening to its port
");
sleep
(
5
)
if
$::glob_win32
;
# FIXME next startup fails if no sleep
return
$res
;
...
...
@@ -752,6 +763,7 @@ sub mtr_ping_mysqld_server () {
#
##############################################################################
# FIXME check that the pidfile contains the expected pid!
sub
sleep_until_file_created
($$$)
{
my
$pidfile
=
shift
;
...
...
@@ -762,7 +774,7 @@ sub sleep_until_file_created ($$$) {
{
if
(
-
r
$pidfile
)
{
return
1
;
return
$pid
;
}
# Check if it died after the fork() was successful
...
...
@@ -793,8 +805,12 @@ sub sleep_until_file_created ($$$) {
#
##############################################################################
# FIXME something is wrong, we sometimes terminate with "Hangup" written
# to tty, and no STDERR output telling us why.
sub
mtr_exit
($)
{
my
$code
=
shift
;
# cluck("Called mtr_exit()");
local
$SIG
{
HUP
}
=
'
IGNORE
';
kill
('
HUP
',
-
$$
);
exit
(
$code
);
...
...
This diff is collapsed.
Click to expand it.
mysql-test/lib/mtr_report.pl
View file @
288c2637
...
...
@@ -10,7 +10,6 @@ sub mtr_report_test_name($);
sub
mtr_report_test_passed
($);
sub
mtr_report_test_failed
($);
sub
mtr_report_test_skipped
($);
sub
mtr_report_test_disabled
($);
sub
mtr_show_failed_diff
($);
sub
mtr_report_stats
($);
...
...
This diff is collapsed.
Click to expand it.
mysql-test/mysql-test-run.pl
View file @
288c2637
...
...
@@ -341,7 +341,6 @@ sub main () {
if
(
!
$glob_use_running_server
)
{
if
(
$opt_start_dirty
)
{
kill_running_server
();
...
...
@@ -356,7 +355,7 @@ sub main () {
}
}
if
(
$opt_start_
and_exit
or
$opt_start_
dirty
)
if
(
$opt_start_dirty
)
{
if
(
ndbcluster_start
()
)
{
...
...
@@ -371,16 +370,13 @@ sub main () {
mtr_error
("
Can't start the mysqld server
");
}
}
elsif
(
$opt_bench
)
{
run_benchmarks
(
shift
);
# Shift what? Extra arguments?!
}
else
{
if
(
$opt_bench
)
{
run_benchmarks
(
shift
);
# Shift what? Extra arguments?!
}
else
{
run_tests
();
}
run_tests
();
}
mtr_exit
(
0
);
...
...
@@ -418,7 +414,7 @@ sub initial_setup () {
$opt_source_dist
=
1
;
}
$glob_hostname
=
mtr_
full
_hostname
();
$glob_hostname
=
mtr_
short
_hostname
();
# 'basedir' is always parent of "mysql-test" directory
$glob_mysql_test_dir
=
cwd
();
...
...
@@ -1490,6 +1486,16 @@ sub run_testcase ($) {
}
}
# ----------------------------------------------------------------------
# If --start-and-exit given, stop here to let user manually run tests
# ----------------------------------------------------------------------
if
(
$opt_start_and_exit
)
{
mtr_report
("
\n
Servers started, exiting
");
exit
(
0
);
}
# ----------------------------------------------------------------------
# Run the test case
# ----------------------------------------------------------------------
...
...
@@ -2248,7 +2254,8 @@ Misc options
script-debug Debug this script itself
compress Use the compressed protocol between client and server
timer Show test case execution time
start-and-exit Only initiate and start the "mysqld" servers
start-and-exit Only initiate and start the "mysqld" servers, use the startup
settings for the specified test case if any
start-dirty Only start the "mysqld" servers without initiation
fast Don't try to cleanup from earlier runs
reorder Reorder tests to get less server restarts
...
...
This diff is collapsed.
Click to expand it.
mysys/charset.c
View file @
288c2637
...
...
@@ -663,3 +663,21 @@ CHARSET_INFO *fs_character_set()
return
fs_cset_cache
;
}
#endif
/*
Transforms a string into hex form.
*/
char
*
bare_str_to_hex
(
char
*
to
,
const
char
*
from
,
uint
len
)
{
char
*
p
=
to
;
uint
i
;
for
(
i
=
0
;
i
<
len
;
i
++
,
p
+=
2
)
{
/* val[i] is char. Casting to uchar helps greatly if val[i] < 0 */
uint
tmp
=
(
uint
)
(
uchar
)
from
[
i
];
p
[
0
]
=
_dig_vec_upper
[
tmp
>>
4
];
p
[
1
]
=
_dig_vec_upper
[
tmp
&
15
];
}
*
p
=
0
;
return
p
;
// pointer to end 0 of 'to'
}
This diff is collapsed.
Click to expand it.
ndb/tools/Makefile.am
View file @
288c2637
...
...
@@ -32,7 +32,7 @@ ndb_restore_SOURCES = restore/restore_main.cpp \
restore/consumer_printer.cpp
\
restore/Restore.cpp
ndb_config_SOURCES
=
config.cpp
\
ndb_config_SOURCES
=
ndb_
config.cpp
\
../src/mgmsrv/Config.cpp
\
../src/mgmsrv/ConfigInfo.cpp
\
../src/mgmsrv/InitConfigFileParser.cpp
...
...
This diff is collapsed.
Click to expand it.
ndb/tools/config.cpp
→
ndb/tools/
ndb_
config.cpp
View file @
288c2637
File moved
This diff is collapsed.
Click to expand it.
sql/item.cc
View file @
288c2637
...
...
@@ -1443,7 +1443,7 @@ String *Item_param::val_str(String* str)
and avoid one more memcpy/alloc between str and log string.
*/
const
String
*
Item_param
::
query_val_str
(
String
*
str
)
const
const
String
*
Item_param
::
query_val_str
(
String
*
str
,
THD
*
thd
)
const
{
switch
(
state
)
{
case
INT_VALUE
:
...
...
@@ -1482,10 +1482,18 @@ const String *Item_param::query_val_str(String* str) const
buf
=
str
->
c_ptr_quick
();
ptr
=
buf
;
*
ptr
++=
'\''
;
ptr
+=
escape_string_for_mysql
(
str_value
.
charset
(),
ptr
,
str_value
.
ptr
(),
str_value
.
length
());
*
ptr
++=
'\''
;
if
(
thd
->
charset
()
->
escape_with_backslash_is_dangerous
)
{
ptr
=
strmov
(
ptr
,
"x
\'
"
);
ptr
=
bare_str_to_hex
(
ptr
,
str_value
.
ptr
(),
str_value
.
length
());
}
else
{
*
ptr
++=
'\''
;
ptr
+=
escape_string_for_mysql
(
str_value
.
charset
(),
ptr
,
str_value
.
ptr
(),
str_value
.
length
());
}
*
ptr
++=
'\''
;
str
->
length
(
ptr
-
buf
);
break
;
}
...
...
This diff is collapsed.
Click to expand it.
sql/item.h
View file @
288c2637
...
...
@@ -591,7 +591,7 @@ public:
*/
void
(
*
set_param_func
)(
Item_param
*
param
,
uchar
**
pos
,
ulong
len
);
const
String
*
query_val_str
(
String
*
str
)
const
;
const
String
*
query_val_str
(
String
*
str
,
THD
*
thd
)
const
;
bool
convert_str_value
(
THD
*
thd
);
...
...
This diff is collapsed.
Click to expand it.
sql/sql_prepare.cc
View file @
288c2637
...
...
@@ -601,7 +601,7 @@ static bool insert_params_withlog(Prepared_statement *stmt, uchar *null_array,
param
->
set_param_func
(
param
,
&
read_pos
,
data_end
-
read_pos
);
}
}
res
=
param
->
query_val_str
(
&
str
);
res
=
param
->
query_val_str
(
&
str
,
thd
);
if
(
param
->
convert_str_value
(
thd
))
DBUG_RETURN
(
1
);
/* out of memory */
...
...
@@ -749,7 +749,7 @@ static bool emb_insert_params_withlog(Prepared_statement *stmt, String *query)
client_param
->
buffer_length
);
}
}
res
=
param
->
query_val_str
(
&
str
);
res
=
param
->
query_val_str
(
&
str
,
thd
);
if
(
param
->
convert_str_value
(
thd
))
DBUG_RETURN
(
1
);
/* out of memory */
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-big5.c
View file @
288c2637
...
...
@@ -6378,6 +6378,7 @@ CHARSET_INFO my_charset_big5_chinese_ci=
2
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_big5_handler
,
&
my_collation_big5_chinese_ci_handler
};
...
...
@@ -6406,6 +6407,7 @@ CHARSET_INFO my_charset_big5_bin=
2
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_big5_handler
,
&
my_collation_mb_bin_handler
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-bin.c
View file @
288c2637
...
...
@@ -514,6 +514,7 @@ CHARSET_INFO my_charset_bin =
1
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_binary_handler
};
This diff is collapsed.
Click to expand it.
strings/ctype-cp932.c
View file @
288c2637
...
...
@@ -5520,6 +5520,7 @@ CHARSET_INFO my_charset_cp932_japanese_ci=
2
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
1
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_ci_handler
};
...
...
@@ -5547,6 +5548,7 @@ CHARSET_INFO my_charset_cp932_bin=
2
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
1
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_mb_bin_handler
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-czech.c
View file @
288c2637
...
...
@@ -612,6 +612,7 @@ CHARSET_INFO my_charset_latin2_czech_ci =
1
,
/* mbmaxlen */
0
,
/* min_sort_char */
0
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_8bit_handler
,
&
my_collation_latin2_czech_ci_handler
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-euc_kr.c
View file @
288c2637
...
...
@@ -8701,6 +8701,7 @@ CHARSET_INFO my_charset_euckr_korean_ci=
2
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_ci_handler
};
...
...
@@ -8729,6 +8730,7 @@ CHARSET_INFO my_charset_euckr_bin=
2
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_mb_bin_handler
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-extra.c
View file @
288c2637
...
...
@@ -40,6 +40,7 @@ CHARSET_INFO compiled_charsets[] = {
0
,
/* mbmaxlen */
0
,
/* min_sort_ord */
0
,
/* max_sort_ord */
0
,
/* escape_with_backslash_is_dangerous */
NULL
,
/* cset handler */
NULL
/* coll handler */
}
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-gb2312.c
View file @
288c2637
...
...
@@ -5752,6 +5752,7 @@ CHARSET_INFO my_charset_gb2312_chinese_ci=
2
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_ci_handler
};
...
...
@@ -5779,6 +5780,7 @@ CHARSET_INFO my_charset_gb2312_bin=
2
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_mb_bin_handler
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-gbk.c
View file @
288c2637
...
...
@@ -10028,6 +10028,7 @@ CHARSET_INFO my_charset_gbk_chinese_ci=
2
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_ci_handler
};
...
...
@@ -10055,6 +10056,7 @@ CHARSET_INFO my_charset_gbk_bin=
2
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_mb_bin_handler
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-latin1.c
View file @
288c2637
...
...
@@ -438,6 +438,7 @@ CHARSET_INFO my_charset_latin1=
1
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_8bit_simple_ci_handler
};
...
...
@@ -722,6 +723,7 @@ CHARSET_INFO my_charset_latin1_german2_ci=
1
,
/* mbmaxlen */
0
,
/* min_sort_char */
247
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_german2_ci_handler
};
...
...
@@ -750,6 +752,7 @@ CHARSET_INFO my_charset_latin1_bin=
1
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_8bit_bin_handler
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-sjis.c
View file @
288c2637
...
...
@@ -4676,6 +4676,7 @@ CHARSET_INFO my_charset_sjis_japanese_ci=
2
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_ci_handler
};
...
...
@@ -4703,6 +4704,7 @@ CHARSET_INFO my_charset_sjis_bin=
2
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_mb_bin_handler
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-tis620.c
View file @
288c2637
...
...
@@ -975,6 +975,7 @@ CHARSET_INFO my_charset_tis620_thai_ci=
1
,
/* mbmaxlen */
0
,
/* min_sort_char */
0
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_ci_handler
};
...
...
@@ -1002,6 +1003,7 @@ CHARSET_INFO my_charset_tis620_bin=
1
,
/* mbmaxlen */
0
,
/* min_sort_char */
0
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_8bit_bin_handler
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-uca.c
View file @
288c2637
...
...
@@ -8044,6 +8044,7 @@ CHARSET_INFO my_charset_ucs2_general_uca=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8071,6 +8072,7 @@ CHARSET_INFO my_charset_ucs2_icelandic_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8098,6 +8100,7 @@ CHARSET_INFO my_charset_ucs2_latvian_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8125,6 +8128,7 @@ CHARSET_INFO my_charset_ucs2_romanian_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8152,6 +8156,7 @@ CHARSET_INFO my_charset_ucs2_slovenian_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8179,6 +8184,7 @@ CHARSET_INFO my_charset_ucs2_polish_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8206,6 +8212,7 @@ CHARSET_INFO my_charset_ucs2_estonian_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8233,6 +8240,7 @@ CHARSET_INFO my_charset_ucs2_spanish_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8260,6 +8268,7 @@ CHARSET_INFO my_charset_ucs2_swedish_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8287,6 +8296,7 @@ CHARSET_INFO my_charset_ucs2_turkish_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8314,6 +8324,7 @@ CHARSET_INFO my_charset_ucs2_czech_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8342,6 +8353,7 @@ CHARSET_INFO my_charset_ucs2_danish_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8369,6 +8381,7 @@ CHARSET_INFO my_charset_ucs2_lithuanian_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8396,6 +8409,7 @@ CHARSET_INFO my_charset_ucs2_slovak_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8423,6 +8437,7 @@ CHARSET_INFO my_charset_ucs2_spanish2_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8451,6 +8466,7 @@ CHARSET_INFO my_charset_ucs2_roman_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8479,6 +8495,7 @@ CHARSET_INFO my_charset_ucs2_persian_uca_ci=
2
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_uca_handler
};
...
...
@@ -8552,6 +8569,7 @@ CHARSET_INFO my_charset_utf8_general_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8580,6 +8598,7 @@ CHARSET_INFO my_charset_utf8_icelandic_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8607,6 +8626,7 @@ CHARSET_INFO my_charset_utf8_latvian_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8634,6 +8654,7 @@ CHARSET_INFO my_charset_utf8_romanian_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8661,6 +8682,7 @@ CHARSET_INFO my_charset_utf8_slovenian_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8688,6 +8710,7 @@ CHARSET_INFO my_charset_utf8_polish_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8715,6 +8738,7 @@ CHARSET_INFO my_charset_utf8_estonian_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8742,6 +8766,7 @@ CHARSET_INFO my_charset_utf8_spanish_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8769,6 +8794,7 @@ CHARSET_INFO my_charset_utf8_swedish_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8796,6 +8822,7 @@ CHARSET_INFO my_charset_utf8_turkish_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8823,6 +8850,7 @@ CHARSET_INFO my_charset_utf8_czech_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8851,6 +8879,7 @@ CHARSET_INFO my_charset_utf8_danish_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8878,6 +8907,7 @@ CHARSET_INFO my_charset_utf8_lithuanian_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8905,6 +8935,7 @@ CHARSET_INFO my_charset_utf8_slovak_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8932,6 +8963,7 @@ CHARSET_INFO my_charset_utf8_spanish2_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8959,6 +8991,7 @@ CHARSET_INFO my_charset_utf8_roman_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
@@ -8986,6 +9019,7 @@ CHARSET_INFO my_charset_utf8_persian_uca_ci=
3
,
/* mbmaxlen */
9
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_any_uca_handler
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-ucs2.c
View file @
288c2637
...
...
@@ -1583,6 +1583,7 @@ CHARSET_INFO my_charset_ucs2_general_ci=
2
,
/* mbmaxlen */
0
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_general_ci_handler
};
...
...
@@ -1610,6 +1611,7 @@ CHARSET_INFO my_charset_ucs2_bin=
2
,
/* mbmaxlen */
0
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_ucs2_handler
,
&
my_collation_ucs2_bin_handler
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-ujis.c
View file @
288c2637
...
...
@@ -8571,6 +8571,7 @@ CHARSET_INFO my_charset_ujis_japanese_ci=
3
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_ci_handler
};
...
...
@@ -8599,6 +8600,7 @@ CHARSET_INFO my_charset_ujis_bin=
3
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_handler
,
&
my_collation_mb_bin_handler
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-utf8.c
View file @
288c2637
...
...
@@ -2345,6 +2345,7 @@ CHARSET_INFO my_charset_utf8_general_ci=
3
,
/* mbmaxlen */
0
,
/* min_sort_char */
0xFFFF
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_ci_handler
};
...
...
@@ -2373,6 +2374,7 @@ CHARSET_INFO my_charset_utf8_bin=
3
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_mb_bin_handler
};
...
...
@@ -2538,6 +2540,7 @@ CHARSET_INFO my_charset_utf8_general_cs=
3
,
/* mbmaxlen */
0
,
/* min_sort_char */
255
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_utf8_handler
,
&
my_collation_cs_handler
};
...
...
This diff is collapsed.
Click to expand it.
strings/ctype-win1250ch.c
View file @
288c2637
...
...
@@ -647,6 +647,7 @@ CHARSET_INFO my_charset_cp1250_czech_ci =
1
,
/* mbmaxlen */
0
,
/* min_sort_char */
0
,
/* max_sort_char */
0
,
/* escape_with_backslash_is_dangerous */
&
my_charset_8bit_handler
,
&
my_collation_czech_ci_handler
};
...
...
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