From: Sergey Vojtovich
Date: March 18 2011 6:37am
Subject: bzr commit into mysql-5.5 branch (sergey.vojtovich:3315) Bug#11867985
List-Archive: http://lists.mysql.com/commits/133262
X-Bug: 11867985
Message-Id: <201103180640.p2I6eUxL019479@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1183762375531586983=="

--===============1183762375531586983==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/svoj/mysql/server/mysql-5.5-wl5395/ based on revid:anitha.gopi@stripped

 3315 Sergey Vojtovich	2011-03-18
      BUG#11867985 - export symbols needed for auditing
     @ include/m_ctype.h
        Export symbols needed for auditing.
     @ sql/mysqld.h
        Export symbols needed for auditing.

    modified:
      include/m_ctype.h
      sql/mysqld.h
=== modified file 'include/m_ctype.h'
--- a/include/m_ctype.h	2010-12-01 22:15:14 +0000
+++ b/include/m_ctype.h	2011-03-18 06:37:08 +0000
@@ -346,7 +346,7 @@ extern CHARSET_INFO my_charset_utf32_bin
 extern CHARSET_INFO my_charset_utf32_general_ci;
 extern CHARSET_INFO my_charset_utf32_unicode_ci;
 
-extern CHARSET_INFO my_charset_utf8_general_ci;
+extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_utf8_general_ci;
 extern CHARSET_INFO my_charset_utf8_unicode_ci;
 extern CHARSET_INFO my_charset_utf8_bin;
 extern CHARSET_INFO my_charset_utf8mb4_bin;

=== modified file 'sql/mysqld.h'
--- a/sql/mysqld.h	2011-01-14 13:21:46 +0000
+++ b/sql/mysqld.h	2011-03-18 06:37:08 +0000
@@ -73,7 +73,7 @@ void flush_thread_cache();
 void refresh_status(THD *thd);
 bool is_secure_file_path(char *path);
 
-extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *system_charset_info;
+extern "C" MYSQL_PLUGIN_IMPORT CHARSET_INFO *system_charset_info;
 extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *files_charset_info ;
 extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *national_charset_info;
 extern MYSQL_PLUGIN_IMPORT CHARSET_INFO *table_alias_charset;
@@ -181,7 +181,8 @@ extern ulong opt_binlog_rows_event_max_s
 extern ulong rpl_recovery_rank, thread_cache_size;
 extern ulong back_log;
 extern char language[FN_REFLEN];
-extern ulong server_id, concurrency;
+extern "C" MYSQL_PLUGIN_IMPORT ulong server_id;
+extern ulong concurrency;
 extern time_t server_start_time, flush_status_time;
 extern char *opt_mysql_tmpdir, mysql_charsets_dir[];
 extern int mysql_unpacked_real_data_home_len;
@@ -202,8 +203,8 @@ extern handlerton *heap_hton;
 extern const char *load_default_groups[];
 extern struct my_option my_long_options[];
 extern int mysqld_server_started;
-extern int orig_argc;
-extern char **orig_argv;
+extern "C" MYSQL_PLUGIN_IMPORT int orig_argc;
+extern "C" MYSQL_PLUGIN_IMPORT char **orig_argv;
 extern pthread_attr_t connection_attrib;
 extern MYSQL_FILE *bootstrap_file;
 extern my_bool old_mode;
@@ -306,7 +307,7 @@ extern uint mysql_real_data_home_len;
 extern const char *mysql_real_data_home_ptr;
 extern ulong thread_handling;
 extern MYSQL_PLUGIN_IMPORT char  *mysql_data_home;
-extern char server_version[SERVER_VERSION_LENGTH];
+extern "C" MYSQL_PLUGIN_IMPORT char server_version[SERVER_VERSION_LENGTH];
 extern MYSQL_PLUGIN_IMPORT char mysql_real_data_home[];
 extern char mysql_unpacked_real_data_home[];
 extern MYSQL_PLUGIN_IMPORT struct system_variables global_system_variables;


--===============1183762375531586983==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/sergey.vojtovich@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sergey.vojtovich@stripped\
#   ypqmtt86vc63d7n3
# target_branch: file:///home/svoj/mysql/server/mysql-5.5-wl5395/
# testament_sha1: fbaaddc42695d0258ffbb2c04ffbe7e2ae80cf3d
# timestamp: 2011-03-18 09:37:12 +0300
# base_revision_id: anitha.gopi@stripped\
#   4yiah5klp8fht1zf
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUyENzAAAmzfgEAQWHP//3vn
/yq////wUAW2yFEReQrJRTZtBJIQCaYBE2pgKeQ0iYQNMPUg9TTGoREnqe1Q09QD0agMgAGmgABh
DEBIoEGkwjSaaDVPNTJqPU9QAAAepoAcZMmTEYmAEyYJkANGEYAhgEkqT2mUMU9EaaaNHqPU9QAA
Gg0AeUeocEULCgAoFeqAk6RWAFUlIIQhpxTgVYZp1CYTMy11xO8Qr6+ddT7TAYNpuz8he6V2OMeT
oXwlnDMbdrgRgQbr+ZnpYPxYoH03ZHVf1I6PGY+qxoeihz08M0lWHpQ6+wxfdkfSzoh/FDkHsd2N
3MRKhTsvJC1V+W9M5bFhwzs9Vf2y7tAN77COVxVNB0J2tNN9t6DUlrttnIluoLiwG+9QUsqxos04
JgmN674BZ6kSKRtVgaWyvAcIKoEYq5Gy4JLfW+LHimxOzlJfO1J/JSKimBhHlvN0PCrtBQTh6TpI
63HWzbs24rK3CUIQL/9pdzzx+vOBheQ51XqFSiKjRUYspNyunnHZZ1GgBWBNS2yj18IF1mnpbQ7D
dzqLGRPtNdgyZz0n3GbW9MrG3S9M3LhFIo1fgaWLCixKmYFdSeE4QupBgQKHUso7cb6XXrs0Io45
dUd2Zy0UoPhgtZsviJhyqOzZIvrcp7q5SeJ6o2q5v+ulHzqTRCGoL7ZDCq2U8SNb1f5tz2ursZn+
eaqAFeYCpapk7nsszQ2m0uOycgVaK6WWpoifSWE5pptL3JWAR3jKUDsgccC6RUgdCszkcIGe0jrI
NXmmBLLeyzYBVwAacx7ScLjeoeAFAvjhO7gamB4rDSmRE0V2uFTYWq7HArYnUzjEmPLYPv6Y4UMK
2wCtCd4RKkdIQdkKPTgpleEQ6WVz1MlNBsPx9u3Vpr9iy1aCsYi5jBo/Y2taFKCZZy9KMMw2Xyvo
0R3pZWzDz4LEm7jNaBmE+5WKwVYphMTsLPWXIxPFYK6KwhATFv4rRXOFVEe3EWaKukXDLEWA0opO
pv8ODkdNh82zegczI/nk9EXrevc5wvf0P09p7vyefD30JHtVSqT0exUe9PfaWv4rrb8WpS4EHmkg
McE7jgfDTitOK1QUejFQkHGXXOrtdH6iKD+AJSBvrzDk95vzy/O3qtmxhGkyHN2uZIiMQlpxxoiM
aKTURnx0ukkYgGB7oQDzcBHhMUwpyG9Rl5QouRuUFSpsF8us0RuYFKhzjXzrzluxUnXnRM94keR7
CGLPKFwXo9vEpmsokrA7bOpRl2XP9J6Ubl7oWY9t7XkmH/Z7qTMPs5iJJS64nLgECqPCxHFLOIjx
Wmo7i7wOQxvVGWhYm0emdNcr+SnXBfc78BjEjyXFPRAeHpoNWhYAReEBF3RTcYcvGeMBuJVQEQXc
KAXTPL31ZgqNagXcmRU1PisFj7BDa7rujJNRvUZmQeMDsjv6CtfPGo/vslk0irRUqlzgaWWkRhiP
UVSOzYpNiyCReDFD19+eyORF3muCrSGO5kSY61rVCrVUxZ3wQrPBzv83Ly4q7krBytMvRR3Rxq3p
A+Xv8Z5YuELEbGV6U/MBhaYUI7YCkoxioDVsSp9U8UgmYGTrC1nYuXlzQcuiySUwm3ayfWmzqhea
R4ow+0FSEFv0OEMu5XsilTdrDC3xJkR7mWTeZSbMYD4ctO7RROBeQZFFMmHIuADZcKyOSw9uqjYI
b87kYxSyn0Ux3SKWptjWxWGal4HimZejyNCB4vI5hJwKr0TGxq8vdlvGDRgDgjuTZlutxqTbVnAh
fAo1g17mjclOGGMxguDqKaiJUIlXEIZ8cFoBQA+pF/VlLqqqnJghruJQJVMRYBF6PSg35bb41b36
1DOS/EoEqRkDYTqyXCz1q9Z+1FoEgod6yzT5L1K+zwX/i7kinChIJkIbmAA=


--===============1183762375531586983==--