mysql2 0.4.10 → 0.5.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +5 -5
- data/README.md +98 -38
- data/ext/mysql2/client.c +223 -76
- data/ext/mysql2/client.h +1 -39
- data/ext/mysql2/extconf.rb +46 -26
- data/ext/mysql2/mysql2_ext.c +8 -2
- data/ext/mysql2/mysql2_ext.h +8 -4
- data/ext/mysql2/mysql_enc_name_to_ruby.h +60 -56
- data/ext/mysql2/mysql_enc_to_ruby.h +64 -3
- data/ext/mysql2/result.c +242 -86
- data/ext/mysql2/result.h +3 -3
- data/ext/mysql2/statement.c +90 -73
- data/ext/mysql2/statement.h +0 -2
- data/ext/mysql2/wait_for_single_fd.h +2 -1
- data/lib/mysql2/client.rb +51 -28
- data/lib/mysql2/em.rb +2 -4
- data/lib/mysql2/error.rb +52 -22
- data/lib/mysql2/result.rb +2 -0
- data/lib/mysql2/statement.rb +3 -11
- data/lib/mysql2/version.rb +1 -1
- data/lib/mysql2.rb +18 -15
- data/support/3A79BD29.asc +49 -0
- data/support/5072E1F5.asc +5 -5
- data/support/mysql_enc_to_ruby.rb +8 -3
- data/support/ruby_enc_to_mysql.rb +7 -5
- metadata +14 -58
- data/examples/eventmachine.rb +0 -21
- data/examples/threaded.rb +0 -18
- data/spec/configuration.yml.example +0 -11
- data/spec/em/em_spec.rb +0 -136
- data/spec/my.cnf.example +0 -9
- data/spec/mysql2/client_spec.rb +0 -1039
- data/spec/mysql2/error_spec.rb +0 -82
- data/spec/mysql2/result_spec.rb +0 -545
- data/spec/mysql2/statement_spec.rb +0 -776
- data/spec/rcov.opts +0 -3
- data/spec/spec_helper.rb +0 -108
- data/spec/ssl/ca-cert.pem +0 -17
- data/spec/ssl/ca-key.pem +0 -27
- data/spec/ssl/ca.cnf +0 -22
- data/spec/ssl/cert.cnf +0 -22
- data/spec/ssl/client-cert.pem +0 -17
- data/spec/ssl/client-key.pem +0 -27
- data/spec/ssl/client-req.pem +0 -15
- data/spec/ssl/gen_certs.sh +0 -48
- data/spec/ssl/pkcs8-client-key.pem +0 -28
- data/spec/ssl/pkcs8-server-key.pem +0 -28
- data/spec/ssl/server-cert.pem +0 -17
- data/spec/ssl/server-key.pem +0 -27
- data/spec/ssl/server-req.pem +0 -15
- data/spec/test_data +0 -1
data/ext/mysql2/client.h
CHANGED
@@ -1,41 +1,6 @@
|
|
1
1
|
#ifndef MYSQL2_CLIENT_H
|
2
2
|
#define MYSQL2_CLIENT_H
|
3
3
|
|
4
|
-
#ifndef HAVE_RB_THREAD_CALL_WITHOUT_GVL
|
5
|
-
#ifdef HAVE_RB_THREAD_BLOCKING_REGION
|
6
|
-
|
7
|
-
/* emulate rb_thread_call_without_gvl with rb_thread_blocking_region */
|
8
|
-
#define rb_thread_call_without_gvl(func, data1, ubf, data2) \
|
9
|
-
rb_thread_blocking_region((rb_blocking_function_t *)func, data1, ubf, data2)
|
10
|
-
|
11
|
-
#else /* ! HAVE_RB_THREAD_BLOCKING_REGION */
|
12
|
-
/*
|
13
|
-
* partial emulation of the 2.0 rb_thread_call_without_gvl under 1.8,
|
14
|
-
* this is enough for dealing with blocking I/O functions in the
|
15
|
-
* presence of threads.
|
16
|
-
*/
|
17
|
-
|
18
|
-
#include <rubysig.h>
|
19
|
-
#define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
|
20
|
-
typedef void rb_unblock_function_t(void *);
|
21
|
-
static void *
|
22
|
-
rb_thread_call_without_gvl(
|
23
|
-
void *(*func)(void *), void *data1,
|
24
|
-
RB_MYSQL_UNUSED rb_unblock_function_t *ubf,
|
25
|
-
RB_MYSQL_UNUSED void *data2)
|
26
|
-
{
|
27
|
-
void *rv;
|
28
|
-
|
29
|
-
TRAP_BEG;
|
30
|
-
rv = func(data1);
|
31
|
-
TRAP_END;
|
32
|
-
|
33
|
-
return rv;
|
34
|
-
}
|
35
|
-
|
36
|
-
#endif /* ! HAVE_RB_THREAD_BLOCKING_REGION */
|
37
|
-
#endif /* ! HAVE_RB_THREAD_CALL_WITHOUT_GVL */
|
38
|
-
|
39
4
|
typedef struct {
|
40
5
|
VALUE encoding;
|
41
6
|
VALUE active_thread; /* rb_thread_current() or Qnil */
|
@@ -51,6 +16,7 @@ typedef struct {
|
|
51
16
|
} mysql_client_wrapper;
|
52
17
|
|
53
18
|
void rb_mysql_client_set_active_thread(VALUE self);
|
19
|
+
void rb_mysql_set_server_query_flags(MYSQL *client, VALUE result);
|
54
20
|
|
55
21
|
#define GET_CLIENT(self) \
|
56
22
|
mysql_client_wrapper *wrapper; \
|
@@ -60,7 +26,3 @@ void init_mysql2_client(void);
|
|
60
26
|
void decr_mysql2_client(mysql_client_wrapper *wrapper);
|
61
27
|
|
62
28
|
#endif
|
63
|
-
|
64
|
-
#ifndef HAVE_RB_HASH_DUP
|
65
|
-
VALUE rb_hash_dup(VALUE other);
|
66
|
-
#endif
|
data/ext/mysql2/extconf.rb
CHANGED
@@ -1,4 +1,3 @@
|
|
1
|
-
# encoding: UTF-8
|
2
1
|
require 'mkmf'
|
3
2
|
require 'English'
|
4
3
|
|
@@ -8,37 +7,43 @@ def asplode(lib)
|
|
8
7
|
elsif RUBY_PLATFORM =~ /darwin/
|
9
8
|
abort "-----\n#{lib} is missing. You may need to 'brew install mysql' or 'port install mysql', and try again.\n-----"
|
10
9
|
else
|
11
|
-
abort "-----\n#{lib} is missing. You may need to 'apt-get install libmysqlclient-dev' or 'yum install mysql-devel', and try again.\n-----"
|
10
|
+
abort "-----\n#{lib} is missing. You may need to 'sudo apt-get install libmariadb-dev', 'sudo apt-get install libmysqlclient-dev' or 'sudo yum install mysql-devel', and try again.\n-----"
|
12
11
|
end
|
13
12
|
end
|
14
13
|
|
15
14
|
def add_ssl_defines(header)
|
16
|
-
all_modes_found = %w
|
15
|
+
all_modes_found = %w[SSL_MODE_DISABLED SSL_MODE_PREFERRED SSL_MODE_REQUIRED SSL_MODE_VERIFY_CA SSL_MODE_VERIFY_IDENTITY].inject(true) do |m, ssl_mode|
|
17
16
|
m && have_const(ssl_mode, header)
|
18
17
|
end
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
18
|
+
if all_modes_found
|
19
|
+
$CFLAGS << ' -DFULL_SSL_MODE_SUPPORT'
|
20
|
+
else
|
21
|
+
# if we only have ssl toggle (--ssl,--disable-ssl) from 5.7.3 to 5.7.10
|
22
|
+
# and the verify server cert option. This is also the case for MariaDB.
|
23
|
+
has_verify_support = have_const('MYSQL_OPT_SSL_VERIFY_SERVER_CERT', header)
|
24
|
+
has_enforce_support = have_const('MYSQL_OPT_SSL_ENFORCE', header)
|
25
|
+
$CFLAGS << ' -DNO_SSL_MODE_SUPPORT' if !has_verify_support && !has_enforce_support
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
# Homebrew openssl
|
30
|
+
if RUBY_PLATFORM =~ /darwin/ && system("command -v brew")
|
31
|
+
openssl_location = `brew --prefix openssl`.strip
|
32
|
+
$LDFLAGS << " -L#{openssl_location}/lib" if openssl_location
|
23
33
|
end
|
24
34
|
|
25
35
|
# 2.1+
|
26
36
|
have_func('rb_absint_size')
|
27
37
|
have_func('rb_absint_singlebit_p')
|
28
38
|
|
29
|
-
#
|
30
|
-
have_header('ruby/thread.h') && have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
|
31
|
-
|
32
|
-
# 1.9-only
|
33
|
-
have_func('rb_thread_blocking_region')
|
39
|
+
# Missing in RBX (https://github.com/rubinius/rubinius/issues/3771)
|
34
40
|
have_func('rb_wait_for_single_fd')
|
35
|
-
|
36
|
-
have_func(
|
37
|
-
have_func('rb_big_cmp')
|
41
|
+
|
42
|
+
have_func("rb_enc_interned_str", "ruby.h")
|
38
43
|
|
39
44
|
# borrowed from mysqlplus
|
40
45
|
# http://github.com/oldmoe/mysqlplus/blob/master/ext/extconf.rb
|
41
|
-
dirs = ENV.fetch('PATH').split(File::PATH_SEPARATOR) + %w
|
46
|
+
dirs = ENV.fetch('PATH').split(File::PATH_SEPARATOR) + %w[
|
42
47
|
/opt
|
43
48
|
/opt/local
|
44
49
|
/opt/local/mysql
|
@@ -50,20 +55,22 @@ dirs = ENV.fetch('PATH').split(File::PATH_SEPARATOR) + %w(
|
|
50
55
|
/usr/local/mysql-*
|
51
56
|
/usr/local/lib/mysql5*
|
52
57
|
/usr/local/opt/mysql5*
|
53
|
-
|
58
|
+
/usr/local/opt/mysql@*
|
59
|
+
/usr/local/opt/mysql-client
|
60
|
+
/usr/local/opt/mysql-client@*
|
61
|
+
].map { |dir| dir << '/bin' }
|
54
62
|
|
55
63
|
# For those without HOMEBREW_ROOT in PATH
|
56
64
|
dirs << "#{ENV['HOMEBREW_ROOT']}/bin" if ENV['HOMEBREW_ROOT']
|
57
65
|
|
58
|
-
GLOB = "{#{dirs.join(',')}}/{mysql_config,mysql_config5,mariadb_config}"
|
66
|
+
GLOB = "{#{dirs.join(',')}}/{mysql_config,mysql_config5,mariadb_config}".freeze
|
59
67
|
|
60
68
|
# If the user has provided a --with-mysql-dir argument, we must respect it or fail.
|
61
69
|
inc, lib = dir_config('mysql')
|
62
70
|
if inc && lib
|
63
|
-
#
|
64
|
-
#
|
71
|
+
# Ruby versions below 2.0 on Unix and below 2.1 on Windows
|
72
|
+
# do not properly search for lib directories, and must be corrected:
|
65
73
|
# https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/39717
|
66
|
-
# do not properly search for lib directories, and must be corrected
|
67
74
|
unless lib && lib[-3, 3] == 'lib'
|
68
75
|
@libdir_basename = 'lib'
|
69
76
|
inc, lib = dir_config('mysql')
|
@@ -72,6 +79,7 @@ if inc && lib
|
|
72
79
|
abort "-----\nCannot find library dir(s) #{lib}\n-----" unless lib && lib.split(File::PATH_SEPARATOR).any? { |dir| File.directory?(dir) }
|
73
80
|
warn "-----\nUsing --with-mysql-dir=#{File.dirname inc}\n-----"
|
74
81
|
rpath_dir = lib
|
82
|
+
have_library('mysqlclient')
|
75
83
|
elsif (mc = (with_config('mysql-config') || Dir[GLOB].first))
|
76
84
|
# If the user has provided a --with-mysql-config argument, we must respect it or fail.
|
77
85
|
# If the user gave --with-mysql-config with no argument means we should try to find it.
|
@@ -92,7 +100,7 @@ elsif (mc = (with_config('mysql-config') || Dir[GLOB].first))
|
|
92
100
|
else
|
93
101
|
_, usr_local_lib = dir_config('mysql', '/usr/local')
|
94
102
|
|
95
|
-
asplode("mysql client") unless find_library('mysqlclient',
|
103
|
+
asplode("mysql client") unless find_library('mysqlclient', nil, usr_local_lib, "#{usr_local_lib}/mysql")
|
96
104
|
|
97
105
|
rpath_dir = usr_local_lib
|
98
106
|
end
|
@@ -105,7 +113,7 @@ else
|
|
105
113
|
asplode 'mysql.h'
|
106
114
|
end
|
107
115
|
|
108
|
-
%w
|
116
|
+
%w[errmsg.h].each do |h|
|
109
117
|
header = [prefix, h].compact.join('/')
|
110
118
|
asplode h unless have_header header
|
111
119
|
end
|
@@ -114,7 +122,19 @@ mysql_h = [prefix, 'mysql.h'].compact.join('/')
|
|
114
122
|
add_ssl_defines(mysql_h)
|
115
123
|
have_struct_member('MYSQL', 'net.vio', mysql_h)
|
116
124
|
have_struct_member('MYSQL', 'net.pvio', mysql_h)
|
125
|
+
|
126
|
+
# These constants are actually enums, so they cannot be detected by #ifdef in C code.
|
127
|
+
have_const('MYSQL_DEFAULT_AUTH', mysql_h)
|
117
128
|
have_const('MYSQL_ENABLE_CLEARTEXT_PLUGIN', mysql_h)
|
129
|
+
have_const('SERVER_QUERY_NO_GOOD_INDEX_USED', mysql_h)
|
130
|
+
have_const('SERVER_QUERY_NO_INDEX_USED', mysql_h)
|
131
|
+
have_const('SERVER_QUERY_WAS_SLOW', mysql_h)
|
132
|
+
have_const('MYSQL_OPTION_MULTI_STATEMENTS_ON', mysql_h)
|
133
|
+
have_const('MYSQL_OPTION_MULTI_STATEMENTS_OFF', mysql_h)
|
134
|
+
|
135
|
+
# my_bool is replaced by C99 bool in MySQL 8.0, but we want
|
136
|
+
# to retain compatibility with the typedef in earlier MySQLs.
|
137
|
+
have_type('my_bool', mysql_h)
|
118
138
|
|
119
139
|
# This is our wishlist. We use whichever flags work on the host.
|
120
140
|
# -Wall and -Wextra are included by default.
|
@@ -145,12 +165,12 @@ end
|
|
145
165
|
$CFLAGS << ' ' << usable_flags.join(' ')
|
146
166
|
|
147
167
|
enabled_sanitizers = disabled_sanitizers = []
|
148
|
-
# Specify a
|
168
|
+
# Specify a comma-separated list of sanitizers, or try them all by default
|
149
169
|
sanitizers = with_config('sanitize')
|
150
170
|
case sanitizers
|
151
171
|
when true
|
152
172
|
# Try them all, turn on whatever we can
|
153
|
-
enabled_sanitizers = %w
|
173
|
+
enabled_sanitizers = %w[address cfi integer memory thread undefined].select do |s|
|
154
174
|
try_link('int main() {return 0;}', "-Werror -fsanitize=#{s}")
|
155
175
|
end
|
156
176
|
abort "-----\nCould not enable any sanitizers!\n-----" if enabled_sanitizers.empty?
|
@@ -178,7 +198,7 @@ unless enabled_sanitizers.empty?
|
|
178
198
|
$CFLAGS << ' -g -fno-omit-frame-pointer'
|
179
199
|
end
|
180
200
|
|
181
|
-
if RUBY_PLATFORM =~ /mswin|mingw/
|
201
|
+
if RUBY_PLATFORM =~ /mswin|mingw/ && !defined?(RubyInstaller)
|
182
202
|
# Build libmysql.a interface link library
|
183
203
|
require 'rake'
|
184
204
|
|
data/ext/mysql2/mysql2_ext.c
CHANGED
@@ -1,11 +1,17 @@
|
|
1
1
|
#include <mysql2_ext.h>
|
2
2
|
|
3
|
-
VALUE mMysql2, cMysql2Error;
|
3
|
+
VALUE mMysql2, cMysql2Error, cMysql2TimeoutError;
|
4
4
|
|
5
5
|
/* Ruby Extension initializer */
|
6
6
|
void Init_mysql2() {
|
7
|
-
mMysql2
|
7
|
+
mMysql2 = rb_define_module("Mysql2");
|
8
|
+
rb_global_variable(&mMysql2);
|
9
|
+
|
8
10
|
cMysql2Error = rb_const_get(mMysql2, rb_intern("Error"));
|
11
|
+
rb_global_variable(&cMysql2Error);
|
12
|
+
|
13
|
+
cMysql2TimeoutError = rb_const_get(cMysql2Error, rb_intern("TimeoutError"));
|
14
|
+
rb_global_variable(&cMysql2TimeoutError);
|
9
15
|
|
10
16
|
init_mysql2_client();
|
11
17
|
init_mysql2_result();
|
data/ext/mysql2/mysql2_ext.h
CHANGED
@@ -17,12 +17,8 @@ void Init_mysql2(void);
|
|
17
17
|
#include <mysql/errmsg.h>
|
18
18
|
#endif
|
19
19
|
|
20
|
-
#ifdef HAVE_RUBY_ENCODING_H
|
21
20
|
#include <ruby/encoding.h>
|
22
|
-
#endif
|
23
|
-
#ifdef HAVE_RUBY_THREAD_H
|
24
21
|
#include <ruby/thread.h>
|
25
|
-
#endif
|
26
22
|
|
27
23
|
#if defined(__GNUC__) && (__GNUC__ >= 3)
|
28
24
|
#define RB_MYSQL_NORETURN __attribute__ ((noreturn))
|
@@ -32,6 +28,14 @@ void Init_mysql2(void);
|
|
32
28
|
#define RB_MYSQL_UNUSED
|
33
29
|
#endif
|
34
30
|
|
31
|
+
/* MySQL 8.0 replaces my_bool with C99 bool. Earlier versions of MySQL had
|
32
|
+
* a typedef to char. Gem users reported failures on big endian systems when
|
33
|
+
* using C99 bool types with older MySQLs due to mismatched behavior. */
|
34
|
+
#ifndef HAVE_TYPE_MY_BOOL
|
35
|
+
#include <stdbool.h>
|
36
|
+
typedef bool my_bool;
|
37
|
+
#endif
|
38
|
+
|
35
39
|
#include <client.h>
|
36
40
|
#include <statement.h>
|
37
41
|
#include <result.h>
|
@@ -30,7 +30,7 @@ error "gperf generated tables don't work with this execution character set. Plea
|
|
30
30
|
#endif
|
31
31
|
|
32
32
|
struct mysql2_mysql_enc_name_to_rb_map { const char *name; const char *rb_name; };
|
33
|
-
/* maximum key range =
|
33
|
+
/* maximum key range = 71, duplicates = 0 */
|
34
34
|
|
35
35
|
#ifdef __GNUC__
|
36
36
|
__inline
|
@@ -46,32 +46,32 @@ mysql2_mysql_enc_name_to_rb_hash (str, len)
|
|
46
46
|
{
|
47
47
|
static const unsigned char asso_values[] =
|
48
48
|
{
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
0,
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
10, 0,
|
60
|
-
0,
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
49
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
50
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
51
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
52
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
53
|
+
74, 74, 74, 74, 74, 74, 74, 74, 15, 5,
|
54
|
+
0, 74, 5, 25, 40, 10, 20, 50, 74, 74,
|
55
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
56
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
57
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
58
|
+
74, 74, 74, 74, 74, 74, 74, 40, 5, 0,
|
59
|
+
15, 10, 0, 0, 0, 5, 74, 0, 25, 5,
|
60
|
+
0, 5, 74, 74, 20, 5, 5, 0, 74, 45,
|
61
|
+
74, 0, 74, 74, 74, 74, 74, 74, 74, 74,
|
62
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
63
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
64
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
65
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
66
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
67
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
68
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
69
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
70
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
71
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
72
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
73
|
+
74, 74, 74, 74, 74, 74, 74, 74, 74, 74,
|
74
|
+
74, 74, 74, 74, 74, 74
|
75
75
|
};
|
76
76
|
return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]] + asso_values[(unsigned char)str[len - 1]];
|
77
77
|
}
|
@@ -89,11 +89,11 @@ mysql2_mysql_enc_name_to_rb (str, len)
|
|
89
89
|
{
|
90
90
|
enum
|
91
91
|
{
|
92
|
-
TOTAL_KEYWORDS =
|
92
|
+
TOTAL_KEYWORDS = 41,
|
93
93
|
MIN_WORD_LENGTH = 3,
|
94
94
|
MAX_WORD_LENGTH = 8,
|
95
95
|
MIN_HASH_VALUE = 3,
|
96
|
-
MAX_HASH_VALUE =
|
96
|
+
MAX_HASH_VALUE = 73
|
97
97
|
};
|
98
98
|
|
99
99
|
static const struct mysql2_mysql_enc_name_to_rb_map wordlist[] =
|
@@ -101,54 +101,58 @@ mysql2_mysql_enc_name_to_rb (str, len)
|
|
101
101
|
{""}, {""}, {""},
|
102
102
|
{"gbk", "GBK"},
|
103
103
|
{""},
|
104
|
-
{"
|
104
|
+
{"utf32", "UTF-32"},
|
105
105
|
{"gb2312", "GB2312"},
|
106
106
|
{"keybcs2", NULL},
|
107
107
|
{""},
|
108
108
|
{"ucs2", "UTF-16BE"},
|
109
109
|
{"koi8u", "KOI8-R"},
|
110
110
|
{"binary", "ASCII-8BIT"},
|
111
|
-
{"
|
112
|
-
{""},
|
111
|
+
{"utf8mb4", "UTF-8"},
|
112
|
+
{"macroman", "macRoman"},
|
113
113
|
{"ujis", "eucJP-ms"},
|
114
|
-
{"
|
114
|
+
{"greek", "ISO-8859-7"},
|
115
115
|
{"cp1251", "Windows-1251"},
|
116
|
-
{"
|
116
|
+
{"utf16le", "UTF-16LE"},
|
117
117
|
{""},
|
118
118
|
{"sjis", "Shift_JIS"},
|
119
119
|
{"macce", "macCentEuro"},
|
120
|
-
{"
|
120
|
+
{"cp1257", "Windows-1257"},
|
121
|
+
{"eucjpms", "eucJP-ms"},
|
122
|
+
{""},
|
123
|
+
{"utf8", "UTF-8"},
|
124
|
+
{"cp852", "CP852"},
|
125
|
+
{"cp1250", "Windows-1250"},
|
126
|
+
{"gb18030", "GB18030"},
|
121
127
|
{""},
|
122
|
-
{"macroman", "macRoman"},
|
123
|
-
{"dec8", NULL},
|
124
|
-
{"utf32", "UTF-32"},
|
125
|
-
{"latin1", "ISO-8859-1"},
|
126
|
-
{"utf8mb4", "UTF-8"},
|
127
|
-
{"hp8", NULL},
|
128
128
|
{"swe7", NULL},
|
129
|
+
{"koi8r", "KOI8-R"},
|
130
|
+
{"tis620", "TIS-620"},
|
131
|
+
{"geostd8", NULL},
|
132
|
+
{""},
|
133
|
+
{"big5", "Big5"},
|
129
134
|
{"euckr", "EUC-KR"},
|
130
|
-
{"
|
135
|
+
{"latin2", "ISO-8859-2"},
|
131
136
|
{""}, {""},
|
132
|
-
{"
|
133
|
-
{"
|
134
|
-
{"
|
135
|
-
{""},
|
136
|
-
{"
|
137
|
+
{"dec8", NULL},
|
138
|
+
{"cp850", "CP850"},
|
139
|
+
{"latin1", "ISO-8859-1"},
|
140
|
+
{""},
|
141
|
+
{"hp8", NULL},
|
142
|
+
{""},
|
143
|
+
{"utf16", "UTF-16"},
|
137
144
|
{"latin7", "ISO-8859-13"},
|
138
145
|
{""}, {""}, {""},
|
139
146
|
{"ascii", "US-ASCII"},
|
140
|
-
{"
|
141
|
-
{""}, {""},
|
142
|
-
{"big5", "Big5"},
|
143
|
-
{"utf16", "UTF-16"},
|
144
|
-
{"cp1250", "Windows-1250"},
|
145
|
-
{""}, {""}, {""},
|
146
|
-
{"cp850", "CP850"},
|
147
|
-
{"tis620", "TIS-620"},
|
147
|
+
{"cp1256", "Windows-1256"},
|
148
148
|
{""}, {""}, {""},
|
149
149
|
{"cp932", "Windows-31J"},
|
150
|
+
{"hebrew", "ISO-8859-8"},
|
151
|
+
{""}, {""}, {""}, {""},
|
150
152
|
{"latin5", "ISO-8859-9"},
|
151
|
-
{""}, {""}, {""},
|
153
|
+
{""}, {""}, {""},
|
154
|
+
{"cp866", "IBM866"},
|
155
|
+
{""}, {""}, {""}, {""}, {""}, {""}, {""},
|
152
156
|
{"armscii8", NULL}
|
153
157
|
};
|
154
158
|
|
@@ -54,13 +54,13 @@ static const char *mysql2_mysql_enc_to_rb[] = {
|
|
54
54
|
"macRoman",
|
55
55
|
"UTF-16",
|
56
56
|
"UTF-16",
|
57
|
-
"",
|
57
|
+
"UTF-16LE",
|
58
58
|
"Windows-1256",
|
59
59
|
"Windows-1257",
|
60
60
|
"Windows-1257",
|
61
61
|
"UTF-32",
|
62
62
|
"UTF-32",
|
63
|
-
"",
|
63
|
+
"UTF-16LE",
|
64
64
|
"ASCII-8BIT",
|
65
65
|
NULL,
|
66
66
|
"US-ASCII",
|
@@ -74,7 +74,7 @@ static const char *mysql2_mysql_enc_to_rb[] = {
|
|
74
74
|
NULL,
|
75
75
|
"KOI8-R",
|
76
76
|
"KOI8-R",
|
77
|
-
|
77
|
+
"UTF-8",
|
78
78
|
"ISO-8859-2",
|
79
79
|
"ISO-8859-9",
|
80
80
|
"ISO-8859-13",
|
@@ -245,5 +245,66 @@ static const char *mysql2_mysql_enc_to_rb[] = {
|
|
245
245
|
"UTF-8",
|
246
246
|
"UTF-8",
|
247
247
|
"UTF-8",
|
248
|
+
"UTF-8",
|
249
|
+
"GB18030",
|
250
|
+
"GB18030",
|
251
|
+
"GB18030",
|
252
|
+
NULL,
|
253
|
+
NULL,
|
254
|
+
NULL,
|
255
|
+
NULL,
|
256
|
+
"UTF-8",
|
257
|
+
"UTF-8",
|
258
|
+
"UTF-8",
|
259
|
+
"UTF-8",
|
260
|
+
"UTF-8",
|
261
|
+
"UTF-8",
|
262
|
+
"UTF-8",
|
263
|
+
"UTF-8",
|
264
|
+
"UTF-8",
|
265
|
+
"UTF-8",
|
266
|
+
"UTF-8",
|
267
|
+
"UTF-8",
|
268
|
+
"UTF-8",
|
269
|
+
"UTF-8",
|
270
|
+
"UTF-8",
|
271
|
+
"UTF-8",
|
272
|
+
"UTF-8",
|
273
|
+
NULL,
|
274
|
+
"UTF-8",
|
275
|
+
"UTF-8",
|
276
|
+
"UTF-8",
|
277
|
+
NULL,
|
278
|
+
"UTF-8",
|
279
|
+
"UTF-8",
|
280
|
+
"UTF-8",
|
281
|
+
"UTF-8",
|
282
|
+
"UTF-8",
|
283
|
+
"UTF-8",
|
284
|
+
"UTF-8",
|
285
|
+
"UTF-8",
|
286
|
+
"UTF-8",
|
287
|
+
"UTF-8",
|
288
|
+
"UTF-8",
|
289
|
+
"UTF-8",
|
290
|
+
"UTF-8",
|
291
|
+
"UTF-8",
|
292
|
+
"UTF-8",
|
293
|
+
"UTF-8",
|
294
|
+
"UTF-8",
|
295
|
+
"UTF-8",
|
296
|
+
NULL,
|
297
|
+
"UTF-8",
|
298
|
+
"UTF-8",
|
299
|
+
"UTF-8",
|
300
|
+
NULL,
|
301
|
+
"UTF-8",
|
302
|
+
NULL,
|
303
|
+
NULL,
|
304
|
+
"UTF-8",
|
305
|
+
"UTF-8",
|
306
|
+
"UTF-8",
|
307
|
+
"UTF-8",
|
308
|
+
"UTF-8",
|
248
309
|
"UTF-8"
|
249
310
|
};
|