Sergei Golubchik
12 years ago
1449 changed files with 6137 additions and 2205 deletions
-
2.bzrignore
-
10CMakeLists.txt
-
4client/mysql_plugin.c
-
22client/mysqldump.c
-
18client/mysqltest.cc
-
16cmake/CPackRPM.cmake
-
132cmake/cpack_rpm.cmake
-
1cmake/install_macros.cmake
-
3cmake/zlib.cmake
-
4config.h.cmake
-
2extra/yassl/CMakeLists.txt
-
2extra/yassl/include/yassl_error.hpp
-
2extra/yassl/include/yassl_types.hpp
-
2extra/yassl/src/handshake.cpp
-
2extra/yassl/src/yassl_error.cpp
-
2extra/yassl/src/yassl_imp.cpp
-
2extra/yassl/taocrypt/CMakeLists.txt
-
2include/my_getopt.h
-
7include/my_global.h
-
2include/my_net.h
-
6include/my_pthread.h
-
6include/my_valgrind.h
-
2include/myisam.h
-
4include/mysql/plugin.h
-
2include/mysql/plugin_audit.h
-
8include/mysql/psi/mysql_thread.h
-
4include/welcome_copyright_notice.h
-
147libmysql/CMakeLists.txt
-
2libmysql/conf_to_src.c
-
4libmysql/libmysql.c
-
1libmysql/libmysql.ver.in
-
62libmysql/libmysql_rpm_version.in
-
45libmysql/libmysql_versions.ld.in
-
41libmysql/rpm_support.cc
-
2libmysqld/lib_sql.cc
-
2mysql-test/CMakeLists.txt
-
3mysql-test/collections/default.weekly
-
9mysql-test/include/ctype_filesort2.inc
-
3mysql-test/include/index_merge_ror_cpk.inc
-
15mysql-test/include/mtr_check.sql
-
2mysql-test/lib/My/SafeProcess/safe_process.cc
-
3mysql-test/lib/My/SysInfo.pm
-
1mysql-test/mysql-test-run.pl
-
6mysql-test/r/comments.result
-
15mysql-test/r/ctype_utf16.result
-
15mysql-test/r/ctype_utf16le.result
-
15mysql-test/r/ctype_utf32.result
-
15mysql-test/r/ctype_utf8mb4.result
-
2mysql-test/r/derived_view.result
-
40mysql-test/r/distinct.result
-
2mysql-test/r/error_simulation.result
-
1mysql-test/r/events_trans.result
-
1mysql-test/r/func_compress.result
-
11mysql-test/r/func_group.result
-
10mysql-test/r/func_misc.result
-
2mysql-test/r/func_regexp.result
-
1mysql-test/r/func_str.result
-
3mysql-test/r/gis-precise.result
-
21mysql-test/r/gis.result
-
16mysql-test/r/index_intersect_innodb.result
-
3mysql-test/r/index_merge_innodb.result
-
3mysql-test/r/index_merge_myisam.result
-
2mysql-test/r/join_outer.result
-
2mysql-test/r/join_outer_jcl6.result
-
4mysql-test/r/mysqld--help.result
-
14mysql-test/r/mysqldump.result
-
67mysql-test/r/partition.result
-
2mysql-test/r/partition_order.result
-
11mysql-test/r/ps.result
-
3mysql-test/r/range_vs_index_merge.result
-
7mysql-test/r/range_vs_index_merge_innodb.result
-
7mysql-test/r/rpl_mysqldump_slave.result
-
6mysql-test/r/select.result
-
6mysql-test/r/select_jcl6.result
-
6mysql-test/r/select_pkeycache.result
-
17mysql-test/r/selectivity.result
-
17mysql-test/r/selectivity_innodb.result
-
4mysql-test/r/ssl.result
-
4mysql-test/r/stat_tables_par.result
-
28mysql-test/r/stat_tables_par_innodb.result
-
4mysql-test/r/subselect.result
-
4mysql-test/r/subselect2.result
-
27mysql-test/r/subselect4.result
-
4mysql-test/r/subselect_exists_to_in.result
-
4mysql-test/r/subselect_extra.result
-
4mysql-test/r/subselect_no_mat.result
-
4mysql-test/r/subselect_no_opts.result
-
4mysql-test/r/subselect_no_scache.result
-
4mysql-test/r/subselect_no_semijoin.result
-
16mysql-test/r/subselect_sj.result
-
17mysql-test/r/subselect_sj2.result
-
17mysql-test/r/subselect_sj2_jcl6.result
-
17mysql-test/r/subselect_sj2_mat.result
-
16mysql-test/r/subselect_sj_jcl6.result
-
4mysql-test/r/type_datetime.result
-
20mysql-test/r/udf_debug_sync.result
-
5mysql-test/r/union_crash-714.result
-
2mysql-test/r/view.result
-
3mysql-test/r/xml.result
-
31mysql-test/std_data/cacert.pem
@ -0,0 +1,16 @@ |
|||
# |
|||
# Wrapper for CPackRPM.cmake |
|||
# |
|||
|
|||
# load the original CPackRPM.cmake |
|||
set(orig_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}) |
|||
unset(CMAKE_MODULE_PATH) |
|||
include(CPackRPM) |
|||
set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH}) |
|||
|
|||
# per-component cleanup |
|||
foreach(_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLICTS AUTOPROV AUTOREQ AUTOREQPROV) |
|||
unset(TMP_RPM_${_RPM_SPEC_HEADER}) |
|||
unset(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP) |
|||
endforeach() |
|||
|
|||
@ -1 +0,0 @@ |
|||
libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; }; |
|||
@ -1,62 +0,0 @@ |
|||
# This version script is heavily inspired by Fedora's and Mageia's version scripts for |
|||
# MySQL client shared library. It is used in MariaDB for building RPMs. |
|||
|
|||
libmysqlclient_16 { |
|||
global: |
|||
@CLIENT_API_5_1_LIST@ |
|||
|
|||
# some stuff from Mageia, I have no idea why it is there |
|||
# But too afraid to throw anything away |
|||
_fini; |
|||
_init; |
|||
my_init; |
|||
my_progname; |
|||
myodbc_remove_escape; |
|||
|
|||
# These are documented in Paul DuBois' MySQL book, so we treat them as part |
|||
# of the de-facto API. |
|||
free_defaults; |
|||
handle_options; |
|||
load_defaults; |
|||
my_print_help; |
|||
# pure-ftpd requires this |
|||
my_make_scrambled_password; |
|||
# fedora18 export |
|||
THR_KEY_mysys; |
|||
# hydra requires this |
|||
scramble; |
|||
# DBD::mysql requires this |
|||
is_prefix; |
|||
local: |
|||
*; |
|||
}; |
|||
|
|||
libmysqlclient_18 { |
|||
global: |
|||
@CLIENT_API_5_5_LIST@ |
|||
# |
|||
# Ideally the following symbols wouldn't be exported, but various applications |
|||
# require them. Fedora limits the namespace damage by prefixing mysql_ |
|||
# (see mysql-dubious-exports.patch), which means the symbols are not present |
|||
# in libmysqlclient_16. |
|||
# |
|||
# MariaDB does not do the Fedora-style function renaming via #define in headers, |
|||
# however it exports mysql_ prefixed symbols in addition to the "normal" ones. |
|||
# |
|||
# To ensure successful recompilation of affected projects, as well as drop-in replacement |
|||
# for MySQL libraries, provided by distribution, both original symbols and their mysql_ |
|||
# prefixed counterparts have to be exported. |
|||
|
|||
# mysql-connector-odbc requires these |
|||
mysql_default_charset_info; |
|||
mysql_get_charset; |
|||
mysql_get_charset_by_csname; |
|||
mysql_net_realloc; |
|||
default_charset_info; |
|||
get_charset; |
|||
get_charset_by_csname; |
|||
net_realloc; |
|||
# PHP's mysqli.so requires this (via the ER() macro) |
|||
mysql_client_errors; |
|||
client_errors; |
|||
}; |
|||
@ -0,0 +1,45 @@ |
|||
/* |
|||
This version script is heavily inspired by Fedora's and Mageia's version |
|||
scripts for MySQL client shared library. |
|||
But it was modified to support Debian-compatible versioning too. |
|||
|
|||
In RedHat universe, symbols from old libmysqlclient.so.16 |
|||
keep their libmysqlclient_16 version. New symbols added in |
|||
libmysqlclient.so.18 get the new libmysqlclient_18 version. |
|||
|
|||
In Debian all symbols in libmysqlclient.so.18 have libmysqlclient_18 version, |
|||
including symbols that existed in libmysqlclient.so.16 |
|||
|
|||
We solve this by putting all symbols into libmysqlclient_18 version node, |
|||
but creating aliases for old symbols in the libmysqlclient_16 version node. |
|||
*/ |
|||
|
|||
@CLIENT_API_5_1_ALIASES@ |
|||
|
|||
/* |
|||
On Fedora the following symbols are exported, but renamed into a mysql_ |
|||
namespace. We export them as aliases, but keep original symbols too. See |
|||
MDEV-4127. |
|||
*/ |
|||
mysql_default_charset_info = default_charset_info; |
|||
mysql_get_charset = get_charset; |
|||
mysql_get_charset_by_csname = get_charset_by_csname; |
|||
mysql_net_realloc = net_realloc; |
|||
mysql_client_errors = client_errors; |
|||
|
|||
VERSION { |
|||
|
|||
libmysqlclient_18 { |
|||
global: |
|||
@CLIENT_API_5_1_LIST@ |
|||
@CLIENT_API_5_5_LIST@ |
|||
|
|||
local: |
|||
*; |
|||
}; |
|||
|
|||
libmysqlclient_16 { |
|||
/* empty here. aliases are added above */ |
|||
}; |
|||
|
|||
} |
|||
@ -1,41 +0,0 @@ |
|||
/*
|
|||
Provide aliases for several symbols, to support drop-in replacement for |
|||
MariaDB on Fedora and several derives distributions. |
|||
|
|||
These distributions redefine several symbols (in a way that is no compatible |
|||
with either MySQL or MariaDB) and export it from the client library ( as seen |
|||
e.g from this patch) |
|||
http://lists.fedoraproject.org/pipermail/scm-commits/2010-December/537257.html
|
|||
|
|||
MariaDB handles compatibility distribution by providing the same symbols from |
|||
the client library if it is built with -DRPM |
|||
|
|||
*/ |
|||
#include <errmsg.h>
|
|||
#include <my_sys.h>
|
|||
#include <mysql.h>
|
|||
extern "C" { |
|||
|
|||
CHARSET_INFO *mysql_default_charset_info = default_charset_info; |
|||
|
|||
CHARSET_INFO *mysql_get_charset(uint cs_number, myf flags) |
|||
{ |
|||
return get_charset(cs_number, flags); |
|||
} |
|||
|
|||
CHARSET_INFO *mysql_get_charset_by_csname(const char *cs_name, |
|||
uint cs_flags, myf my_flags) |
|||
{ |
|||
return get_charset_by_csname(cs_name, cs_flags, my_flags); |
|||
} |
|||
|
|||
|
|||
my_bool mysql_net_realloc(NET *net, size_t length) |
|||
{ |
|||
return net_realloc(net,length); |
|||
} |
|||
|
|||
const char **mysql_client_errors = client_errors; |
|||
|
|||
} /*extern "C" */ |
|||
|
|||
@ -0,0 +1,20 @@ |
|||
CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB"; |
|||
CREATE VIEW v1 AS SELECT myfunc_int(1); |
|||
SET debug_sync='mysql_create_function_after_lock SIGNAL locked WAIT_FOR go'; |
|||
CREATE FUNCTION myfunc_double RETURNS REAL SONAME "UDF_EXAMPLE_LIB"; |
|||
SET debug_sync='now WAIT_FOR locked'; |
|||
SET debug_sync='find_udf_before_lock SIGNAL go'; |
|||
SELECT * FROM v1; |
|||
myfunc_int(1) |
|||
1 |
|||
FLUSH TABLES; |
|||
SET debug_sync='mysql_drop_function_after_lock SIGNAL locked WAIT_FOR go'; |
|||
DROP FUNCTION myfunc_double; |
|||
SET debug_sync='now WAIT_FOR locked'; |
|||
SET debug_sync='find_udf_before_lock SIGNAL go'; |
|||
SELECT * FROM v1; |
|||
myfunc_int(1) |
|||
1 |
|||
SET debug_sync='RESET'; |
|||
DROP VIEW v1; |
|||
DROP FUNCTION myfunc_int; |
|||
@ -0,0 +1,5 @@ |
|||
create table t1 (i tinyint); |
|||
set debug_dbug='+d,bug11747970_raise_error'; |
|||
insert into t1 (i) select i from t1 union select i from t1; |
|||
ERROR 70100: Query execution was interrupted |
|||
drop table t1; |
|||
@ -1,17 +1,22 @@ |
|||
-----BEGIN CERTIFICATE----- |
|||
MIICrTCCAhagAwIBAgIJAMI7xZKjhrDbMA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV |
|||
MIIDsjCCApqgAwIBAgIJAL5YrUwfPSWVMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV |
|||
BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD |
|||
VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkxMTQ3MTBaFw0xNTAxMjgxMTQ3MTBaMEQx |
|||
VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkwNTU5NTNaFw0xNTAxMjgwNTU5NTNaMEQx |
|||
CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh |
|||
MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA |
|||
wQYsOEfrN4ESP3FjsI8cghE+tZVuyK2gck61lwieVxjgFMtBd65mI5a1y9pmlOI1 |
|||
yM4SB2Ppqcuw7/e1CdV1y7lvHrGNt5yqEHbN4QX1gvsN8TQauP/2WILturk4R4Hq |
|||
rKg0ZySu7f1Xhl0ed9a48LpaEHD17IcxWEGMMJwAxF0CAwEAAaOBpjCBozAMBgNV |
|||
HRMEBTADAQH/MB0GA1UdDgQWBBSvktYQ0ahLnyxyVKqty+WpBbBrDTB0BgNVHSME |
|||
bTBrgBSvktYQ0ahLnyxyVKqty+WpBbBrDaFIpEYwRDELMAkGA1UEBhMCU0UxEDAO |
|||
BgNVBAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FM |
|||
IEFCggkAwjvFkqOGsNswDQYJKoZIhvcNAQEEBQADgYEAdKN1PjwMHAKG2Ww1145g |
|||
JQGBnKxSFOUaoSvkBi/4ntTM+ysnViWh7WvxyWjR9zU9arfr7aqsDeQxm0XDOqzj |
|||
AQ/cQIla2/Li8tXyfc06bisH/IHRaSc2zWqioTKbEwMdVOdrvq4a8V8ic3xYyIWn |
|||
7F4WeS07J8LKardSvM0+hOA= |
|||
MREwDwYDVQQKEwhNeVNRTCBBQjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC |
|||
ggEBAL6kNN4peX7uhK9rb06W/QbPEpVuejmdWdl2PqMshP/eSuXXw7kwVgfpxx9R |
|||
vC000CKQQSG9MCoZjtqPnFRsetmWLZgApRpEalGXTXJqq9sEbCfoFizg94U8G7d2 |
|||
u5XJjLVmcG34ru36KoBgVx1zeH1puBAf8dOzrE4L7Y+ZQBFzFohjh8C2LqWC4nM5 |
|||
qsLmOkDWMipGqYU5DvkKjIbTbwTyRNRgZHWSPfVDDPUIUOsY4BGUp2DpgeGY9aEv |
|||
lIs57Ev9JqlIUCV65lOhhDkG+xwmkHKHA+ECEU9cALI8+uXbh48MB9XpMOuk408X |
|||
/lX89aZwD0/G9kmObVGnE2G+H5UCAwEAAaOBpjCBozAdBgNVHQ4EFgQUsft+d7VA |
|||
jWgRftkR5cPG2k2sUbAwdAYDVR0jBG0wa4AUsft+d7VAjWgRftkR5cPG2k2sUbCh |
|||
SKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdV |
|||
cHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAL5YrUwfPSWVMAwGA1UdEwQFMAMB |
|||
Af8wDQYJKoZIhvcNAQEFBQADggEBALRUOAmdL8R8sl1y8kiEiFgDatdXK5RDqWai |
|||
8yZChfmwTIToHhmQsOEshJe2e8hky3huUj+33VyXjINoMbebIwMuXPwEkbJal8RZ |
|||
nSJmF0jN1Qz7J/jFffwK9xmejWZJx49Kt2+Qwrwp6kDeq9TLFqQOoVczgyJPYsTL |
|||
NAOib5WqTud3XWvCwxrhqmWu7JZq6sp1fomP/uunprb8y2miWfLESZN2mKAhm44Q |
|||
Lws867LT8v2lskEjq2dT1LutD5+R66XcdjgSr0uDziDs64jZwCD6ea94hVFM7ej0 |
|||
ZOXYeSEZJ56FjUxu632e9fY8NyMh30yKjjmQf1mM9PuGJvdvsWU= |
|||
-----END CERTIFICATE----- |
|||
Some files were not shown because too many files changed in this diff
Write
Preview
Loading…
Cancel
Save
Reference in new issue