Merge lp:~laurynas-biveinis/percona-server/merge-5.1.72 into lp:percona-server/5.5

Proposed by Laurynas Biveinis
Status: Superseded
Proposed branch: lp:~laurynas-biveinis/percona-server/merge-5.1.72
Merge into: lp:percona-server/5.5
Diff against target: 143297 lines (+122892/-1344) (has conflicts)
1915 files modified
Makefile (+5/-0)
Percona-Server/BUILD/Makefile.am.OTHER (+82/-0)
Percona-Server/BUILD/autorun.sh (+9/-0)
Percona-Server/BUILD/build_mccge.sh (+5/-0)
Percona-Server/BUILD/compile-alpha-ccc.OTHER (+56/-0)
Percona-Server/BUILD/compile-alpha-cxx.OTHER (+58/-0)
Percona-Server/BUILD/compile-alpha-debug (+4/-0)
Percona-Server/BUILD/compile-amd64-debug-max (+4/-0)
Percona-Server/BUILD/compile-amd64-max (+4/-0)
Percona-Server/BUILD/compile-darwin-mwcc (+4/-0)
Percona-Server/BUILD/compile-hpux11-parisc2-aCC (+4/-0)
Percona-Server/BUILD/compile-ia64-debug-max (+8/-0)
Percona-Server/BUILD/compile-irix-mips64-mipspro (+4/-0)
Percona-Server/BUILD/compile-pentium (+4/-0)
Percona-Server/BUILD/compile-pentium-debug (+4/-0)
Percona-Server/BUILD/compile-pentium-debug-max (+4/-0)
Percona-Server/BUILD/compile-pentium-debug-max-no-embedded (+4/-0)
Percona-Server/BUILD/compile-pentium-debug-openssl (+8/-0)
Percona-Server/BUILD/compile-pentium-debug-yassl (+8/-0)
Percona-Server/BUILD/compile-pentium-max (+4/-0)
Percona-Server/BUILD/compile-pentium-pgcc (+4/-0)
Percona-Server/BUILD/compile-pentium64 (+5/-0)
Percona-Server/BUILD/compile-pentium64-debug (+4/-0)
Percona-Server/BUILD/compile-pentium64-debug-max (+4/-0)
Percona-Server/BUILD/compile-ppc-debug (+4/-0)
Percona-Server/BUILD/compile-ppc-debug-max (+4/-0)
Percona-Server/BUILD/compile-ppc-debug-max-no-ndb (+4/-0)
Percona-Server/BUILD/compile-ppc-max (+4/-0)
Percona-Server/BUILD/compile-solaris-sparc-debug (+4/-0)
Percona-Server/BUILD/compile-solaris-sparc-purify (+4/-0)
Percona-Server/CMakeLists.txt (+4/-0)
Percona-Server/Docs/Makefile.am.OTHER (+42/-0)
Percona-Server/Makefile.am.OTHER (+333/-0)
Percona-Server/README (+59/-0)
Percona-Server/client/completion_hash.cc (+8/-0)
Percona-Server/client/completion_hash.h (+4/-0)
Percona-Server/client/echo.c (+4/-0)
Percona-Server/client/get_password.c (+4/-0)
Percona-Server/client/mysqlbinlog.cc (+34/-0)
Percona-Server/client/mysqldump.c (+12/-2)
Percona-Server/client/sql_string.h (+5/-0)
Percona-Server/cmd-line-utils/Makefile.am.OTHER (+24/-0)
Percona-Server/cmd-line-utils/readline/COPYING (+4/-0)
Percona-Server/cmd-line-utils/readline/ansi_stdlib.h (+4/-0)
Percona-Server/cmd-line-utils/readline/chardefs.h (+4/-0)
Percona-Server/cmd-line-utils/readline/complete.c (+4/-0)
Percona-Server/cmd-line-utils/readline/configure.in (+5/-0)
Percona-Server/cmd-line-utils/readline/funmap.c (+4/-0)
Percona-Server/cmd-line-utils/readline/histexpand.c (+4/-0)
Percona-Server/cmd-line-utils/readline/histlib.h (+4/-0)
Percona-Server/cmd-line-utils/readline/history.c (+4/-0)
Percona-Server/cmd-line-utils/readline/history.h (+4/-0)
Percona-Server/cmd-line-utils/readline/histsearch.c (+4/-0)
Percona-Server/cmd-line-utils/readline/keymaps.c (+4/-0)
Percona-Server/cmd-line-utils/readline/keymaps.h (+4/-0)
Percona-Server/cmd-line-utils/readline/macro.c (+4/-0)
Percona-Server/cmd-line-utils/readline/misc.c (+4/-0)
Percona-Server/cmd-line-utils/readline/parens.c (+4/-0)
Percona-Server/cmd-line-utils/readline/posixdir.h (+4/-0)
Percona-Server/cmd-line-utils/readline/posixjmp.h (+5/-0)
Percona-Server/cmd-line-utils/readline/posixstat.h (+5/-0)
Percona-Server/cmd-line-utils/readline/readline.c (+4/-0)
Percona-Server/cmd-line-utils/readline/readline.h (+4/-0)
Percona-Server/cmd-line-utils/readline/rlconf.h (+4/-0)
Percona-Server/cmd-line-utils/readline/rlmbutil.h (+4/-0)
Percona-Server/cmd-line-utils/readline/rlstdc.h (+5/-0)
Percona-Server/cmd-line-utils/readline/rltty.c (+4/-0)
Percona-Server/cmd-line-utils/readline/rltypedefs.h (+4/-0)
Percona-Server/cmd-line-utils/readline/savestring.c (+4/-0)
Percona-Server/cmd-line-utils/readline/search.c (+4/-0)
Percona-Server/cmd-line-utils/readline/shell.c (+4/-0)
Percona-Server/cmd-line-utils/readline/text.c (+4/-0)
Percona-Server/cmd-line-utils/readline/tilde.c (+4/-0)
Percona-Server/cmd-line-utils/readline/tilde.h (+4/-0)
Percona-Server/cmd-line-utils/readline/util.c (+4/-0)
Percona-Server/cmd-line-utils/readline/vi_keymap.c (+4/-0)
Percona-Server/cmd-line-utils/readline/vi_mode.c (+4/-0)
Percona-Server/cmd-line-utils/readline/xmalloc.c (+5/-0)
Percona-Server/cmd-line-utils/readline/xmalloc.h (+4/-0)
Percona-Server/config/ac-macros/misc.m4.OTHER (+695/-0)
Percona-Server/configure.in.OTHER (+2981/-0)
Percona-Server/dbug/CMakeLists.txt (+4/-0)
Percona-Server/dbug/Makefile.am.OTHER (+65/-0)
Percona-Server/dbug/dbug_add_tags.pl (+4/-0)
Percona-Server/extra/CMakeLists.txt (+4/-0)
Percona-Server/extra/Makefile.am.OTHER (+60/-0)
Percona-Server/extra/charset2html.c (+4/-0)
Percona-Server/extra/comp_err.c (+20/-0)
Percona-Server/extra/yassl/Makefile.am.OTHER (+20/-0)
Percona-Server/extra/yassl/src/Makefile.am.OTHER (+27/-0)
Percona-Server/extra/yassl/src/template_instnt.cpp (+4/-0)
Percona-Server/extra/yassl/taocrypt/Makefile.am.OTHER (+20/-0)
Percona-Server/extra/yassl/taocrypt/benchmark/Makefile.am.OTHER (+24/-0)
Percona-Server/extra/yassl/taocrypt/src/Makefile.am.OTHER (+33/-0)
Percona-Server/extra/yassl/taocrypt/test/Makefile.am.OTHER (+24/-0)
Percona-Server/extra/yassl/testsuite/Makefile.am.OTHER (+29/-0)
Percona-Server/include/base64.h (+4/-0)
Percona-Server/include/decimal.h (+4/-0)
Percona-Server/include/errmsg.h (+8/-0)
Percona-Server/include/ft_global.h (+8/-0)
Percona-Server/include/heap.h (+4/-0)
Percona-Server/include/help_end.h.OTHER (+22/-0)
Percona-Server/include/help_start.h.OTHER (+24/-0)
Percona-Server/include/keycache.h (+6/-0)
Percona-Server/include/m_ctype.h (+5/-0)
Percona-Server/include/my_aes.h (+8/-0)
Percona-Server/include/my_alloc.h (+8/-0)
Percona-Server/include/my_attribute.h (+8/-0)
Percona-Server/include/my_base.h (+5/-0)
Percona-Server/include/my_compare.h (+89/-0)
Percona-Server/include/my_dir.h (+14/-0)
Percona-Server/include/my_libwrap.h (+8/-0)
Percona-Server/include/my_list.h (+8/-0)
Percona-Server/include/my_md5.h (+4/-0)
Percona-Server/include/my_net.h (+4/-0)
Percona-Server/include/my_nosys.h (+8/-0)
Percona-Server/include/my_tree.h (+8/-0)
Percona-Server/include/my_trie.h.OTHER (+141/-0)
Percona-Server/include/my_user.h (+4/-0)
Percona-Server/include/my_vle.h.OTHER (+38/-0)
Percona-Server/include/my_xml.h (+4/-0)
Percona-Server/include/myisampack.h (+8/-0)
Percona-Server/include/mysql_com.h (+4/-0)
Percona-Server/include/mysql_time.h (+4/-0)
Percona-Server/include/mysql_version.h.in (+4/-0)
Percona-Server/include/queues.h (+8/-0)
Percona-Server/include/rijndael.h (+8/-0)
Percona-Server/include/sql_common.h (+5/-0)
Percona-Server/include/sslopt-case.h (+8/-0)
Percona-Server/include/sslopt-vars.h (+8/-0)
Percona-Server/include/thr_alarm.h (+8/-0)
Percona-Server/include/typelib.h (+4/-0)
Percona-Server/include/violite.h (+5/-0)
Percona-Server/include/welcome_copyright_notice.h (+4/-0)
Percona-Server/libmysql/Makefile.am.OTHER (+115/-0)
Percona-Server/libmysql/client_settings.h (+8/-0)
Percona-Server/libmysql/conf_to_src.c (+1/-1)
Percona-Server/libmysql/dll.c.OTHER (+124/-0)
Percona-Server/libmysql/errmsg.c (+4/-0)
Percona-Server/libmysql/get_password.c (+4/-0)
Percona-Server/libmysql/manager.c.OTHER (+268/-0)
Percona-Server/libmysql_r/Makefile.am.OTHER (+46/-0)
Percona-Server/libmysqld/emb_qcache.cc (+10/-0)
Percona-Server/libmysqld/embedded_priv.h (+4/-0)
Percona-Server/libmysqld/examples/CMakeLists.txt (+4/-0)
Percona-Server/libmysqld/examples/Makefile.am.OTHER (+57/-0)
Percona-Server/man/comp_err.1 (+286/-0)
Percona-Server/man/innochecksum.1 (+166/-0)
Percona-Server/man/make_win_bin_dist.1.OTHER (+194/-0)
Percona-Server/man/msql2mysql.1 (+85/-0)
Percona-Server/man/my_print_defaults.1 (+220/-0)
Percona-Server/man/myisam_ftdump.1 (+267/-0)
Percona-Server/man/myisamchk.1 (+2505/-0)
Percona-Server/man/myisamlog.1 (+244/-0)
Percona-Server/man/myisampack.1 (+857/-0)
Percona-Server/man/mysql-stress-test.pl.1 (+514/-0)
Percona-Server/man/mysql-test-run.pl.1 (+2567/-0)
Percona-Server/man/mysql.1 (+3162/-0)
Percona-Server/man/mysql.server.1 (+201/-0)
Percona-Server/man/mysql_client_test.1 (+351/-0)
Percona-Server/man/mysql_client_test_embedded.1 (+1/-0)
Percona-Server/man/mysql_config.1 (+245/-0)
Percona-Server/man/mysql_convert_table_format.1 (+241/-0)
Percona-Server/man/mysql_find_rows.1 (+176/-0)
Percona-Server/man/mysql_fix_extensions.1 (+86/-0)
Percona-Server/man/mysql_fix_privilege_tables.1.OTHER (+184/-0)
Percona-Server/man/mysql_install_db.1 (+310/-0)
Percona-Server/man/mysql_secure_installation.1 (+126/-0)
Percona-Server/man/mysql_setpermission.1 (+188/-0)
Percona-Server/man/mysql_tzinfo_to_sql.1 (+138/-0)
Percona-Server/man/mysql_upgrade.1 (+424/-0)
Percona-Server/man/mysql_waitpid.1 (+145/-0)
Percona-Server/man/mysql_zap.1 (+141/-0)
Percona-Server/man/mysqlaccess.1 (+448/-0)
Percona-Server/man/mysqladmin.1 (+1116/-0)
Percona-Server/man/mysqlbinlog.1 (+2087/-0)
Percona-Server/man/mysqlbug.1 (+87/-0)
Percona-Server/man/mysqlcheck.1 (+913/-0)
Percona-Server/man/mysqld.8 (+78/-0)
Percona-Server/man/mysqld_multi.1 (+751/-0)
Percona-Server/man/mysqld_safe.1 (+873/-0)
Percona-Server/man/mysqldump.1 (+2390/-0)
Percona-Server/man/mysqldumpslow.1 (+339/-0)
Percona-Server/man/mysqlhotcopy.1 (+539/-0)
Percona-Server/man/mysqlimport.1 (+692/-0)
Percona-Server/man/mysqlmanager.8.OTHER (+2088/-0)
Percona-Server/man/mysqlshow.1 (+527/-0)
Percona-Server/man/mysqlslap.1 (+1057/-0)
Percona-Server/man/mysqltest.1 (+931/-0)
Percona-Server/man/mysqltest_embedded.1 (+1/-0)
Percona-Server/man/ndb-common-options.1 (+715/-0)
Percona-Server/man/ndb_blob_tool.1 (+529/-0)
Percona-Server/man/ndb_config.1 (+1565/-0)
Percona-Server/man/ndb_cpcd.1 (+66/-0)
Percona-Server/man/ndb_delete_all.1 (+178/-0)
Percona-Server/man/ndb_desc.1 (+590/-0)
Percona-Server/man/ndb_drop_index.1 (+170/-0)
Percona-Server/man/ndb_drop_table.1 (+111/-0)
Percona-Server/man/ndb_error_reporter.1 (+143/-0)
Percona-Server/man/ndb_index_stat.1 (+987/-0)
Percona-Server/man/ndb_mgm.1 (+267/-0)
Percona-Server/man/ndb_mgmd.8 (+1436/-0)
Percona-Server/man/ndb_print_backup_file.1 (+90/-0)
Percona-Server/man/ndb_print_schema_file.1 (+90/-0)
Percona-Server/man/ndb_print_sys_file.1 (+93/-0)
Percona-Server/man/ndb_restore.1 (+2321/-0)
Percona-Server/man/ndb_select_all.1 (+610/-0)
Percona-Server/man/ndb_select_count.1 (+147/-0)
Percona-Server/man/ndb_show_tables.1 (+323/-0)
Percona-Server/man/ndb_size.pl.1 (+461/-0)
Percona-Server/man/ndb_waiter.1 (+501/-0)
Percona-Server/man/ndbd.8 (+1258/-0)
Percona-Server/man/ndbd_redo_log_reader.1 (+222/-0)
Percona-Server/man/ndbinfo_select_all.1 (+306/-0)
Percona-Server/man/ndbmtd.8 (+225/-0)
Percona-Server/man/perror.1 (+206/-0)
Percona-Server/man/replace.1 (+185/-0)
Percona-Server/man/resolve_stack_dump.1 (+145/-0)
Percona-Server/man/resolveip.1 (+124/-0)
Percona-Server/mysql-test/Makefile.am.OTHER (+146/-0)
Percona-Server/mysql-test/include/default_my.cnf (+1/-1)
Percona-Server/mysql-test/include/default_mysqld.cnf (+4/-0)
Percona-Server/mysql-test/include/have_valgrind.inc (+11/-0)
Percona-Server/mysql-test/lib/My/Find.pm (+1/-1)
Percona-Server/mysql-test/lib/My/SafeProcess/CMakeLists.txt (+4/-0)
Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc (+4/-0)
Percona-Server/mysql-test/lib/mtr_cases.pm (+1/-1)
Percona-Server/mysql-test/lib/mtr_match.pm (+1/-1)
Percona-Server/mysql-test/lib/v1/mysql-test-run.pl (+6/-1)
Percona-Server/mysql-test/mysql-test-run.pl (+8/-0)
Percona-Server/mysql-test/purify.supp (+5/-0)
Percona-Server/mysql-test/r/cast.result (+21/-0)
Percona-Server/mysql-test/r/mysqldump.result (+62/-0)
Percona-Server/mysql-test/r/partition_error.result (+16/-0)
Percona-Server/mysql-test/r/percona_server_variables_debug.result (+6/-0)
Percona-Server/mysql-test/suite/binlog/t/binlog_killed_simulate.test (+21/-0)
Percona-Server/mysql-test/suite/binlog/t/binlog_percona_fake_changes.test (+109/-0)
Percona-Server/mysql-test/suite/funcs_1/r/is_columns_mysql.result (+216/-0)
Percona-Server/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result (+216/-0)
Percona-Server/mysql-test/suite/innodb/t/innodb_bug12400341.test (+107/-0)
Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug-master.opt (+4/-0)
Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug.test (+5/-0)
Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug12400341.test.OTHER (+107/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_until.result (+19/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_row_until.test (+54/-1)
Percona-Server/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result (+6/-4)
Percona-Server/mysql-test/suite/sys_vars/t/disabled.def (+22/-0)
Percona-Server/mysql-test/suite/sys_vars/t/innodb_buffer_pool_evict_basic.test (+13/-0)
Percona-Server/mysql-test/suite/sys_vars/t/rpl_init_slave_func.test (+6/-4)
Percona-Server/mysql-test/t/func_str.test (+8/-2)
Percona-Server/mysql-test/t/partition_error.test (+20/-0)
Percona-Server/mysys/array.c (+6/-0)
Percona-Server/mysys/charset-def.c (+4/-0)
Percona-Server/mysys/checksum.c (+8/-0)
Percona-Server/mysys/default_modify.c.OTHER (+252/-0)
Percona-Server/mysys/errors.c (+5/-0)
Percona-Server/mysys/list.c (+8/-0)
Percona-Server/mysys/make-conf.c.OTHER (+71/-0)
Percona-Server/mysys/md5.c (+1/-1)
Percona-Server/mysys/mf_brkhant.c.OTHER (+72/-0)
Percona-Server/mysys/mf_cache.c (+8/-0)
Percona-Server/mysys/mf_dirname.c (+8/-0)
Percona-Server/mysys/mf_fn_ext.c (+8/-0)
Percona-Server/mysys/mf_format.c (+6/-0)
Percona-Server/mysys/mf_getdate.c (+5/-0)
Percona-Server/mysys/mf_iocache2.c (+5/-0)
Percona-Server/mysys/mf_keycaches.c (+8/-0)
Percona-Server/mysys/mf_path.c (+8/-0)
Percona-Server/mysys/mf_qsort.c (+1/-1)
Percona-Server/mysys/mf_radix.c (+1/-1)
Percona-Server/mysys/mf_same.c (+1/-1)
Percona-Server/mysys/mf_sort.c (+8/-0)
Percona-Server/mysys/mf_soundex.c (+1/-1)
Percona-Server/mysys/mf_tempfile.c (+8/-0)
Percona-Server/mysys/mf_unixpath.c (+8/-0)
Percona-Server/mysys/mf_util.c.OTHER (+47/-0)
Percona-Server/mysys/mf_wcomp.c (+1/-1)
Percona-Server/mysys/mulalloc.c (+1/-1)
Percona-Server/mysys/my_access.c (+1/-1)
Percona-Server/mysys/my_aes.c (+1/-1)
Percona-Server/mysys/my_append.c.OTHER (+64/-0)
Percona-Server/mysys/my_bit.c (+8/-0)
Percona-Server/mysys/my_chsize.c (+8/-0)
Percona-Server/mysys/my_clock.c.OTHER (+32/-0)
Percona-Server/mysys/my_compare.c (+469/-0)
Percona-Server/mysys/my_compress.c (+8/-0)
Percona-Server/mysys/my_conio.c (+1/-1)
Percona-Server/mysys/my_crc32.c (+1/-1)
Percona-Server/mysys/my_create.c (+8/-0)
Percona-Server/mysys/my_delete.c (+8/-0)
Percona-Server/mysys/my_div.c (+1/-1)
Percona-Server/mysys/my_dup.c.OTHER (+37/-0)
Percona-Server/mysys/my_error.c (+5/-0)
Percona-Server/mysys/my_fopen.c (+1/-1)
Percona-Server/mysys/my_getpagesize.c (+1/-1)
Percona-Server/mysys/my_handler_errors.h (+4/-0)
Percona-Server/mysys/my_init.c (+5/-0)
Percona-Server/mysys/my_largepage.c (+6/-0)
Percona-Server/mysys/my_libwrap.c (+1/-1)
Percona-Server/mysys/my_lock.c (+8/-0)
Percona-Server/mysys/my_lockmem.c (+8/-0)
Percona-Server/mysys/my_memmem.c (+1/-1)
Percona-Server/mysys/my_mess.c (+8/-0)
Percona-Server/mysys/my_mkdir.c (+1/-1)
Percona-Server/mysys/my_mmap.c (+8/-0)
Percona-Server/mysys/my_net.c.OTHER (+140/-0)
Percona-Server/mysys/my_netware.c.OTHER (+150/-0)
Percona-Server/mysys/my_new.cc (+5/-0)
Percona-Server/mysys/my_once.c (+8/-0)
Percona-Server/mysys/my_open.c (+8/-0)
Percona-Server/mysys/my_pthread.c (+8/-0)
Percona-Server/mysys/my_quick.c (+8/-0)
Percona-Server/mysys/my_read.c (+28/-1)
Percona-Server/mysys/my_realloc.c.OTHER (+75/-0)
Percona-Server/mysys/my_rename.c (+8/-0)
Percona-Server/mysys/my_sleep.c (+8/-0)
Percona-Server/mysys/my_static.h (+8/-0)
Percona-Server/mysys/my_symlink2.c (+1/-1)
Percona-Server/mysys/my_vle.c.OTHER (+109/-0)
Percona-Server/mysys/my_windac.c (+8/-0)
Percona-Server/mysys/my_winthread.c (+6/-0)
Percona-Server/mysys/my_write.c (+5/-0)
Percona-Server/mysys/mysys_priv.h (+8/-0)
Percona-Server/mysys/ptr_cmp.c (+8/-0)
Percona-Server/mysys/queues.c (+8/-0)
Percona-Server/mysys/rijndael.c (+8/-0)
Percona-Server/mysys/stacktrace.c (+1/-1)
Percona-Server/mysys/test_charset.c (+8/-0)
Percona-Server/mysys/test_dir.c (+1/-1)
Percona-Server/mysys/test_fn.c.OTHER (+69/-0)
Percona-Server/mysys/test_xml.c (+1/-1)
Percona-Server/mysys/testhash.c (+8/-0)
Percona-Server/mysys/thr_alarm.c (+11/-0)
Percona-Server/mysys/thr_rwlock.c (+8/-0)
Percona-Server/mysys/tree.c (+8/-0)
Percona-Server/mysys/trie.c.OTHER (+236/-0)
Percona-Server/netware/Makefile.am.OTHER (+121/-0)
Percona-Server/netware/libmysqlmain.c.OTHER (+39/-0)
Percona-Server/netware/my_manage.c.OTHER (+477/-0)
Percona-Server/netware/my_manage.h.OTHER (+118/-0)
Percona-Server/netware/mysql_fix_privilege_tables.pl.OTHER (+227/-0)
Percona-Server/netware/mysql_install_db.c.OTHER (+447/-0)
Percona-Server/netware/mysql_secure_installation.pl.OTHER (+218/-0)
Percona-Server/netware/mysql_test_run.c.OTHER (+1422/-0)
Percona-Server/netware/mysqld_safe.c.OTHER (+751/-0)
Percona-Server/plugin/daemon_example/daemon_example.cc (+4/-0)
Percona-Server/plugin/fulltext/Makefile.am.OTHER (+27/-0)
Percona-Server/regex/Makefile.am.OTHER (+36/-0)
Percona-Server/scripts/CMakeLists.txt (+4/-0)
Percona-Server/scripts/comp_sql.c (+1/-1)
Percona-Server/scripts/fill_help_tables.sql (+4/-0)
Percona-Server/scripts/make_binary_distribution.sh.OTHER (+536/-0)
Percona-Server/scripts/mysql_fix_privilege_tables.sh.OTHER (+223/-0)
Percona-Server/scripts/mysql_install_db.pl.in (+1/-1)
Percona-Server/scripts/mysql_system_tables.sql (+12/-0)
Percona-Server/scripts/mysql_system_tables_data.sql (+11/-0)
Percona-Server/scripts/mysqlbug.sh (+1/-1)
Percona-Server/scripts/mysqld_multi.sh (+1/-1)
Percona-Server/server-tools/CMakeLists.txt.OTHER (+33/-0)
Percona-Server/server-tools/instance-manager/CMakeLists.txt.OTHER (+38/-0)
Percona-Server/server-tools/instance-manager/IMService.cpp.OTHER (+124/-0)
Percona-Server/server-tools/instance-manager/IMService.h.OTHER (+32/-0)
Percona-Server/server-tools/instance-manager/Makefile.am.OTHER (+103/-0)
Percona-Server/server-tools/instance-manager/WindowsService.cpp.OTHER (+231/-0)
Percona-Server/server-tools/instance-manager/WindowsService.h.OTHER (+56/-0)
Percona-Server/server-tools/instance-manager/angel.cc.OTHER (+407/-0)
Percona-Server/server-tools/instance-manager/angel.h.OTHER (+34/-0)
Percona-Server/server-tools/instance-manager/buffer.h.OTHER (+65/-0)
Percona-Server/server-tools/instance-manager/command.cc.OTHER (+30/-0)
Percona-Server/server-tools/instance-manager/command.h.OTHER (+60/-0)
Percona-Server/server-tools/instance-manager/commands.h.OTHER (+393/-0)
Percona-Server/server-tools/instance-manager/exit_codes.h.OTHER (+40/-0)
Percona-Server/server-tools/instance-manager/guardian.cc.OTHER (+496/-0)
Percona-Server/server-tools/instance-manager/guardian.h.OTHER (+110/-0)
Percona-Server/server-tools/instance-manager/instance.h.OTHER (+273/-0)
Percona-Server/server-tools/instance-manager/instance_map.h.OTHER (+102/-0)
Percona-Server/server-tools/instance-manager/instance_options.h.OTHER (+126/-0)
Percona-Server/server-tools/instance-manager/listener.h.OTHER (+61/-0)
Percona-Server/server-tools/instance-manager/log.cc.OTHER (+196/-0)
Percona-Server/server-tools/instance-manager/log.h.OTHER (+59/-0)
Percona-Server/server-tools/instance-manager/manager.cc.OTHER (+526/-0)
Percona-Server/server-tools/instance-manager/manager.h.OTHER (+71/-0)
Percona-Server/server-tools/instance-manager/messages.cc.OTHER (+104/-0)
Percona-Server/server-tools/instance-manager/messages.h.OTHER (+23/-0)
Percona-Server/server-tools/instance-manager/mysql_connection.h.OTHER (+74/-0)
Percona-Server/server-tools/instance-manager/mysql_manager_error.h.OTHER (+40/-0)
Percona-Server/server-tools/instance-manager/mysqlmanager.cc.OTHER (+232/-0)
Percona-Server/server-tools/instance-manager/parse_output.h.OTHER (+33/-0)
Percona-Server/server-tools/instance-manager/portability.h.OTHER (+65/-0)
Percona-Server/server-tools/instance-manager/priv.cc.OTHER (+76/-0)
Percona-Server/server-tools/instance-manager/priv.h.OTHER (+99/-0)
Percona-Server/server-tools/instance-manager/protocol.h.OTHER (+47/-0)
Percona-Server/server-tools/instance-manager/thread_registry.cc.OTHER (+419/-0)
Percona-Server/server-tools/instance-manager/thread_registry.h.OTHER (+176/-0)
Percona-Server/server-tools/instance-manager/user_management_commands.h.OTHER (+167/-0)
Percona-Server/server-tools/instance-manager/user_map.h.OTHER (+103/-0)
Percona-Server/sql-bench/Makefile.am.OTHER (+86/-0)
Percona-Server/sql-common/Makefile.am.OTHER (+20/-0)
Percona-Server/sql-common/pack.c (+1/-1)
Percona-Server/sql/Makefile.am.OTHER (+198/-0)
Percona-Server/sql/custom_conf.h (+1/-1)
Percona-Server/sql/des_key_file.cc (+8/-0)
Percona-Server/sql/discover.cc (+8/-0)
Percona-Server/sql/event_data_objects.h (+8/-0)
Percona-Server/sql/event_db_repository.h (+4/-0)
Percona-Server/sql/event_queue.cc (+8/-0)
Percona-Server/sql/event_queue.h (+8/-0)
Percona-Server/sql/event_scheduler.cc (+5/-0)
Percona-Server/sql/event_scheduler.h (+8/-0)
Percona-Server/sql/events.h (+8/-0)
Percona-Server/sql/field.cc (+4/-0)
Percona-Server/sql/field.h (+4/-0)
Percona-Server/sql/field_conv.cc (+5/-0)
Percona-Server/sql/frm_crypt.cc (+8/-0)
Percona-Server/sql/gstream.cc (+6/-0)
Percona-Server/sql/gstream.h (+9/-0)
Percona-Server/sql/ha_ndbcluster.h (+8/-0)
Percona-Server/sql/ha_ndbcluster_binlog.cc (+4/-0)
Percona-Server/sql/ha_ndbcluster_binlog.h (+8/-0)
Percona-Server/sql/ha_ndbcluster_cond.cc (+1/-1)
Percona-Server/sql/ha_ndbcluster_cond.h (+4/-0)
Percona-Server/sql/ha_ndbcluster_tables.h (+4/-0)
Percona-Server/sql/handler.cc (+35/-0)
Percona-Server/sql/hash_filo.cc (+8/-0)
Percona-Server/sql/hash_filo.h (+8/-0)
Percona-Server/sql/hostname.cc (+1/-1)
Percona-Server/sql/init.cc (+8/-0)
Percona-Server/sql/item.h (+12/-0)
Percona-Server/sql/item_cmpfunc.h (+4/-0)
Percona-Server/sql/item_func.h (+23/-0)
Percona-Server/sql/item_row.cc (+5/-0)
Percona-Server/sql/item_strfunc.cc (+1/-1)
Percona-Server/sql/item_subselect.cc (+11/-0)
Percona-Server/sql/item_sum.cc (+11/-0)
Percona-Server/sql/item_sum.h (+5/-0)
Percona-Server/sql/item_xmlfunc.cc (+5/-0)
Percona-Server/sql/item_xmlfunc.h (+8/-0)
Percona-Server/sql/lex_symbol.h (+1/-1)
Percona-Server/sql/log.cc (+4/-0)
Percona-Server/sql/log_event.cc (+27/-1)
Percona-Server/sql/log_event.h (+11/-0)
Percona-Server/sql/log_event_old.h (+1/-1)
Percona-Server/sql/mem_root_array.h (+1/-1)
Percona-Server/sql/mf_iocache.cc (+8/-0)
Percona-Server/sql/my_decimal.h (+30/-0)
Percona-Server/sql/my_lock.c.OTHER (+78/-0)
Percona-Server/sql/mysqld.cc (+1/-1)
Percona-Server/sql/mysqld_suffix.h (+8/-0)
Percona-Server/sql/opt_range.cc (+4/-0)
Percona-Server/sql/partition_element.h (+4/-0)
Percona-Server/sql/procedure.cc (+8/-0)
Percona-Server/sql/procedure.h (+8/-0)
Percona-Server/sql/records.cc (+5/-0)
Percona-Server/sql/repl_failsafe.h (+8/-0)
Percona-Server/sql/rpl_filter.h (+8/-0)
Percona-Server/sql/rpl_injector.h (+4/-0)
Percona-Server/sql/rpl_record_old.h (+8/-0)
Percona-Server/sql/rpl_rli.cc (+5/-0)
Percona-Server/sql/rpl_rli.h (+5/-0)
Percona-Server/sql/rpl_tblmap.h (+8/-0)
Percona-Server/sql/rpl_utility.cc (+5/-1)
Percona-Server/sql/rpl_utility.h (+5/-0)
Percona-Server/sql/scheduler.cc (+4/-0)
Percona-Server/sql/scheduler.h (+4/-0)
Percona-Server/sql/set_var.cc (+5/-0)
Percona-Server/sql/set_var.h (+17/-0)
Percona-Server/sql/share/charsets/Index.xml (+1/-1)
Percona-Server/sql/share/charsets/armscii8.xml (+1/-1)
Percona-Server/sql/share/charsets/ascii.xml (+1/-1)
Percona-Server/sql/share/charsets/cp1250.xml (+1/-1)
Percona-Server/sql/share/charsets/cp852.xml (+1/-1)
Percona-Server/sql/share/charsets/hebrew.xml (+1/-1)
Percona-Server/sql/share/charsets/latin1.xml (+1/-1)
Percona-Server/sql/share/charsets/latin2.xml (+1/-1)
Percona-Server/sql/share/charsets/latin5.xml (+1/-1)
Percona-Server/sql/signal_handler.cc (+1/-1)
Percona-Server/sql/slave.cc (+5/-0)
Percona-Server/sql/sp_cache.h (+8/-0)
Percona-Server/sql/sp_head.cc (+1/-1)
Percona-Server/sql/sp_head.h (+5/-0)
Percona-Server/sql/sp_rcontext.h (+8/-0)
Percona-Server/sql/spatial.h (+5/-0)
Percona-Server/sql/sql_acl.cc (+5/-12)
Percona-Server/sql/sql_analyse.cc (+1/-1)
Percona-Server/sql/sql_analyse.h (+8/-0)
Percona-Server/sql/sql_array.h (+8/-0)
Percona-Server/sql/sql_bitmap.h (+8/-0)
Percona-Server/sql/sql_cache.cc (+5/-0)
Percona-Server/sql/sql_class.cc (+10/-0)
Percona-Server/sql/sql_class.h (+28/-0)
Percona-Server/sql/sql_client.cc (+8/-0)
Percona-Server/sql/sql_cursor.h (+8/-0)
Percona-Server/sql/sql_db.cc (+9/-1)
Percona-Server/sql/sql_derived.cc (+5/-0)
Percona-Server/sql/sql_do.cc (+8/-0)
Percona-Server/sql/sql_error.h (+12/-0)
Percona-Server/sql/sql_insert.cc (+4/-0)
Percona-Server/sql/sql_lex.cc (+4/-0)
Percona-Server/sql/sql_lex.h (+5/-0)
Percona-Server/sql/sql_list.cc (+8/-0)
Percona-Server/sql/sql_load.cc (+1/-1)
Percona-Server/sql/sql_map.cc.OTHER (+140/-0)
Percona-Server/sql/sql_map.h.OTHER (+62/-0)
Percona-Server/sql/sql_parse.cc (+120/-0)
Percona-Server/sql/sql_partition.cc (+30/-0)
Percona-Server/sql/sql_priv.h (+121/-2)
Percona-Server/sql/sql_profile.h (+5/-0)
Percona-Server/sql/sql_repl.cc (+20/-0)
Percona-Server/sql/sql_repl.h (+8/-0)
Percona-Server/sql/sql_select.cc (+24/-0)
Percona-Server/sql/sql_select.h (+4/-0)
Percona-Server/sql/sql_servers.h (+4/-0)
Percona-Server/sql/sql_show.cc (+43/-3)
Percona-Server/sql/sql_show.h (+5/-0)
Percona-Server/sql/sql_sort.h (+8/-0)
Percona-Server/sql/sql_string.cc (+5/-0)
Percona-Server/sql/sql_string.h (+5/-0)
Percona-Server/sql/sql_trigger.cc (+1/-1)
Percona-Server/sql/sql_udf.h (+8/-0)
Percona-Server/sql/sql_update.cc (+4/-0)
Percona-Server/sql/sql_view.cc (+1/-1)
Percona-Server/sql/table.cc (+1/-1)
Percona-Server/sql/table.h (+9/-0)
Percona-Server/sql/tzfile.h (+8/-0)
Percona-Server/sql/tztime.cc (+5/-0)
Percona-Server/storage/archive/archive_test.c (+1/-1)
Percona-Server/storage/archive/ha_archive.h (+8/-0)
Percona-Server/storage/federated/ha_federated.cc (+37/-1)
Percona-Server/storage/heap/Makefile.am.OTHER (+55/-0)
Percona-Server/storage/heap/_check.c (+1/-1)
Percona-Server/storage/heap/_rectest.c (+1/-1)
Percona-Server/storage/heap/heapdef.h (+8/-0)
Percona-Server/storage/heap/hp_block.c (+8/-0)
Percona-Server/storage/heap/hp_clear.c (+8/-0)
Percona-Server/storage/heap/hp_close.c (+8/-0)
Percona-Server/storage/heap/hp_create.c (+4/-0)
Percona-Server/storage/heap/hp_delete.c (+1/-1)
Percona-Server/storage/heap/hp_extra.c (+1/-1)
Percona-Server/storage/heap/hp_open.c (+8/-0)
Percona-Server/storage/heap/hp_panic.c (+8/-0)
Percona-Server/storage/heap/hp_rename.c (+8/-0)
Percona-Server/storage/heap/hp_rfirst.c (+1/-1)
Percona-Server/storage/heap/hp_rkey.c (+8/-0)
Percona-Server/storage/heap/hp_rlast.c (+1/-1)
Percona-Server/storage/heap/hp_rnext.c (+1/-1)
Percona-Server/storage/heap/hp_rprev.c (+1/-1)
Percona-Server/storage/heap/hp_rrnd.c (+1/-1)
Percona-Server/storage/heap/hp_rsame.c (+1/-1)
Percona-Server/storage/heap/hp_scan.c (+1/-1)
Percona-Server/storage/heap/hp_static.c (+8/-0)
Percona-Server/storage/heap/hp_test1.c (+8/-0)
Percona-Server/storage/heap/hp_update.c (+1/-1)
Percona-Server/storage/innobase.moved/btr/btr0cur.c (+12/-6)
Percona-Server/storage/innobase.moved/btr/btr0pcur.c (+5/-0)
Percona-Server/storage/innobase.moved/btr/btr0sea.c (+5/-0)
Percona-Server/storage/innobase.moved/buf/buf0buddy.c (+5/-0)
Percona-Server/storage/innobase.moved/buf/buf0buf.c (+95/-11)
Percona-Server/storage/innobase.moved/buf/buf0flu.c (+209/-8)
Percona-Server/storage/innobase.moved/buf/buf0lru.c (+26/-5)
Percona-Server/storage/innobase.moved/buf/buf0rea.c (+5/-0)
Percona-Server/storage/innobase.moved/dict/dict0crea.c (+1/-0)
Percona-Server/storage/innobase.moved/dict/dict0dict.c (+5/-0)
Percona-Server/storage/innobase.moved/dyn/dyn0dyn.c (+5/-0)
Percona-Server/storage/innobase.moved/fil/fil0fil.c (+5/-0)
Percona-Server/storage/innobase.moved/handler/ha_innodb.cc (+269/-14)
Percona-Server/storage/innobase.moved/handler/i_s.cc (+1722/-0)
Percona-Server/storage/innobase.moved/handler/mysql_addons.cc.OTHER (+42/-0)
Percona-Server/storage/innobase.moved/ibuf/ibuf0ibuf.c (+12/-0)
Percona-Server/storage/innobase.moved/include/buf0buf.h (+4/-4)
Percona-Server/storage/innobase.moved/include/buf0flu.h (+8/-0)
Percona-Server/storage/innobase.moved/include/buf0lru.h (+14/-1)
Percona-Server/storage/innobase.moved/include/db0err.h (+5/-0)
Percona-Server/storage/innobase.moved/include/dict0types.h (+6/-0)
Percona-Server/storage/innobase.moved/include/dyn0dyn.h (+5/-0)
Percona-Server/storage/innobase.moved/include/dyn0dyn.ic (+5/-0)
Percona-Server/storage/innobase.moved/include/fsp0fsp.ic (+5/-0)
Percona-Server/storage/innobase.moved/include/fsp0types.h.OTHER (+110/-0)
Percona-Server/storage/innobase.moved/include/ha_prototypes.h (+34/-0)
Percona-Server/storage/innobase.moved/include/mysql_addons.h.OTHER (+33/-0)
Percona-Server/storage/innobase.moved/include/srv0que.h.OTHER (+42/-0)
Percona-Server/storage/innobase.moved/include/sync0sync.h (+5/-0)
Percona-Server/storage/innobase.moved/include/thr0loc.h.OTHER (+101/-0)
Percona-Server/storage/innobase.moved/include/thr0loc.ic.OTHER (+24/-0)
Percona-Server/storage/innobase.moved/include/ut0rbt.h.OTHER (+332/-0)
Percona-Server/storage/innobase.moved/mach/mach0data.c (+5/-0)
Percona-Server/storage/innobase.moved/pars/lexyy.c (+5/-0)
Percona-Server/storage/innobase.moved/pars/make_bison.sh (+5/-0)
Percona-Server/storage/innobase.moved/pars/make_flex.sh (+5/-0)
Percona-Server/storage/innobase.moved/pars/pars0grm.c (+5/-0)
Percona-Server/storage/innobase.moved/pars/pars0grm.y (+5/-0)
Percona-Server/storage/innobase.moved/pars/pars0lex.l (+5/-0)
Percona-Server/storage/innobase.moved/pars/pars0opt.c (+5/-0)
Percona-Server/storage/innobase.moved/pars/pars0pars.c (+5/-0)
Percona-Server/storage/innobase.moved/pars/pars0sym.c (+5/-0)
Percona-Server/storage/innobase.moved/que/que0que.c (+5/-0)
Percona-Server/storage/innobase.moved/read/read0read.c (+5/-0)
Percona-Server/storage/innobase.moved/row/row0merge.c (+29/-0)
Percona-Server/storage/innobase.moved/row/row0mysql.c (+43/-2)
Percona-Server/storage/innobase.moved/row/row0sel.c (+14/-3)
Percona-Server/storage/innobase.moved/row/row0uins.c (+8/-7)
Percona-Server/storage/innobase.moved/row/row0umod.c (+45/-4)
Percona-Server/storage/innobase.moved/srv/srv0que.c.OTHER (+49/-0)
Percona-Server/storage/innobase.moved/srv/srv0srv.c (+111/-2)
Percona-Server/storage/innobase.moved/sync/sync0arr.c (+5/-0)
Percona-Server/storage/innobase.moved/sync/sync0rw.c (+5/-0)
Percona-Server/storage/innobase.moved/sync/sync0sync.c (+5/-0)
Percona-Server/storage/innobase.moved/ut/ut0auxconf_atomic_pthread_t_gcc.c.OTHER (+43/-0)
Percona-Server/storage/innobase.moved/ut/ut0auxconf_atomic_pthread_t_solaris.c.OTHER (+54/-0)
Percona-Server/storage/innobase.moved/ut/ut0auxconf_have_gcc_atomics.c.OTHER (+61/-0)
Percona-Server/storage/innobase.moved/ut/ut0auxconf_have_solaris_atomics.c.OTHER (+39/-0)
Percona-Server/storage/innobase.moved/ut/ut0auxconf_pause.c.OTHER (+32/-0)
Percona-Server/storage/innobase.moved/ut/ut0auxconf_sizeof_pthread_t.c.OTHER (+35/-0)
Percona-Server/storage/innobase.moved/ut/ut0rbt.c.OTHER (+1273/-0)
Percona-Server/storage/innobase.moved/ut/ut0ut.c (+5/-0)
Percona-Server/storage/innobase/Makefile.am.OTHER (+175/-0)
Percona-Server/storage/innobase/dict/dict0crea.c (+1495/-0)
Percona-Server/storage/innobase/dict/dict0dict.c (+4382/-0)
Percona-Server/storage/innobase/handler/ha_innodb.cc (+9444/-0)
Percona-Server/storage/innobase/handler/ha_innodb.h (+263/-0)
Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c (+3733/-0)
Percona-Server/storage/innobase/include/db0err.h (+97/-0)
Percona-Server/storage/innobase/include/dict0mem.h (+480/-0)
Percona-Server/storage/innobase/include/dict0types.h (+25/-0)
Percona-Server/storage/innobase/include/fsp0types.h (+89/-0)
Percona-Server/storage/innobase/include/ha_prototypes.h (+110/-0)
Percona-Server/storage/innobase/include/pars0grm.h (+233/-0)
Percona-Server/storage/innobase/log/log0recv.c (+3400/-0)
Percona-Server/storage/innobase/pars/pars0grm.c (+2570/-0)
Percona-Server/storage/innobase/pars/pars0grm.h.OTHER (+233/-0)
Percona-Server/storage/innobase/row/row0mysql.c (+4322/-0)
Percona-Server/storage/innobase/row/row0sel.c (+4800/-0)
Percona-Server/storage/innobase/row/row0umod.c (+745/-0)
Percona-Server/storage/innobase/srv/srv0srv.c (+2827/-0)
Percona-Server/storage/innobase/sync/sync0arr.c (+1056/-0)
Percona-Server/storage/innodb_plugin/CMakeLists.txt.OTHER (+88/-0)
Percona-Server/storage/innodb_plugin/COPYING.OTHER (+351/-0)
Percona-Server/storage/innodb_plugin/ChangeLog.OTHER (+2540/-0)
Percona-Server/storage/innodb_plugin/Makefile.am.OTHER (+346/-0)
Percona-Server/storage/innodb_plugin/compile-innodb-debug.OTHER (+24/-0)
Percona-Server/storage/innodb_plugin/plug.in.OTHER (+270/-0)
Percona-Server/storage/innodb_plugin/setup.sh.OTHER (+47/-0)
Percona-Server/storage/innodb_plugin/thr/thr0loc.c.OTHER (+330/-0)
Percona-Server/storage/myisam/Makefile.am.OTHER (+154/-0)
Percona-Server/storage/myisam/ft_boolean_search.c (+5/-0)
Percona-Server/storage/myisam/ft_eval.c.OTHER (+252/-0)
Percona-Server/storage/myisam/ft_eval.h.OTHER (+41/-0)
Percona-Server/storage/myisam/ft_nlq_search.c (+5/-0)
Percona-Server/storage/myisam/ft_static.c (+8/-0)
Percona-Server/storage/myisam/ft_stem.c.OTHER (+18/-0)
Percona-Server/storage/myisam/ft_test1.c.OTHER (+315/-0)
Percona-Server/storage/myisam/ft_test1.h.OTHER (+420/-0)
Percona-Server/storage/myisam/ft_update.c (+8/-0)
Percona-Server/storage/myisam/ftbench/Ecompare.pl (+1/-1)
Percona-Server/storage/myisam/ftbench/Ecreate.pl (+1/-1)
Percona-Server/storage/myisam/ftbench/Ereport.pl (+1/-1)
Percona-Server/storage/myisam/ftbench/ft-test-run.sh (+6/-1)
Percona-Server/storage/myisam/mi_cache.c (+8/-0)
Percona-Server/storage/myisam/mi_changed.c (+8/-0)
Percona-Server/storage/myisam/mi_checksum.c (+1/-1)
Percona-Server/storage/myisam/mi_info.c (+8/-0)
Percona-Server/storage/myisam/mi_key.c (+8/-0)
Percona-Server/storage/myisam/mi_keycache.c (+8/-0)
Percona-Server/storage/myisam/mi_log.c (+8/-0)
Percona-Server/storage/myisam/mi_panic.c (+8/-0)
Percona-Server/storage/myisam/mi_rename.c (+8/-0)
Percona-Server/storage/myisam/mi_rfirst.c (+1/-1)
Percona-Server/storage/myisam/mi_rkey.c (+8/-0)
Percona-Server/storage/myisam/mi_rlast.c (+1/-1)
Percona-Server/storage/myisam/mi_rnext_same.c (+8/-0)
Percona-Server/storage/myisam/mi_rprev.c (+8/-0)
Percona-Server/storage/myisam/mi_rrnd.c (+1/-1)
Percona-Server/storage/myisam/mi_rsame.c (+8/-0)
Percona-Server/storage/myisam/mi_rsamepos.c (+1/-1)
Percona-Server/storage/myisam/mi_scan.c (+1/-1)
Percona-Server/storage/myisam/mi_statrec.c (+8/-0)
Percona-Server/storage/myisam/mi_test3.c (+8/-0)
Percona-Server/storage/myisam/mi_test_all.sh (+5/-0)
Percona-Server/storage/myisam/mi_write.c (+1/-1)
Percona-Server/storage/myisam/myisamchk.c (+5/-0)
Percona-Server/storage/myisam/rt_index.h (+1/-1)
Percona-Server/storage/myisam/rt_key.c (+1/-1)
Percona-Server/storage/myisam/rt_key.h (+1/-1)
Percona-Server/storage/myisam/rt_mbr.c (+1/-1)
Percona-Server/storage/myisam/rt_mbr.h (+1/-1)
Percona-Server/storage/myisam/rt_test.c (+8/-0)
Percona-Server/storage/myisam/sp_defs.h (+1/-1)
Percona-Server/storage/myisam/sp_key.c (+8/-0)
Percona-Server/storage/myisam/sp_test.c (+4/-0)
Percona-Server/storage/myisammrg/Makefile.am.OTHER (+44/-0)
Percona-Server/storage/myisammrg/myrg_close.c (+8/-0)
Percona-Server/storage/myisammrg/myrg_def.h (+8/-0)
Percona-Server/storage/myisammrg/myrg_delete.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_extra.c (+8/-0)
Percona-Server/storage/myisammrg/myrg_locking.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_panic.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_queue.c (+8/-0)
Percona-Server/storage/myisammrg/myrg_range.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_rfirst.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_rlast.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_rnext.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_rnext_same.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_rprev.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_rrnd.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_rsame.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_static.c (+8/-0)
Percona-Server/storage/myisammrg/myrg_update.c (+1/-1)
Percona-Server/storage/myisammrg/myrg_write.c (+1/-1)
Percona-Server/storage/ndb/config/make-win-dsw.sh (+1/-1)
Percona-Server/storage/ndb/config/type_mgmapiclient.mk.am (+1/-1)
Percona-Server/storage/ndb/config/type_ndbapiclient.mk.am (+1/-1)
Percona-Server/storage/ndb/config/win-includes (+1/-1)
Percona-Server/storage/ndb/config/win-libraries (+1/-1)
Percona-Server/storage/ndb/config/win-name (+1/-1)
Percona-Server/storage/ndb/config/win-sources (+1/-1)
Percona-Server/storage/ndb/docs/Makefile.am (+1/-1)
Percona-Server/storage/ndb/docs/doxygen/postdoxy.pl (+1/-1)
Percona-Server/storage/ndb/docs/doxygen/predoxy.pl (+1/-1)
Percona-Server/storage/ndb/include/Makefile.am (+1/-1)
Percona-Server/storage/ndb/include/debugger/DebuggerNames.hpp (+1/-1)
Percona-Server/storage/ndb/include/debugger/EventLogger.hpp (+1/-1)
Percona-Server/storage/ndb/include/debugger/GrepError.hpp (+1/-1)
Percona-Server/storage/ndb/include/debugger/SignalLoggerManager.hpp (+1/-1)
Percona-Server/storage/ndb/include/editline/editline.h (+1/-1)
Percona-Server/storage/ndb/include/kernel/AttributeDescriptor.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/AttributeHeader.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/AttributeList.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/BlockNumbers.h (+1/-1)
Percona-Server/storage/ndb/include/kernel/GlobalSignalNumbers.h (+1/-1)
Percona-Server/storage/ndb/include/kernel/GrepEvent.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/Interpreter.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/LogLevel.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/NodeBitmask.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/NodeInfo.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/NodeState.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/RefConvert.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/kernel_config_parameters.h (+1/-1)
Percona-Server/storage/ndb/include/kernel/kernel_types.h (+1/-1)
Percona-Server/storage/ndb/include/kernel/ndb_limits.h (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/AbortAll.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/AccFrag.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/AccLock.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/AccScan.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/AllocNodeId.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/AlterIndx.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/AlterTab.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/AlterTable.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/AlterTrig.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ApiVersion.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/AttrInfo.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/BackupImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/BackupSignalData.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/BuildIndx.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CmInit.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CntrStart.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ConfigParamId.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CopyActive.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CopyFrag.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CreateEvnt.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CreateFrag.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CreateIndx.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CreateObj.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CreateTab.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CreateTable.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/CreateTrig.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DiAddTab.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DiGetNodes.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DictLock.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DictObjOp.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DictStart.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DihAddFrag.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DihContinueB.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DihStartTab.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DisconnectRep.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DropFilegroup.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DropIndx.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DropObj.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DropTab.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DropTabFile.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DropTable.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DropTrig.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/EmptyLcp.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/EndTo.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/EventReport.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ExecFragReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/Extent.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/FailRep.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/FsAppendReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/FsCloseReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/FsConf.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/FsRef.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/GCPSave.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/GetTableId.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/GrepImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/HotSpareRep.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/KeyInfo.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/LCP.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ListTables.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/LqhFrag.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/LqhKey.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ManagementServer.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/MasterGCP.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/MasterLCP.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/NdbSttor.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/NextScan.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/NodeFailRep.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/PackedSignal.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/PrepDropTab.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ReadConfig.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/RelTabMem.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/RepImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/RestoreImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ResumeReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/RouteOrd.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ScanFrag.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/ScanTab.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/SetVarReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/SignalData.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/SrFragidConf.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/StartFragReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/StartInfo.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/StartMe.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/StartOrd.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/StartPerm.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/StartRec.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/StartTo.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/StopMe.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/StopPerm.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/StopReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/SumaImpl.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/SystemError.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TamperOrd.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TcCommit.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TcContinueB.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TcHbRep.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TcIndx.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TcKeyConf.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TestOrd.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TransIdAI.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TupCommit.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TupFrag.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TupKey.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TuxBound.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TuxContinueB.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TuxMaint.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/UpdateTo.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/UpgradeStartup.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/UtilDelete.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/UtilExecute.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/UtilLock.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/UtilPrepare.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/UtilRelease.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/UtilSequence.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/signaldata/WaitGCP.hpp (+1/-1)
Percona-Server/storage/ndb/include/kernel/trigger_definitions.h (+1/-1)
Percona-Server/storage/ndb/include/logger/ConsoleLogHandler.hpp (+1/-1)
Percona-Server/storage/ndb/include/logger/FileLogHandler.hpp (+1/-1)
Percona-Server/storage/ndb/include/logger/LogHandler.hpp (+1/-1)
Percona-Server/storage/ndb/include/logger/Logger.hpp (+1/-1)
Percona-Server/storage/ndb/include/logger/SysLogHandler.hpp (+1/-1)
Percona-Server/storage/ndb/include/mgmapi/mgmapi.h (+1/-1)
Percona-Server/storage/ndb/include/mgmapi/mgmapi_config_parameters.h (+1/-1)
Percona-Server/storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h (+1/-1)
Percona-Server/storage/ndb/include/mgmapi/mgmapi_debug.h (+1/-1)
Percona-Server/storage/ndb/include/mgmapi/mgmapi_error.h (+1/-1)
Percona-Server/storage/ndb/include/mgmapi/ndbd_exit_codes.h (+1/-1)
Percona-Server/storage/ndb/include/mgmcommon/ConfigRetriever.hpp (+1/-1)
Percona-Server/storage/ndb/include/mgmcommon/IPCConfig.hpp (+1/-1)
Percona-Server/storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndb_constants.h (+1/-1)
Percona-Server/storage/ndb/include/ndb_global.h.in (+1/-1)
Percona-Server/storage/ndb/include/ndb_init.h (+1/-1)
Percona-Server/storage/ndb/include/ndb_net.h (+1/-1)
Percona-Server/storage/ndb/include/ndb_types.h.in (+1/-1)
Percona-Server/storage/ndb/include/ndb_version.h.in (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/Ndb.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/NdbApi.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/NdbBlob.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/NdbDictionary.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/NdbError.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/NdbIndexOperation.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/NdbIndexStat.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/NdbPool.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/NdbRecAttr.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/NdbReceiver.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/NdbScanFilter.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/NdbScanOperation.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/NdbTransaction.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/ndb_cluster_connection.hpp (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/ndb_opt_defaults.h (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/ndbapi_limits.h (+1/-1)
Percona-Server/storage/ndb/include/ndbapi/ndberror.h (+1/-1)
Percona-Server/storage/ndb/include/newtonapi/dba.h (+1/-1)
Percona-Server/storage/ndb/include/newtonapi/defs/pcn_types.h (+1/-1)
Percona-Server/storage/ndb/include/portlib/NdbCondition.h (+1/-1)
Percona-Server/storage/ndb/include/portlib/NdbConfig.h (+1/-1)
Percona-Server/storage/ndb/include/portlib/NdbDaemon.h (+1/-1)
Percona-Server/storage/ndb/include/portlib/NdbEnv.h (+1/-1)
Percona-Server/storage/ndb/include/portlib/NdbHost.h (+1/-1)
Percona-Server/storage/ndb/include/portlib/NdbMain.h (+1/-1)
Percona-Server/storage/ndb/include/portlib/NdbMem.h (+1/-1)
Percona-Server/storage/ndb/include/portlib/NdbMutex.h (+1/-1)
Percona-Server/storage/ndb/include/portlib/NdbSleep.h (+1/-1)
Percona-Server/storage/ndb/include/portlib/NdbTCP.h (+1/-1)
Percona-Server/storage/ndb/include/portlib/NdbThread.h (+1/-1)
Percona-Server/storage/ndb/include/portlib/NdbTick.h (+1/-1)
Percona-Server/storage/ndb/include/portlib/PortDefs.h (+1/-1)
Percona-Server/storage/ndb/include/portlib/prefetch.h (+1/-1)
Percona-Server/storage/ndb/include/transporter/TransporterCallback.hpp (+1/-1)
Percona-Server/storage/ndb/include/transporter/TransporterDefinitions.hpp (+1/-1)
Percona-Server/storage/ndb/include/transporter/TransporterRegistry.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/BaseString.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/Bitmask.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/File.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/InputStream.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/NdbAutoPtr.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/NdbOut.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/NdbSqlUtil.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/OutputStream.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/Parser.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/Properties.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/SimpleProperties.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/SocketAuthenticator.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/SocketClient.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/SocketServer.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/UtilBuffer.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/Vector.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/basestring_vsnprintf.h (+1/-1)
Percona-Server/storage/ndb/include/util/md5_hash.hpp (+1/-1)
Percona-Server/storage/ndb/include/util/ndb_opts.h (+1/-1)
Percona-Server/storage/ndb/include/util/ndb_rand.h (+1/-1)
Percona-Server/storage/ndb/include/util/random.h (+1/-1)
Percona-Server/storage/ndb/include/util/socket_io.h (+1/-1)
Percona-Server/storage/ndb/include/util/uucode.h (+1/-1)
Percona-Server/storage/ndb/include/util/version.h (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp (+1/-1)
Percona-Server/storage/ndb/src/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/common/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/BlockNames.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/DebuggerNames.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/EventLogger.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/GrepError.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/SignalLoggerManager.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/AccLock.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/AlterTab.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/AlterTable.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/CntrStart.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/ContinueB.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/DropIndx.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/DropTab.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/DropTrig.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/FailRep.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/FsConf.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/FsRef.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/GCPSave.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/LCP.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/LqhKey.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/StartRec.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/SystemError.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/TcIndx.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/TupCommit.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/TupKey.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/UtilLock.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/debugger/signaldata/print.awk (+1/-1)
Percona-Server/storage/ndb/src/common/logger/ConsoleLogHandler.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/logger/FileLogHandler.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/logger/LogHandler.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/logger/LogHandlerList.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/logger/LogHandlerList.hpp (+1/-1)
Percona-Server/storage/ndb/src/common/logger/Logger.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/logger/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/common/logger/SysLogHandler.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp (+1/-1)
Percona-Server/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp (+1/-1)
Percona-Server/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/mgmcommon/IPCConfig.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/mgmcommon/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/NdbCondition.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/NdbConfig.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/NdbDaemon.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/NdbEnv.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/NdbHost.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/NdbMem.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/NdbPortLibTest.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/NdbSleep.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/NdbTCP.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/NdbThread.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/NdbTick.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/memtest.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/mmstest.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/munmaptest.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/win32/NdbCondition.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/win32/NdbDaemon.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/win32/NdbEnv.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/win32/NdbHost.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/win32/NdbMem.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/win32/NdbMutex.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/win32/NdbSleep.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/win32/NdbTCP.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/win32/NdbThread.c (+1/-1)
Percona-Server/storage/ndb/src/common/portlib/win32/NdbTick.c (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/Packer.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/Packer.hpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/SCI_Transporter.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/SCI_Transporter.hpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/SHM_Buffer.hpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/SHM_Transporter.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/SHM_Transporter.hpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/SendBuffer.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/SendBuffer.hpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/TCP_Transporter.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/TCP_Transporter.hpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/Transporter.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/Transporter.hpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/TransporterRegistry.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/buddy.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/buddy.hpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/BaseString.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/Bitmask.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/ConfigValues.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/File.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/InputStream.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/NdbOut.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/NdbSqlUtil.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/OutputStream.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/Parser.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/Properties.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/SimpleProperties.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/SocketAuthenticator.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/SocketClient.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/SocketServer.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/basestring_vsnprintf.c (+1/-1)
Percona-Server/storage/ndb/src/common/util/filetest/FileUnitTest.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/filetest/FileUnitTest.hpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/md5_hash.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/ndb_init.c (+1/-1)
Percona-Server/storage/ndb/src/common/util/ndb_rand.c (+1/-1)
Percona-Server/storage/ndb/src/common/util/new.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/random.c (+1/-1)
Percona-Server/storage/ndb/src/common/util/socket_io.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/strdup.c (+1/-1)
Percona-Server/storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/testProperties/testProperties.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp (+1/-1)
Percona-Server/storage/ndb/src/common/util/uucode.c (+1/-1)
Percona-Server/storage/ndb/src/common/util/version.c (+1/-1)
Percona-Server/storage/ndb/src/cw/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.rc (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/C++/TreeView.h (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/C++/resource.h (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcd/APIService.cpp (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcd/APIService.hpp (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcd/CPCD.cpp (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcd/CPCD.hpp (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcd/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcd/Monitor.cpp (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcd/Process.cpp (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcd/common.cpp (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcd/common.hpp (+1/-1)
Percona-Server/storage/ndb/src/cw/cpcd/main.cpp (+1/-1)
Percona-Server/storage/ndb/src/cw/test/socketclient/socketClientTest.cpp (+1/-1)
Percona-Server/storage/ndb/src/cw/util/ClientInterface.cpp (+1/-1)
Percona-Server/storage/ndb/src/cw/util/ClientInterface.hpp (+1/-1)
Percona-Server/storage/ndb/src/cw/util/SocketRegistry.cpp (+1/-1)
Percona-Server/storage/ndb/src/cw/util/SocketRegistry.hpp (+1/-1)
Percona-Server/storage/ndb/src/cw/util/SocketService.cpp (+1/-1)
Percona-Server/storage/ndb/src/cw/util/SocketService.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/SimBlockList.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/backup/Backup.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/backup/Backup.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/backup/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/backup/read.cpp (+5/-0)
Percona-Server/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbdict/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbdih/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dblqh/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/diskpage.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/diskpage.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/lgman.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/mutexes.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/pgman.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/pgman.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/print_file.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/qmgr/timer.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/record_types.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/restore.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/restore.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/suma/Suma.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/trix/Trix.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/trix/Trix.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/tsman.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/blocks/tsman.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/error/ErrorReporter.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/error/ErrorReporter.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/error/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/kernel/error/TimeModule.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/error/TimeModule.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/error/ndbd_exit_codes.c (+1/-1)
Percona-Server/storage/ndb/src/kernel/main.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/Array.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/ArrayPool.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/CArray.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/Callback.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/Configuration.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/Configuration.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/DLCFifoList.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/DLCHashTable.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/DLFifoList.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/DLHashTable.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/DLHashTable2.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/DLList.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/DataBuffer.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/DynArr256.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/DynArr256.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/Emulator.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/Emulator.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/FastScheduler.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/FastScheduler.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/GlobalData.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/KeyDescriptor.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/KeyTable.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/KeyTable2.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/KeyTable2Ref.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/LinearPool.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/LongSignal.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/Mutex.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/Mutex.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/NdbdSuperPool.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/Pool.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/Pool.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/Prio.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/RWPool.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/RWPool.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/RequestTracker.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/Rope.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/Rope.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SLFifoList.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SLList.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SafeCounter.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SafeCounter.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SectionReader.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SectionReader.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SignalCounter.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SimBlockList.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SimulatedBlock.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SimulatedBlock.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SuperPool.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/SuperPool.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/ThreadConfig.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/ThreadConfig.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/TimeQueue.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/TimeQueue.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/TransporterCallback.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/VMSignal.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/VMSignal.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/WOPool.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/WOPool.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/WaitQueue.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/WatchDog.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/WatchDog.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/al_test/main.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/bench_pool.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/ndbd_malloc.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/ndbd_malloc.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/pc.hpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/testCopy/rr.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/testCopy/testCopy.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp (+1/-1)
Percona-Server/storage/ndb/src/kernel/vm/testSuperPool.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmapi/LocalConfig.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmapi/LocalConfig.hpp (+1/-1)
Percona-Server/storage/ndb/src/mgmapi/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/mgmapi/mgmapi.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmapi/mgmapi_configuration.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmapi/mgmapi_configuration.hpp (+1/-1)
Percona-Server/storage/ndb/src/mgmapi/mgmapi_internal.h (+1/-1)
Percona-Server/storage/ndb/src/mgmapi/ndb_logevent.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmapi/ndb_logevent.hpp (+1/-1)
Percona-Server/storage/ndb/src/mgmapi/test/keso.c (+1/-1)
Percona-Server/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmclient/CommandInterpreter.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmclient/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/mgmclient/main.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmclient/ndb_mgmclient.h (+1/-1)
Percona-Server/storage/ndb/src/mgmclient/ndb_mgmclient.hpp (+1/-1)
Percona-Server/storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/Config.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/Config.hpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/ConfigInfo.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/ConfigInfo.hpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/MgmtSrvr.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/MgmtSrvr.hpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/Services.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/Services.hpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/SignalQueue.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/SignalQueue.hpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/convertStrToInt.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/convertStrToInt.hpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/main.cpp (+1/-1)
Percona-Server/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/API.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/ClusterMgr.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/ClusterMgr.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/DictCache.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/Makefile.am (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/Ndb.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbApiSignal.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbApiSignal.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbBlob.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbBlobImpl.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbDictionary.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbErrorOut.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbImpl.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbIndexOperation.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbIndexStat.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbLinHash.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbOperation.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbOperationDefine.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbOperationExec.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbOperationInt.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbOperationScan.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbOperationSearch.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbPool.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbPoolImpl.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbPoolImpl.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbRecAttr.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbReceiver.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbScanFilter.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbScanOperation.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbTransaction.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbTransactionScan.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbUtil.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbUtil.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/NdbWaiter.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/Ndberr.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/Ndbif.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/Ndbinit.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/Ndblist.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/ObjectMap.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/ObjectMap.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/SignalSender.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/SignalSender.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/TransporterFacade.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/TransporterFacade.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/ndberror.c (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp (+1/-1)
Percona-Server/storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp (+1/-1)
Percona-Server/storage/ndb/test/Makefile.am (+1/-1)
Percona-Server/storage/ndb/test/include/AtrtClient.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/CpcClient.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/DbUtil.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/HugoAsynchTransactions.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/HugoCalculator.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/HugoOperations.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/HugoTransactions.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NDBT.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NDBT_DataSet.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NDBT_DataSetTransaction.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NDBT_Error.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NDBT_Output.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NDBT_ResultRow.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NDBT_ReturnCodes.h (+1/-1)
Percona-Server/storage/ndb/test/include/NDBT_Stats.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NDBT_Table.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NDBT_Tables.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NDBT_Test.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NDBT_Thread.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NdbBackup.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NdbConfig.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NdbGrep.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NdbMixRestarter.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NdbRestarter.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NdbRestarts.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NdbSchemaCon.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NdbSchemaOp.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NdbTest.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/NdbTimer.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/TestNdbEventOperation.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/UtilTransactions.hpp (+1/-1)
Percona-Server/storage/ndb/test/include/getarg.h (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/InsertRecs.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/Makefile.am (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/ScanFilter.hpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/ScanFunctions.hpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/ScanInterpretTest.hpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/TraceNdbApi.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/VerifyNdbApi.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/acid.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/acid2.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/adoInsertRecs.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/asyncGenerator.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bank/Bank.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bank/Bank.hpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bank/BankLoad.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bank/Makefile.am (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bank/bankCreator.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bank/bankTimer.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bank/testBank.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/dbGenerator.h (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/dbPopulate.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/dbPopulate.h (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/macros.h (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/mainPopulate.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/ndb_async1.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/ndb_async2.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/ndb_error.hpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/ndb_schema.hpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/testData.h (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/testDefinitions.h (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/userInterface.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bench/userInterface.h (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/benchronja.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/bulk_copy.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/cdrserver.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/celloDb.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/create_all_tabs.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/create_tab.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/drop_all_tabs.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/flexAsynch.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/flexBench.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/flexHammer.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/flexScan.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/flexTT.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/flexTimedAsynch.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/flex_bench_mysql.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/index.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/index2.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/initronja.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/interpreterInTup.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/msa.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/ndb_async1.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/ndb_async2.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/ndb_user_populate.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/ndb_user_transaction.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/ndb_user_transaction2.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/ndb_user_transaction3.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/ndb_user_transaction4.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/ndb_user_transaction5.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/ndb_user_transaction6.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/restarter.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/restarter2.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/restarts.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/size.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testBackup.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testBasic.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testBasicAsynch.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testBlobs.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testDataBuffers.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testDeadlock.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testDict.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testGrepVerify.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testIndex.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testIndexStat.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testInterpreter.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testMgm.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testNDBT.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testNdbApi.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testNodeRestart.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testOIBasic.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testOperations.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testOrderedIndex.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testPartitioning.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testReadPerf.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testRestartGci.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testSRBank.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testScan.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testScanInterpreter.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testScanPerf.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testSystemRestart.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testTimeout.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/testTransactions.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/test_event.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/test_event_merge.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/userInterface.cpp (+1/-1)
Percona-Server/storage/ndb/test/ndbnet/test.run (+6/-1)
Percona-Server/storage/ndb/test/ndbnet/testError.run (+6/-1)
Percona-Server/storage/ndb/test/ndbnet/testMNF.run (+6/-1)
Percona-Server/storage/ndb/test/ndbnet/testNR.run (+6/-1)
Percona-Server/storage/ndb/test/ndbnet/testNR1.run (+6/-1)
Percona-Server/storage/ndb/test/ndbnet/testNR4.run (+6/-1)
Percona-Server/storage/ndb/test/ndbnet/testSRhang.run (+6/-1)
Percona-Server/storage/ndb/test/ndbnet/testTR295.run (+6/-1)
Percona-Server/storage/ndb/test/newtonapi/basic_test/basic/basic.cpp (+1/-1)
Percona-Server/storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp (+1/-1)
Percona-Server/storage/ndb/test/newtonapi/basic_test/common.cpp (+1/-1)
Percona-Server/storage/ndb/test/newtonapi/basic_test/common.hpp (+1/-1)
Percona-Server/storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp (+1/-1)
Percona-Server/storage/ndb/test/newtonapi/basic_test/too_basic.cpp (+1/-1)
Percona-Server/storage/ndb/test/newtonapi/perf_test/perf.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/SQL99_test/SQL99_test.h (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLBindColTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLBindParameterTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLCancelTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLConnectTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLCopyDescTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLDescribeColTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLDisconnectTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLEndTranTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLErrorTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLExecDirectTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLExecuteTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLFetchTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLGetDataTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLGetInfoTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLParamDataTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLPrepareTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLPutDataTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLRowCountTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLTablesTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/SQLTransactTest.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/common.hpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/client/main.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/driver/testOdbcDriver.cpp (+1/-1)
Percona-Server/storage/ndb/test/odbc/test_compiler/test_compiler.cpp (+1/-1)
Percona-Server/storage/ndb/test/run-test/atrt-analyze-result.sh (+6/-1)
Percona-Server/storage/ndb/test/run-test/atrt-clear-result.sh (+6/-1)
Percona-Server/storage/ndb/test/run-test/atrt-gather-result.sh (+6/-1)
Percona-Server/storage/ndb/test/run-test/atrt-mysql-test-run (+5/-0)
Percona-Server/storage/ndb/test/run-test/atrt-setup.sh (+6/-1)
Percona-Server/storage/ndb/test/run-test/atrt-testBackup (+6/-1)
Percona-Server/storage/ndb/test/run-test/atrt.hpp (+5/-0)
Percona-Server/storage/ndb/test/run-test/daily-devel-tests.txt (+1/-1)
Percona-Server/storage/ndb/test/run-test/main.cpp (+1/-1)
Percona-Server/storage/ndb/test/run-test/make-config.sh (+5/-0)
Percona-Server/storage/ndb/test/run-test/make-html-reports.sh (+5/-0)
Percona-Server/storage/ndb/test/run-test/make-index.sh (+6/-1)
Percona-Server/storage/ndb/test/run-test/ndb-autotest.sh (+5/-0)
Percona-Server/storage/ndb/test/src/CpcClient.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/DbUtil.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/HugoAsynchTransactions.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/HugoCalculator.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/HugoOperations.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/HugoTransactions.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/Makefile.am (+1/-1)
Percona-Server/storage/ndb/test/src/NDBT_Error.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/NDBT_Output.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/NDBT_ResultRow.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/NDBT_ReturnCodes.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/NDBT_Table.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/NDBT_Tables.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/NDBT_Test.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/NDBT_Thread.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/NdbBackup.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/NdbConfig.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/NdbGrep.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/NdbMixRestarter.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/NdbRestarter.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/NdbRestarts.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/NdbSchemaCon.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/NdbSchemaOp.cpp (+1/-1)
Percona-Server/storage/ndb/test/src/UtilTransactions.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/Makefile.am (+1/-1)
Percona-Server/storage/ndb/test/tools/copy_tab.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/cpcc.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/create_index.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/hugoCalculator.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/hugoFill.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/hugoLoad.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/hugoLockRecords.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/hugoPkDelete.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/hugoPkRead.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/hugoPkReadRecord.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/hugoPkUpdate.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/hugoScanRead.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/hugoScanUpdate.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/listen.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/rep_latency.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/restart.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/transproxy.cpp (+1/-1)
Percona-Server/storage/ndb/test/tools/verify_index.cpp (+1/-1)
Percona-Server/storage/ndb/tools/Makefile.am (+1/-1)
Percona-Server/storage/ndb/tools/clean-links.sh (+1/-1)
Percona-Server/storage/ndb/tools/delete_all.cpp (+1/-1)
Percona-Server/storage/ndb/tools/desc.cpp (+1/-1)
Percona-Server/storage/ndb/tools/drop_index.cpp (+1/-1)
Percona-Server/storage/ndb/tools/drop_tab.cpp (+1/-1)
Percona-Server/storage/ndb/tools/listTables.cpp (+1/-1)
Percona-Server/storage/ndb/tools/make-errors.pl (+1/-1)
Percona-Server/storage/ndb/tools/make-links.sh (+1/-1)
Percona-Server/storage/ndb/tools/ndb_config.cpp (+1/-1)
Percona-Server/storage/ndb/tools/ndb_error_reporter (+1/-1)
Percona-Server/storage/ndb/tools/ndb_test_platform.cpp (+1/-1)
Percona-Server/storage/ndb/tools/ndbsql.cpp (+1/-1)
Percona-Server/storage/ndb/tools/restore/Restore.cpp (+1/-1)
Percona-Server/storage/ndb/tools/restore/Restore.hpp (+1/-1)
Percona-Server/storage/ndb/tools/restore/consumer.cpp (+1/-1)
Percona-Server/storage/ndb/tools/restore/consumer.hpp (+1/-1)
Percona-Server/storage/ndb/tools/restore/consumer_printer.cpp (+1/-1)
Percona-Server/storage/ndb/tools/restore/consumer_printer.hpp (+1/-1)
Percona-Server/storage/ndb/tools/restore/consumer_restore.hpp (+1/-1)
Percona-Server/storage/ndb/tools/restore/ndb_nodegroup_map.h (+1/-1)
Percona-Server/storage/ndb/tools/restore/restore_main.cpp (+1/-1)
Percona-Server/storage/ndb/tools/rgrep (+1/-1)
Percona-Server/storage/ndb/tools/select_all.cpp (+1/-1)
Percona-Server/storage/ndb/tools/select_count.cpp (+1/-1)
Percona-Server/storage/ndb/tools/waiter.cpp (+1/-1)
Percona-Server/strings/bchange.c (+1/-1)
Percona-Server/strings/bfill.c.OTHER (+100/-0)
Percona-Server/strings/bmove.c.OTHER (+82/-0)
Percona-Server/strings/bmove512.c.OTHER (+127/-0)
Percona-Server/strings/bmove_upp-sparc.s.OTHER (+40/-0)
Percona-Server/strings/bmove_upp.c (+5/-0)
Percona-Server/strings/ctype-mb.c (+8/-1)
Percona-Server/strings/ctype-simple.c (+4/-0)
Percona-Server/strings/ctype-uca.c (+4/-0)
Percona-Server/strings/ctype-utf8.c (+21/-0)
Percona-Server/strings/ctype.c (+1/-2)
Percona-Server/strings/decimal.c (+11/-0)
Percona-Server/strings/do_ctype.c (+5/-0)
Percona-Server/strings/int2str.c (+5/-0)
Percona-Server/strings/is_prefix.c (+1/-1)
Percona-Server/strings/llstr.c (+1/-1)
Percona-Server/strings/longlong2str-x86.s.OTHER (+216/-0)
Percona-Server/strings/longlong2str.c (+4/-0)
Percona-Server/strings/longlong2str_asm.c.OTHER (+34/-0)
Percona-Server/strings/macros.asm.OTHER (+147/-0)
Percona-Server/strings/my_strtoll10-x86.s.OTHER (+419/-0)
Percona-Server/strings/my_strtoll10.c (+7/-2)
Percona-Server/strings/ptr_cmp.asm.OTHER (+180/-0)
Percona-Server/strings/r_strinstr.c.OTHER (+52/-0)
Percona-Server/strings/str2int.c (+1/-1)
Percona-Server/strings/str_alloc.c (+4/-0)
Percona-Server/strings/strappend-sparc.s.OTHER (+49/-0)
Percona-Server/strings/strappend.c (+1/-1)
Percona-Server/strings/strcend.c (+5/-0)
Percona-Server/strings/strcont.c (+1/-1)
Percona-Server/strings/strend-sparc.s.OTHER (+35/-0)
Percona-Server/strings/strend.c (+5/-0)
Percona-Server/strings/strfill.c (+1/-1)
Percona-Server/strings/strings-not-used.h.OTHER (+37/-0)
Percona-Server/strings/strings-x86.s.OTHER (+416/-0)
Percona-Server/strings/strings.asm.OTHER (+1060/-0)
Percona-Server/strings/strinstr-sparc.s.OTHER (+43/-0)
Percona-Server/strings/strinstr.c.OTHER (+50/-0)
Percona-Server/strings/strmake-sparc.s.OTHER (+43/-0)
Percona-Server/strings/strmake.c (+1/-1)
Percona-Server/strings/strmov-sparc.s.OTHER (+36/-0)
Percona-Server/strings/strmov.c (+5/-0)
Percona-Server/strings/strnlen.c (+1/-1)
Percona-Server/strings/strnmov-sparc.s.OTHER (+43/-0)
Percona-Server/strings/strnmov.c (+1/-1)
Percona-Server/strings/strstr-sparc.s.OTHER (+72/-0)
Percona-Server/strings/strstr.c.OTHER (+54/-0)
Percona-Server/strings/strto.c.OTHER (+211/-0)
Percona-Server/strings/strtol.c.OTHER (+30/-0)
Percona-Server/strings/strtoll.c.OTHER (+35/-0)
Percona-Server/strings/strtoul.c.OTHER (+31/-0)
Percona-Server/strings/strtoull.c.OTHER (+36/-0)
Percona-Server/strings/strxmov-sparc.s.OTHER (+54/-0)
Percona-Server/strings/strxmov.asm.OTHER (+103/-0)
Percona-Server/strings/strxmov.c (+1/-1)
Percona-Server/strings/strxnmov.c (+1/-1)
Percona-Server/strings/t_ctype.h (+1/-1)
Percona-Server/strings/udiv.c.OTHER (+38/-0)
Percona-Server/support-files/MacOSX/Makefile.am.OTHER (+57/-0)
Percona-Server/support-files/MySQL-shared-compat.spec.sh (+5/-0)
Percona-Server/support-files/RHEL4-SElinux/Makefile.am.OTHER (+23/-0)
Percona-Server/support-files/mysql.server.sh (+17/-0)
Percona-Server/support-files/mysql.spec.sh (+39/-1)
Percona-Server/tests/CMakeLists.txt (+4/-0)
Percona-Server/tests/Makefile.am.OTHER (+67/-0)
Percona-Server/tests/big_record.pl (+4/-0)
Percona-Server/tests/connect_test.c (+1/-1)
Percona-Server/tests/fork_big.pl (+1/-1)
Percona-Server/tests/fork_big2.pl (+1/-1)
Percona-Server/tests/insert_test.c (+1/-1)
Percona-Server/tests/list_test.c (+1/-1)
Percona-Server/tests/select_test.c (+1/-1)
Percona-Server/tests/showdb_test.c (+1/-1)
Percona-Server/tests/ssl_test.c (+1/-1)
Percona-Server/tests/thread_test.c (+8/-0)
Percona-Server/unittest/Makefile.am.OTHER (+30/-0)
Percona-Server/unittest/my_decimal/Makefile.am (+32/-0)
Percona-Server/unittest/mytap/Makefile.am.OTHER (+26/-0)
Percona-Server/unittest/mytap/t/Makefile.am.OTHER (+25/-0)
Percona-Server/vio/CMakeLists.txt (+4/-0)
Percona-Server/vio/Makefile.am.OTHER (+28/-0)
Percona-Server/vio/test-ssl.c (+8/-0)
Percona-Server/vio/test-sslclient.c (+8/-0)
Percona-Server/vio/test-sslserver.c (+8/-0)
Percona-Server/vio/viossl.c (+8/-0)
Percona-Server/vio/viosslfactories.c (+5/-0)
Percona-Server/vio/viotest-ssl.c (+8/-0)
Percona-Server/win/build-nmake-x64.bat.OTHER (+21/-0)
Percona-Server/win/build-nmake.bat.OTHER (+21/-0)
Percona-Server/win/build-vs71.bat.OTHER (+22/-0)
Percona-Server/win/build-vs8.bat.OTHER (+21/-0)
Percona-Server/win/create_manifest.js.OTHER (+111/-0)
Percona-Server/win/mysql_manifest.cmake.OTHER (+35/-0)
Percona-Server/zlib/CMakeLists.txt (+4/-0)
Percona-Server/zlib/Makefile.am.OTHER (+38/-0)
build/build-binary.sh (+52/-0)
build/build-dpkg.sh (+11/-0)
build/build-rpm.sh (+18/-0)
build/debian/changelog (+30/-0)
build/debian/rules (+299/-0)
build/percona-server.spec (+219/-6)
build/percona-shared-compat.spec (+4/-0)
doc/source/conf.py (+24/-0)
doc/source/copyright.rst (+49/-22)
doc/source/faq.rst (+8/-0)
doc/source/release-notes/Percona-Server-5.1.67-14.4.rst.OTHER (+50/-0)
doc/source/release-notes/Percona-Server-5.1.68-14.5.rst.OTHER (+14/-0)
doc/source/release-notes/Percona-Server-5.1.68-14.6.rst.OTHER (+30/-0)
doc/source/release-notes/Percona-Server-5.1.69-14.7.rst (+50/-0)
doc/source/release-notes/Percona-Server-5.1.70-14.8.rst (+20/-0)
doc/source/release-notes/Percona-Server-5.1.71-14.9.rst (+24/-0)
doc/source/release-notes/release-notes_index.rst (+47/-0)
doc/source/scalability/innodb_io.rst.OTHER (+266/-0)
doc/source/upstream-bug-fixes.rst (+224/-0)
Text conflict in Makefile
Contents conflict in Percona-Server/BUILD/Makefile.am
Text conflict in Percona-Server/BUILD/autorun.sh
Text conflict in Percona-Server/BUILD/build_mccge.sh
Contents conflict in Percona-Server/BUILD/compile-alpha-ccc
Contents conflict in Percona-Server/BUILD/compile-alpha-cxx
Text conflict in Percona-Server/BUILD/compile-alpha-debug
Text conflict in Percona-Server/BUILD/compile-amd64-debug-max
Text conflict in Percona-Server/BUILD/compile-amd64-max
Text conflict in Percona-Server/BUILD/compile-darwin-mwcc
Text conflict in Percona-Server/BUILD/compile-hpux11-parisc2-aCC
Text conflict in Percona-Server/BUILD/compile-ia64-debug-max
Text conflict in Percona-Server/BUILD/compile-irix-mips64-mipspro
Text conflict in Percona-Server/BUILD/compile-pentium
Text conflict in Percona-Server/BUILD/compile-pentium-debug
Text conflict in Percona-Server/BUILD/compile-pentium-debug-max
Text conflict in Percona-Server/BUILD/compile-pentium-debug-max-no-embedded
Text conflict in Percona-Server/BUILD/compile-pentium-debug-openssl
Text conflict in Percona-Server/BUILD/compile-pentium-debug-yassl
Text conflict in Percona-Server/BUILD/compile-pentium-max
Text conflict in Percona-Server/BUILD/compile-pentium-pgcc
Text conflict in Percona-Server/BUILD/compile-pentium64
Text conflict in Percona-Server/BUILD/compile-pentium64-debug
Text conflict in Percona-Server/BUILD/compile-pentium64-debug-max
Text conflict in Percona-Server/BUILD/compile-ppc-debug
Text conflict in Percona-Server/BUILD/compile-ppc-debug-max
Text conflict in Percona-Server/BUILD/compile-ppc-debug-max-no-ndb
Text conflict in Percona-Server/BUILD/compile-ppc-max
Text conflict in Percona-Server/BUILD/compile-solaris-sparc-debug
Text conflict in Percona-Server/BUILD/compile-solaris-sparc-purify
Text conflict in Percona-Server/CMakeLists.txt
Contents conflict in Percona-Server/Docs/Makefile.am
Contents conflict in Percona-Server/Makefile.am
Text conflict in Percona-Server/README
Text conflict in Percona-Server/client/completion_hash.cc
Text conflict in Percona-Server/client/completion_hash.h
Text conflict in Percona-Server/client/echo.c
Text conflict in Percona-Server/client/get_password.c
Text conflict in Percona-Server/client/mysqlbinlog.cc
Text conflict in Percona-Server/client/mysqldump.c
Text conflict in Percona-Server/client/sql_string.h
Contents conflict in Percona-Server/cmd-line-utils/Makefile.am
Text conflict in Percona-Server/cmd-line-utils/readline/COPYING
Text conflict in Percona-Server/cmd-line-utils/readline/ansi_stdlib.h
Text conflict in Percona-Server/cmd-line-utils/readline/chardefs.h
Text conflict in Percona-Server/cmd-line-utils/readline/complete.c
Text conflict in Percona-Server/cmd-line-utils/readline/configure.in
Text conflict in Percona-Server/cmd-line-utils/readline/funmap.c
Text conflict in Percona-Server/cmd-line-utils/readline/histexpand.c
Text conflict in Percona-Server/cmd-line-utils/readline/histlib.h
Text conflict in Percona-Server/cmd-line-utils/readline/history.c
Text conflict in Percona-Server/cmd-line-utils/readline/history.h
Text conflict in Percona-Server/cmd-line-utils/readline/histsearch.c
Text conflict in Percona-Server/cmd-line-utils/readline/keymaps.c
Text conflict in Percona-Server/cmd-line-utils/readline/keymaps.h
Text conflict in Percona-Server/cmd-line-utils/readline/macro.c
Text conflict in Percona-Server/cmd-line-utils/readline/misc.c
Text conflict in Percona-Server/cmd-line-utils/readline/parens.c
Text conflict in Percona-Server/cmd-line-utils/readline/posixdir.h
Text conflict in Percona-Server/cmd-line-utils/readline/posixjmp.h
Text conflict in Percona-Server/cmd-line-utils/readline/posixstat.h
Text conflict in Percona-Server/cmd-line-utils/readline/readline.c
Text conflict in Percona-Server/cmd-line-utils/readline/readline.h
Text conflict in Percona-Server/cmd-line-utils/readline/rlconf.h
Text conflict in Percona-Server/cmd-line-utils/readline/rlmbutil.h
Text conflict in Percona-Server/cmd-line-utils/readline/rlstdc.h
Text conflict in Percona-Server/cmd-line-utils/readline/rltty.c
Text conflict in Percona-Server/cmd-line-utils/readline/rltypedefs.h
Text conflict in Percona-Server/cmd-line-utils/readline/savestring.c
Text conflict in Percona-Server/cmd-line-utils/readline/search.c
Text conflict in Percona-Server/cmd-line-utils/readline/shell.c
Text conflict in Percona-Server/cmd-line-utils/readline/text.c
Text conflict in Percona-Server/cmd-line-utils/readline/tilde.c
Text conflict in Percona-Server/cmd-line-utils/readline/tilde.h
Text conflict in Percona-Server/cmd-line-utils/readline/util.c
Text conflict in Percona-Server/cmd-line-utils/readline/vi_keymap.c
Text conflict in Percona-Server/cmd-line-utils/readline/vi_mode.c
Text conflict in Percona-Server/cmd-line-utils/readline/xmalloc.c
Text conflict in Percona-Server/cmd-line-utils/readline/xmalloc.h
Conflict adding files to Percona-Server/config.  Created directory.
Conflict because Percona-Server/config is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to Percona-Server/config/ac-macros.  Created directory.
Conflict because Percona-Server/config/ac-macros is not versioned, but has versioned children.  Versioned directory.
Contents conflict in Percona-Server/config/ac-macros/misc.m4
Contents conflict in Percona-Server/configure.in
Text conflict in Percona-Server/dbug/CMakeLists.txt
Contents conflict in Percona-Server/dbug/Makefile.am
Text conflict in Percona-Server/dbug/dbug_add_tags.pl
Text conflict in Percona-Server/extra/CMakeLists.txt
Contents conflict in Percona-Server/extra/Makefile.am
Text conflict in Percona-Server/extra/charset2html.c
Text conflict in Percona-Server/extra/comp_err.c
Contents conflict in Percona-Server/extra/yassl/Makefile.am
Contents conflict in Percona-Server/extra/yassl/src/Makefile.am
Text conflict in Percona-Server/extra/yassl/src/template_instnt.cpp
Contents conflict in Percona-Server/extra/yassl/taocrypt/Makefile.am
Contents conflict in Percona-Server/extra/yassl/taocrypt/benchmark/Makefile.am
Contents conflict in Percona-Server/extra/yassl/taocrypt/src/Makefile.am
Contents conflict in Percona-Server/extra/yassl/taocrypt/test/Makefile.am
Contents conflict in Percona-Server/extra/yassl/testsuite/Makefile.am
Text conflict in Percona-Server/include/base64.h
Text conflict in Percona-Server/include/decimal.h
Text conflict in Percona-Server/include/errmsg.h
Text conflict in Percona-Server/include/ft_global.h
Text conflict in Percona-Server/include/heap.h
Contents conflict in Percona-Server/include/help_end.h
Contents conflict in Percona-Server/include/help_start.h
Text conflict in Percona-Server/include/keycache.h
Text conflict in Percona-Server/include/m_ctype.h
Text conflict in Percona-Server/include/my_aes.h
Text conflict in Percona-Server/include/my_alloc.h
Text conflict in Percona-Server/include/my_attribute.h
Text conflict in Percona-Server/include/my_base.h
Conflict adding file Percona-Server/include/my_compare.h.  Moved existing file to Percona-Server/include/my_compare.h.moved.
Text conflict in Percona-Server/include/my_dir.h
Text conflict in Percona-Server/include/my_libwrap.h
Text conflict in Percona-Server/include/my_list.h
Text conflict in Percona-Server/include/my_md5.h
Text conflict in Percona-Server/include/my_net.h
Text conflict in Percona-Server/include/my_nosys.h
Text conflict in Percona-Server/include/my_tree.h
Contents conflict in Percona-Server/include/my_trie.h
Text conflict in Percona-Server/include/my_user.h
Contents conflict in Percona-Server/include/my_vle.h
Text conflict in Percona-Server/include/my_xml.h
Text conflict in Percona-Server/include/myisampack.h
Text conflict in Percona-Server/include/mysql_com.h
Text conflict in Percona-Server/include/mysql_time.h
Text conflict in Percona-Server/include/mysql_version.h.in
Text conflict in Percona-Server/include/queues.h
Text conflict in Percona-Server/include/rijndael.h
Text conflict in Percona-Server/include/sql_common.h
Text conflict in Percona-Server/include/sslopt-case.h
Text conflict in Percona-Server/include/sslopt-vars.h
Text conflict in Percona-Server/include/thr_alarm.h
Text conflict in Percona-Server/include/typelib.h
Text conflict in Percona-Server/include/violite.h
Text conflict in Percona-Server/include/welcome_copyright_notice.h
Contents conflict in Percona-Server/libmysql/Makefile.am
Text conflict in Percona-Server/libmysql/client_settings.h
Contents conflict in Percona-Server/libmysql/dll.c
Text conflict in Percona-Server/libmysql/errmsg.c
Text conflict in Percona-Server/libmysql/get_password.c
Contents conflict in Percona-Server/libmysql/manager.c
Conflict adding files to Percona-Server/libmysql_r.  Created directory.
Conflict because Percona-Server/libmysql_r is not versioned, but has versioned children.  Versioned directory.
Contents conflict in Percona-Server/libmysql_r/Makefile.am
Text conflict in Percona-Server/libmysqld/emb_qcache.cc
Text conflict in Percona-Server/libmysqld/embedded_priv.h
Text conflict in Percona-Server/libmysqld/examples/CMakeLists.txt
Contents conflict in Percona-Server/libmysqld/examples/Makefile.am
Conflict adding file Percona-Server/man/comp_err.1.  Moved existing file to Percona-Server/man/comp_err.1.moved.
Conflict adding file Percona-Server/man/innochecksum.1.  Moved existing file to Percona-Server/man/innochecksum.1.moved.
Contents conflict in Percona-Server/man/make_win_bin_dist.1
Conflict adding file Percona-Server/man/msql2mysql.1.  Moved existing file to Percona-Server/man/msql2mysql.1.moved.
Conflict adding file Percona-Server/man/my_print_defaults.1.  Moved existing file to Percona-Server/man/my_print_defaults.1.moved.
Conflict adding file Percona-Server/man/myisam_ftdump.1.  Moved existing file to Percona-Server/man/myisam_ftdump.1.moved.
Conflict adding file Percona-Server/man/myisamchk.1.  Moved existing file to Percona-Server/man/myisamchk.1.moved.
Conflict adding file Percona-Server/man/myisamlog.1.  Moved existing file to Percona-Server/man/myisamlog.1.moved.
Conflict adding file Percona-Server/man/myisampack.1.  Moved existing file to Percona-Server/man/myisampack.1.moved.
Conflict adding file Percona-Server/man/mysql-stress-test.pl.1.  Moved existing file to Percona-Server/man/mysql-stress-test.pl.1.moved.
Conflict adding file Percona-Server/man/mysql-test-run.pl.1.  Moved existing file to Percona-Server/man/mysql-test-run.pl.1.moved.
Conflict adding file Percona-Server/man/mysql.1.  Moved existing file to Percona-Server/man/mysql.1.moved.
Conflict adding file Percona-Server/man/mysql.server.1.  Moved existing file to Percona-Server/man/mysql.server.1.moved.
Conflict adding file Percona-Server/man/mysql_client_test.1.  Moved existing file to Percona-Server/man/mysql_client_test.1.moved.
Conflict adding file Percona-Server/man/mysql_client_test_embedded.1.  Moved existing file to Percona-Server/man/mysql_client_test_embedded.1.moved.
Conflict adding file Percona-Server/man/mysql_config.1.  Moved existing file to Percona-Server/man/mysql_config.1.moved.
Conflict adding file Percona-Server/man/mysql_convert_table_format.1.  Moved existing file to Percona-Server/man/mysql_convert_table_format.1.moved.
Conflict adding file Percona-Server/man/mysql_find_rows.1.  Moved existing file to Percona-Server/man/mysql_find_rows.1.moved.
Conflict adding file Percona-Server/man/mysql_fix_extensions.1.  Moved existing file to Percona-Server/man/mysql_fix_extensions.1.moved.
Contents conflict in Percona-Server/man/mysql_fix_privilege_tables.1
Conflict adding file Percona-Server/man/mysql_install_db.1.  Moved existing file to Percona-Server/man/mysql_install_db.1.moved.
Conflict adding file Percona-Server/man/mysql_secure_installation.1.  Moved existing file to Percona-Server/man/mysql_secure_installation.1.moved.
Conflict adding file Percona-Server/man/mysql_setpermission.1.  Moved existing file to Percona-Server/man/mysql_setpermission.1.moved.
Conflict adding file Percona-Server/man/mysql_tzinfo_to_sql.1.  Moved existing file to Percona-Server/man/mysql_tzinfo_to_sql.1.moved.
Conflict adding file Percona-Server/man/mysql_upgrade.1.  Moved existing file to Percona-Server/man/mysql_upgrade.1.moved.
Conflict adding file Percona-Server/man/mysql_waitpid.1.  Moved existing file to Percona-Server/man/mysql_waitpid.1.moved.
Conflict adding file Percona-Server/man/mysql_zap.1.  Moved existing file to Percona-Server/man/mysql_zap.1.moved.
Conflict adding file Percona-Server/man/mysqlaccess.1.  Moved existing file to Percona-Server/man/mysqlaccess.1.moved.
Conflict adding file Percona-Server/man/mysqladmin.1.  Moved existing file to Percona-Server/man/mysqladmin.1.moved.
Conflict adding file Percona-Server/man/mysqlbinlog.1.  Moved existing file to Percona-Server/man/mysqlbinlog.1.moved.
Conflict adding file Percona-Server/man/mysqlbug.1.  Moved existing file to Percona-Server/man/mysqlbug.1.moved.
Conflict adding file Percona-Server/man/mysqlcheck.1.  Moved existing file to Percona-Server/man/mysqlcheck.1.moved.
Conflict adding file Percona-Server/man/mysqld.8.  Moved existing file to Percona-Server/man/mysqld.8.moved.
Conflict adding file Percona-Server/man/mysqld_multi.1.  Moved existing file to Percona-Server/man/mysqld_multi.1.moved.
Conflict adding file Percona-Server/man/mysqld_safe.1.  Moved existing file to Percona-Server/man/mysqld_safe.1.moved.
Conflict adding file Percona-Server/man/mysqldump.1.  Moved existing file to Percona-Server/man/mysqldump.1.moved.
Conflict adding file Percona-Server/man/mysqldumpslow.1.  Moved existing file to Percona-Server/man/mysqldumpslow.1.moved.
Conflict adding file Percona-Server/man/mysqlhotcopy.1.  Moved existing file to Percona-Server/man/mysqlhotcopy.1.moved.
Conflict adding file Percona-Server/man/mysqlimport.1.  Moved existing file to Percona-Server/man/mysqlimport.1.moved.
Contents conflict in Percona-Server/man/mysqlmanager.8
Conflict adding file Percona-Server/man/mysqlshow.1.  Moved existing file to Percona-Server/man/mysqlshow.1.moved.
Conflict adding file Percona-Server/man/mysqlslap.1.  Moved existing file to Percona-Server/man/mysqlslap.1.moved.
Conflict adding file Percona-Server/man/mysqltest.1.  Moved existing file to Percona-Server/man/mysqltest.1.moved.
Conflict adding file Percona-Server/man/mysqltest_embedded.1.  Moved existing file to Percona-Server/man/mysqltest_embedded.1.moved.
Conflict adding file Percona-Server/man/ndb_config.1.  Moved existing file to Percona-Server/man/ndb_config.1.moved.
Conflict adding file Percona-Server/man/ndb_cpcd.1.  Moved existing file to Percona-Server/man/ndb_cpcd.1.moved.
Conflict adding file Percona-Server/man/ndb_delete_all.1.  Moved existing file to Percona-Server/man/ndb_delete_all.1.moved.
Conflict adding file Percona-Server/man/ndb_desc.1.  Moved existing file to Percona-Server/man/ndb_desc.1.moved.
Conflict adding file Percona-Server/man/ndb_drop_index.1.  Moved existing file to Percona-Server/man/ndb_drop_index.1.moved.
Conflict adding file Percona-Server/man/ndb_drop_table.1.  Moved existing file to Percona-Server/man/ndb_drop_table.1.moved.
Conflict adding file Percona-Server/man/ndb_error_reporter.1.  Moved existing file to Percona-Server/man/ndb_error_reporter.1.moved.
Conflict adding file Percona-Server/man/ndb_mgm.1.  Moved existing file to Percona-Server/man/ndb_mgm.1.moved.
Conflict adding file Percona-Server/man/ndb_mgmd.8.  Moved existing file to Percona-Server/man/ndb_mgmd.8.moved.
Conflict adding file Percona-Server/man/ndb_print_backup_file.1.  Moved existing file to Percona-Server/man/ndb_print_backup_file.1.moved.
Conflict adding file Percona-Server/man/ndb_print_schema_file.1.  Moved existing file to Percona-Server/man/ndb_print_schema_file.1.moved.
Conflict adding file Percona-Server/man/ndb_print_sys_file.1.  Moved existing file to Percona-Server/man/ndb_print_sys_file.1.moved.
Conflict adding file Percona-Server/man/ndb_restore.1.  Moved existing file to Percona-Server/man/ndb_restore.1.moved.
Conflict adding file Percona-Server/man/ndb_select_all.1.  Moved existing file to Percona-Server/man/ndb_select_all.1.moved.
Conflict adding file Percona-Server/man/ndb_select_count.1.  Moved existing file to Percona-Server/man/ndb_select_count.1.moved.
Conflict adding file Percona-Server/man/ndb_show_tables.1.  Moved existing file to Percona-Server/man/ndb_show_tables.1.moved.
Conflict adding file Percona-Server/man/ndb_size.pl.1.  Moved existing file to Percona-Server/man/ndb_size.pl.1.moved.
Conflict adding file Percona-Server/man/ndb_waiter.1.  Moved existing file to Percona-Server/man/ndb_waiter.1.moved.
Conflict adding file Percona-Server/man/ndbd.8.  Moved existing file to Percona-Server/man/ndbd.8.moved.
Conflict adding file Percona-Server/man/ndbd_redo_log_reader.1.  Moved existing file to Percona-Server/man/ndbd_redo_log_reader.1.moved.
Conflict adding file Percona-Server/man/ndbmtd.8.  Moved existing file to Percona-Server/man/ndbmtd.8.moved.
Conflict adding file Percona-Server/man/perror.1.  Moved existing file to Percona-Server/man/perror.1.moved.
Conflict adding file Percona-Server/man/replace.1.  Moved existing file to Percona-Server/man/replace.1.moved.
Conflict adding file Percona-Server/man/resolve_stack_dump.1.  Moved existing file to Percona-Server/man/resolve_stack_dump.1.moved.
Conflict adding file Percona-Server/man/resolveip.1.  Moved existing file to Percona-Server/man/resolveip.1.moved.
Contents conflict in Percona-Server/mysql-test/Makefile.am
Text conflict in Percona-Server/mysql-test/include/default_mysqld.cnf
Text conflict in Percona-Server/mysql-test/lib/My/SafeProcess/CMakeLists.txt
Text conflict in Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc
Text conflict in Percona-Server/mysql-test/lib/v1/mysql-test-run.pl
Text conflict in Percona-Server/mysql-test/mysql-test-run.pl
Text conflict in Percona-Server/mysql-test/purify.supp
Text conflict in Percona-Server/mysql-test/r/cast.result
Text conflict in Percona-Server/mysql-test/r/mysqldump.result
Text conflict in Percona-Server/mysql-test/r/partition_error.result
Text conflict in Percona-Server/mysql-test/r/percona_server_variables_debug.result
Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_killed_simulate.test
Text conflict in Percona-Server/mysql-test/suite/binlog/t/binlog_percona_fake_changes.test
Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_columns_mysql.result
Text conflict in Percona-Server/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
Conflict adding file Percona-Server/mysql-test/suite/innodb/t/innodb_bug12400341.test.  Moved existing file to Percona-Server/mysql-test/suite/innodb/t/innodb_bug12400341.test.moved.
Text conflict in Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug-master.opt
Text conflict in Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_debug.test
Conflict adding files to Percona-Server/mysql-test/suite/innodb_plugin.  Created directory.
Conflict because Percona-Server/mysql-test/suite/innodb_plugin is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to Percona-Server/mysql-test/suite/innodb_plugin/t.  Created directory.
Conflict because Percona-Server/mysql-test/suite/innodb_plugin/t is not versioned, but has versioned children.  Versioned directory.
Contents conflict in Percona-Server/mysql-test/suite/innodb_plugin/t/innodb_bug12400341.test
Text conflict in Percona-Server/mysql-test/suite/rpl/r/rpl_row_until.result
Text conflict in Percona-Server/mysql-test/suite/rpl/t/rpl_row_until.test
Text conflict in Percona-Server/mysql-test/suite/sys_vars/r/rpl_init_slave_func.result
Conflict adding file Percona-Server/mysql-test/suite/sys_vars/t/disabled.def.  Moved existing file to Percona-Server/mysql-test/suite/sys_vars/t/disabled.def.moved.
Text conflict in Percona-Server/mysql-test/suite/sys_vars/t/innodb_buffer_pool_evict_basic.test
Text conflict in Percona-Server/mysql-test/t/func_str.test
Text conflict in Percona-Server/mysql-test/t/partition_error.test
Text conflict in Percona-Server/mysys/array.c
Text conflict in Percona-Server/mysys/charset-def.c
Text conflict in Percona-Server/mysys/checksum.c
Contents conflict in Percona-Server/mysys/default_modify.c
Text conflict in Percona-Server/mysys/errors.c
Text conflict in Percona-Server/mysys/list.c
Contents conflict in Percona-Server/mysys/make-conf.c
Contents conflict in Percona-Server/mysys/mf_brkhant.c
Text conflict in Percona-Server/mysys/mf_cache.c
Text conflict in Percona-Server/mysys/mf_dirname.c
Text conflict in Percona-Server/mysys/mf_fn_ext.c
Text conflict in Percona-Server/mysys/mf_format.c
Text conflict in Percona-Server/mysys/mf_getdate.c
Text conflict in Percona-Server/mysys/mf_iocache2.c
Text conflict in Percona-Server/mysys/mf_keycaches.c
Text conflict in Percona-Server/mysys/mf_path.c
Text conflict in Percona-Server/mysys/mf_sort.c
Text conflict in Percona-Server/mysys/mf_tempfile.c
Text conflict in Percona-Server/mysys/mf_unixpath.c
Contents conflict in Percona-Server/mysys/mf_util.c
Contents conflict in Percona-Server/mysys/my_append.c
Text conflict in Percona-Server/mysys/my_bit.c
Text conflict in Percona-Server/mysys/my_chsize.c
Contents conflict in Percona-Server/mysys/my_clock.c
Conflict adding file Percona-Server/mysys/my_compare.c.  Moved existing file to Percona-Server/mysys/my_compare.c.moved.
Text conflict in Percona-Server/mysys/my_compress.c
Text conflict in Percona-Server/mysys/my_create.c
Text conflict in Percona-Server/mysys/my_delete.c
Contents conflict in Percona-Server/mysys/my_dup.c
Text conflict in Percona-Server/mysys/my_error.c
Text conflict in Percona-Server/mysys/my_handler_errors.h
Text conflict in Percona-Server/mysys/my_init.c
Text conflict in Percona-Server/mysys/my_largepage.c
Text conflict in Percona-Server/mysys/my_lock.c
Text conflict in Percona-Server/mysys/my_lockmem.c
Text conflict in Percona-Server/mysys/my_mess.c
Text conflict in Percona-Server/mysys/my_mmap.c
Contents conflict in Percona-Server/mysys/my_net.c
Contents conflict in Percona-Server/mysys/my_netware.c
Text conflict in Percona-Server/mysys/my_new.cc
Text conflict in Percona-Server/mysys/my_once.c
Text conflict in Percona-Server/mysys/my_open.c
Text conflict in Percona-Server/mysys/my_pthread.c
Text conflict in Percona-Server/mysys/my_quick.c
Text conflict in Percona-Server/mysys/my_read.c
Contents conflict in Percona-Server/mysys/my_realloc.c
Text conflict in Percona-Server/mysys/my_rename.c
Text conflict in Percona-Server/mysys/my_sleep.c
Text conflict in Percona-Server/mysys/my_static.h
Contents conflict in Percona-Server/mysys/my_vle.c
Text conflict in Percona-Server/mysys/my_windac.c
Text conflict in Percona-Server/mysys/my_winthread.c
Text conflict in Percona-Server/mysys/my_write.c
Text conflict in Percona-Server/mysys/mysys_priv.h
Text conflict in Percona-Server/mysys/ptr_cmp.c
Text conflict in Percona-Server/mysys/queues.c
Text conflict in Percona-Server/mysys/rijndael.c
Text conflict in Percona-Server/mysys/test_charset.c
Contents conflict in Percona-Server/mysys/test_fn.c
Text conflict in Percona-Server/mysys/testhash.c
Text conflict in Percona-Server/mysys/thr_alarm.c
Text conflict in Percona-Server/mysys/thr_rwlock.c
Text conflict in Percona-Server/mysys/tree.c
Contents conflict in Percona-Server/mysys/trie.c
Conflict adding files to Percona-Server/netware.  Created directory.
Conflict because Percona-Server/netware is not versioned, but has versioned children.  Versioned directory.
Contents conflict in Percona-Server/netware/Makefile.am
Contents conflict in Percona-Server/netware/libmysqlmain.c
Contents conflict in Percona-Server/netware/my_manage.c
Contents conflict in Percona-Server/netware/my_manage.h
Contents conflict in Percona-Server/netware/mysql_fix_privilege_tables.pl
Contents conflict in Percona-Server/netware/mysql_install_db.c
Contents conflict in Percona-Server/netware/mysql_secure_installation.pl
Contents conflict in Percona-Server/netware/mysql_test_run.c
Contents conflict in Percona-Server/netware/mysqld_safe.c
Text conflict in Percona-Server/plugin/daemon_example/daemon_example.cc
Contents conflict in Percona-Server/plugin/fulltext/Makefile.am
Contents conflict in Percona-Server/regex/Makefile.am
Text conflict in Percona-Server/scripts/CMakeLists.txt
Text conflict in Percona-Server/scripts/fill_help_tables.sql
Contents conflict in Percona-Server/scripts/make_binary_distribution.sh
Contents conflict in Percona-Server/scripts/mysql_fix_privilege_tables.sh
Text conflict in Percona-Server/scripts/mysql_system_tables.sql
Text conflict in Percona-Server/scripts/mysql_system_tables_data.sql
Conflict adding files to Percona-Server/server-tools.  Created directory.
Conflict because Percona-Server/server-tools is not versioned, but has versioned children.  Versioned directory.
Contents conflict in Percona-Server/server-tools/CMakeLists.txt
Conflict adding files to Percona-Server/server-tools/instance-manager.  Created directory.
Conflict because Percona-Server/server-tools/instance-manager is not versioned, but has versioned children.  Versioned directory.
Contents conflict in Percona-Server/server-tools/instance-manager/CMakeLists.txt
Contents conflict in Percona-Server/server-tools/instance-manager/IMService.cpp
Contents conflict in Percona-Server/server-tools/instance-manager/IMService.h
Contents conflict in Percona-Server/server-tools/instance-manager/Makefile.am
Contents conflict in Percona-Server/server-tools/instance-manager/WindowsService.cpp
Contents conflict in Percona-Server/server-tools/instance-manager/WindowsService.h
Contents conflict in Percona-Server/server-tools/instance-manager/angel.cc
Contents conflict in Percona-Server/server-tools/instance-manager/angel.h
Contents conflict in Percona-Server/server-tools/instance-manager/buffer.h
Contents conflict in Percona-Server/server-tools/instance-manager/command.cc
Contents conflict in Percona-Server/server-tools/instance-manager/command.h
Contents conflict in Percona-Server/server-tools/instance-manager/commands.h
Contents conflict in Percona-Server/server-tools/instance-manager/exit_codes.h
Contents conflict in Percona-Server/server-tools/instance-manager/guardian.cc
Contents conflict in Percona-Server/server-tools/instance-manager/guardian.h
Contents conflict in Percona-Server/server-tools/instance-manager/instance.h
Contents conflict in Percona-Server/server-tools/instance-manager/instance_map.h
Contents conflict in Percona-Server/server-tools/instance-manager/instance_options.h
Contents conflict in Percona-Server/server-tools/instance-manager/listener.h
Contents conflict in Percona-Server/server-tools/instance-manager/log.cc
Contents conflict in Percona-Server/server-tools/instance-manager/log.h
Contents conflict in Percona-Server/server-tools/instance-manager/manager.cc
Contents conflict in Percona-Server/server-tools/instance-manager/manager.h
Contents conflict in Percona-Server/server-tools/instance-manager/messages.cc
Contents conflict in Percona-Server/server-tools/instance-manager/messages.h
Contents conflict in Percona-Server/server-tools/instance-manager/mysql_connection.h
Contents conflict in Percona-Server/server-tools/instance-manager/mysql_manager_error.h
Contents conflict in Percona-Server/server-tools/instance-manager/mysqlmanager.cc
Contents conflict in Percona-Server/server-tools/instance-manager/parse_output.h
Contents conflict in Percona-Server/server-tools/instance-manager/portability.h
Contents conflict in Percona-Server/server-tools/instance-manager/priv.cc
Contents conflict in Percona-Server/server-tools/instance-manager/priv.h
Contents conflict in Percona-Server/server-tools/instance-manager/protocol.h
Contents conflict in Percona-Server/server-tools/instance-manager/thread_registry.cc
Contents conflict in Percona-Server/server-tools/instance-manager/thread_registry.h
Contents conflict in Percona-Server/server-tools/instance-manager/user_management_commands.h
Contents conflict in Percona-Server/server-tools/instance-manager/user_map.h
Contents conflict in Percona-Server/sql-bench/Makefile.am
Contents conflict in Percona-Server/sql-common/Makefile.am
Contents conflict in Percona-Server/sql/Makefile.am
Text conflict in Percona-Server/sql/des_key_file.cc
Text conflict in Percona-Server/sql/discover.cc
Text conflict in Percona-Server/sql/event_data_objects.h
Text conflict in Percona-Server/sql/event_db_repository.h
Text conflict in Percona-Server/sql/event_queue.cc
Text conflict in Percona-Server/sql/event_queue.h
Text conflict in Percona-Server/sql/event_scheduler.cc
Text conflict in Percona-Server/sql/event_scheduler.h
Text conflict in Percona-Server/sql/events.h
Text conflict in Percona-Server/sql/field.cc
Text conflict in Percona-Server/sql/field.h
Text conflict in Percona-Server/sql/field_conv.cc
Text conflict in Percona-Server/sql/frm_crypt.cc
Text conflict in Percona-Server/sql/gstream.cc
Text conflict in Percona-Server/sql/gstream.h
Text conflict in Percona-Server/sql/ha_ndbcluster.h
Text conflict in Percona-Server/sql/ha_ndbcluster_binlog.cc
Text conflict in Percona-Server/sql/ha_ndbcluster_binlog.h
Text conflict in Percona-Server/sql/ha_ndbcluster_cond.h
Text conflict in Percona-Server/sql/ha_ndbcluster_tables.h
Text conflict in Percona-Server/sql/handler.cc
Text conflict in Percona-Server/sql/hash_filo.cc
Text conflict in Percona-Server/sql/hash_filo.h
Text conflict in Percona-Server/sql/init.cc
Text conflict in Percona-Server/sql/item.h
Text conflict in Percona-Server/sql/item_cmpfunc.h
Text conflict in Percona-Server/sql/item_func.h
Text conflict in Percona-Server/sql/item_row.cc
Text conflict in Percona-Server/sql/item_subselect.cc
Text conflict in Percona-Server/sql/item_sum.cc
Text conflict in Percona-Server/sql/item_sum.h
Text conflict in Percona-Server/sql/item_xmlfunc.cc
Text conflict in Percona-Server/sql/item_xmlfunc.h
Text conflict in Percona-Server/sql/log.cc
Text conflict in Percona-Server/sql/log_event.cc
Text conflict in Percona-Server/sql/log_event.h
Text conflict in Percona-Server/sql/mf_iocache.cc
Text conflict in Percona-Server/sql/my_decimal.h
Contents conflict in Percona-Server/sql/my_lock.c
Text conflict in Percona-Server/sql/mysqld_suffix.h
Text conflict in Percona-Server/sql/opt_range.cc
Text conflict in Percona-Server/sql/partition_element.h
Text conflict in Percona-Server/sql/procedure.cc
Text conflict in Percona-Server/sql/procedure.h
Text conflict in Percona-Server/sql/records.cc
Text conflict in Percona-Server/sql/repl_failsafe.h
Text conflict in Percona-Server/sql/rpl_filter.h
Text conflict in Percona-Server/sql/rpl_injector.h
Text conflict in Percona-Server/sql/rpl_record_old.h
Text conflict in Percona-Server/sql/rpl_rli.cc
Text conflict in Percona-Server/sql/rpl_rli.h
Text conflict in Percona-Server/sql/rpl_tblmap.h
Text conflict in Percona-Server/sql/rpl_utility.cc
Text conflict in Percona-Server/sql/rpl_utility.h
Text conflict in Percona-Server/sql/scheduler.cc
Text conflict in Percona-Server/sql/scheduler.h
Text conflict in Percona-Server/sql/set_var.cc
Text conflict in Percona-Server/sql/set_var.h
Text conflict in Percona-Server/sql/slave.cc
Text conflict in Percona-Server/sql/sp_cache.h
Text conflict in Percona-Server/sql/sp_head.h
Text conflict in Percona-Server/sql/sp_rcontext.h
Text conflict in Percona-Server/sql/spatial.h
Text conflict in Percona-Server/sql/sql_acl.cc
Text conflict in Percona-Server/sql/sql_analyse.h
Text conflict in Percona-Server/sql/sql_array.h
Text conflict in Percona-Server/sql/sql_bitmap.h
Text conflict in Percona-Server/sql/sql_cache.cc
Text conflict in Percona-Server/sql/sql_class.cc
Text conflict in Percona-Server/sql/sql_class.h
Text conflict in Percona-Server/sql/sql_client.cc
Text conflict in Percona-Server/sql/sql_cursor.h
Text conflict in Percona-Server/sql/sql_db.cc
Text conflict in Percona-Server/sql/sql_derived.cc
Text conflict in Percona-Server/sql/sql_do.cc
Text conflict in Percona-Server/sql/sql_error.h
Text conflict in Percona-Server/sql/sql_insert.cc
Text conflict in Percona-Server/sql/sql_lex.cc
Text conflict in Percona-Server/sql/sql_lex.h
Text conflict in Percona-Server/sql/sql_list.cc
Contents conflict in Percona-Server/sql/sql_map.cc
Contents conflict in Percona-Server/sql/sql_map.h
Text conflict in Percona-Server/sql/sql_parse.cc
Text conflict in Percona-Server/sql/sql_partition.cc
Text conflict in Percona-Server/sql/sql_priv.h
Text conflict in Percona-Server/sql/sql_profile.h
Text conflict in Percona-Server/sql/sql_repl.cc
Text conflict in Percona-Server/sql/sql_repl.h
Text conflict in Percona-Server/sql/sql_select.cc
Text conflict in Percona-Server/sql/sql_select.h
Text conflict in Percona-Server/sql/sql_servers.h
Text conflict in Percona-Server/sql/sql_show.cc
Text conflict in Percona-Server/sql/sql_show.h
Text conflict in Percona-Server/sql/sql_sort.h
Text conflict in Percona-Server/sql/sql_string.cc
Text conflict in Percona-Server/sql/sql_string.h
Text conflict in Percona-Server/sql/sql_udf.h
Text conflict in Percona-Server/sql/sql_update.cc
Text conflict in Percona-Server/sql/table.h
Text conflict in Percona-Server/sql/tzfile.h
Text conflict in Percona-Server/sql/tztime.cc
Text conflict in Percona-Server/storage/archive/ha_archive.h
Text conflict in Percona-Server/storage/federated/ha_federated.cc
Contents conflict in Percona-Server/storage/heap/Makefile.am
Text conflict in Percona-Server/storage/heap/heapdef.h
Text conflict in Percona-Server/storage/heap/hp_block.c
Text conflict in Percona-Server/storage/heap/hp_clear.c
Text conflict in Percona-Server/storage/heap/hp_close.c
Text conflict in Percona-Server/storage/heap/hp_create.c
Text conflict in Percona-Server/storage/heap/hp_open.c
Text conflict in Percona-Server/storage/heap/hp_panic.c
Text conflict in Percona-Server/storage/heap/hp_rename.c
Text conflict in Percona-Server/storage/heap/hp_rkey.c
Text conflict in Percona-Server/storage/heap/hp_static.c
Text conflict in Percona-Server/storage/heap/hp_test1.c
Conflict adding files to Percona-Server/storage/innobase.  Created directory.
Conflict because Percona-Server/storage/innobase is not versioned, but has versioned children.  Versioned directory.
Conflict adding file Percona-Server/storage/innobase.  Moved existing file to Percona-Server/storage/innobase.moved.
Text conflict in Percona-Server/storage/innobase.moved/btr/btr0pcur.c
Text conflict in Percona-Server/storage/innobase.moved/btr/btr0sea.c
Text conflict in Percona-Server/storage/innobase.moved/buf/buf0buddy.c
Text conflict in Percona-Server/storage/innobase.moved/buf/buf0buf.c
Text conflict in Percona-Server/storage/innobase.moved/buf/buf0flu.c
Text conflict in Percona-Server/storage/innobase.moved/buf/buf0lru.c
Text conflict in Percona-Server/storage/innobase.moved/buf/buf0rea.c
Text conflict in Percona-Server/storage/innobase.moved/dict/dict0dict.c
Text conflict in Percona-Server/storage/innobase.moved/dyn/dyn0dyn.c
Text conflict in Percona-Server/storage/innobase.moved/fil/fil0fil.c
Text conflict in Percona-Server/storage/innobase.moved/handler/ha_innodb.cc
Text conflict in Percona-Server/storage/innobase.moved/handler/i_s.cc
Contents conflict in Percona-Server/storage/innobase.moved/handler/mysql_addons.cc
Text conflict in Percona-Server/storage/innobase.moved/ibuf/ibuf0ibuf.c
Text conflict in Percona-Server/storage/innobase.moved/include/buf0flu.h
Text conflict in Percona-Server/storage/innobase.moved/include/buf0lru.h
Text conflict in Percona-Server/storage/innobase.moved/include/db0err.h
Text conflict in Percona-Server/storage/innobase.moved/include/dict0types.h
Text conflict in Percona-Server/storage/innobase.moved/include/dyn0dyn.h
Text conflict in Percona-Server/storage/innobase.moved/include/dyn0dyn.ic
Text conflict in Percona-Server/storage/innobase.moved/include/fsp0fsp.ic
Contents conflict in Percona-Server/storage/innobase.moved/include/fsp0types.h
Text conflict in Percona-Server/storage/innobase.moved/include/ha_prototypes.h
Contents conflict in Percona-Server/storage/innobase.moved/include/mysql_addons.h
Contents conflict in Percona-Server/storage/innobase.moved/include/srv0que.h
Text conflict in Percona-Server/storage/innobase.moved/include/sync0sync.h
Contents conflict in Percona-Server/storage/innobase.moved/include/thr0loc.h
Contents conflict in Percona-Server/storage/innobase.moved/include/thr0loc.ic
Contents conflict in Percona-Server/storage/innobase.moved/include/ut0rbt.h
Text conflict in Percona-Server/storage/innobase.moved/mach/mach0data.c
Text conflict in Percona-Server/storage/innobase.moved/pars/lexyy.c
Text conflict in Percona-Server/storage/innobase.moved/pars/make_bison.sh
Text conflict in Percona-Server/storage/innobase.moved/pars/make_flex.sh
Text conflict in Percona-Server/storage/innobase.moved/pars/pars0grm.c
Text conflict in Percona-Server/storage/innobase.moved/pars/pars0grm.y
Text conflict in Percona-Server/storage/innobase.moved/pars/pars0lex.l
Text conflict in Percona-Server/storage/innobase.moved/pars/pars0opt.c
Text conflict in Percona-Server/storage/innobase.moved/pars/pars0pars.c
Text conflict in Percona-Server/storage/innobase.moved/pars/pars0sym.c
Text conflict in Percona-Server/storage/innobase.moved/que/que0que.c
Text conflict in Percona-Server/storage/innobase.moved/read/read0read.c
Text conflict in Percona-Server/storage/innobase.moved/row/row0merge.c
Text conflict in Percona-Server/storage/innobase.moved/row/row0mysql.c
Text conflict in Percona-Server/storage/innobase.moved/row/row0sel.c
Text conflict in Percona-Server/storage/innobase.moved/row/row0umod.c
Contents conflict in Percona-Server/storage/innobase.moved/srv/srv0que.c
Text conflict in Percona-Server/storage/innobase.moved/srv/srv0srv.c
Text conflict in Percona-Server/storage/innobase.moved/sync/sync0arr.c
Text conflict in Percona-Server/storage/innobase.moved/sync/sync0rw.c
Text conflict in Percona-Server/storage/innobase.moved/sync/sync0sync.c
Contents conflict in Percona-Server/storage/innobase.moved/ut/ut0auxconf_atomic_pthread_t_gcc.c
Contents conflict in Percona-Server/storage/innobase.moved/ut/ut0auxconf_atomic_pthread_t_solaris.c
Contents conflict in Percona-Server/storage/innobase.moved/ut/ut0auxconf_have_gcc_atomics.c
Contents conflict in Percona-Server/storage/innobase.moved/ut/ut0auxconf_have_solaris_atomics.c
Contents conflict in Percona-Server/storage/innobase.moved/ut/ut0auxconf_pause.c
Contents conflict in Percona-Server/storage/innobase.moved/ut/ut0auxconf_sizeof_pthread_t.c
Contents conflict in Percona-Server/storage/innobase.moved/ut/ut0rbt.c
Text conflict in Percona-Server/storage/innobase.moved/ut/ut0ut.c
Contents conflict in Percona-Server/storage/innobase/Makefile.am
Conflict adding files to Percona-Server/storage/innobase/dict.  Created directory.
Conflict because Percona-Server/storage/innobase/dict is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to Percona-Server/storage/innobase/handler.  Created directory.
Conflict because Percona-Server/storage/innobase/handler is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to Percona-Server/storage/innobase/ibuf.  Created directory.
Conflict because Percona-Server/storage/innobase/ibuf is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to Percona-Server/storage/innobase/include.  Created directory.
Conflict because Percona-Server/storage/innobase/include is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to Percona-Server/storage/innobase/log.  Created directory.
Conflict because Percona-Server/storage/innobase/log is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to Percona-Server/storage/innobase/pars.  Created directory.
Conflict because Percona-Server/storage/innobase/pars is not versioned, but has versioned children.  Versioned directory.
Contents conflict in Percona-Server/storage/innobase/pars/pars0grm.h
Conflict adding files to Percona-Server/storage/innobase/row.  Created directory.
Conflict because Percona-Server/storage/innobase/row is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to Percona-Server/storage/innobase/srv.  Created directory.
Conflict because Percona-Server/storage/innobase/srv is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to Percona-Server/storage/innobase/sync.  Created directory.
Conflict because Percona-Server/storage/innobase/sync is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to Percona-Server/storage/innodb_plugin.  Created directory.
Conflict because Percona-Server/storage/innodb_plugin is not versioned, but has versioned children.  Versioned directory.
Contents conflict in Percona-Server/storage/innodb_plugin/CMakeLists.txt
Contents conflict in Percona-Server/storage/innodb_plugin/COPYING
Contents conflict in Percona-Server/storage/innodb_plugin/ChangeLog
Contents conflict in Percona-Server/storage/innodb_plugin/Makefile.am
Contents conflict in Percona-Server/storage/innodb_plugin/compile-innodb-debug
Contents conflict in Percona-Server/storage/innodb_plugin/plug.in
Contents conflict in Percona-Server/storage/innodb_plugin/setup.sh
Conflict adding files to Percona-Server/storage/innodb_plugin/thr.  Created directory.
Conflict because Percona-Server/storage/innodb_plugin/thr is not versioned, but has versioned children.  Versioned directory.
Contents conflict in Percona-Server/storage/innodb_plugin/thr/thr0loc.c
Contents conflict in Percona-Server/storage/myisam/Makefile.am
Text conflict in Percona-Server/storage/myisam/ft_boolean_search.c
Contents conflict in Percona-Server/storage/myisam/ft_eval.c
Contents conflict in Percona-Server/storage/myisam/ft_eval.h
Text conflict in Percona-Server/storage/myisam/ft_nlq_search.c
Text conflict in Percona-Server/storage/myisam/ft_static.c
Contents conflict in Percona-Server/storage/myisam/ft_stem.c
Contents conflict in Percona-Server/storage/myisam/ft_test1.c
Contents conflict in Percona-Server/storage/myisam/ft_test1.h
Text conflict in Percona-Server/storage/myisam/ft_update.c
Text conflict in Percona-Server/storage/myisam/ftbench/ft-test-run.sh
Text conflict in Percona-Server/storage/myisam/mi_cache.c
Text conflict in Percona-Server/storage/myisam/mi_changed.c
Text conflict in Percona-Server/storage/myisam/mi_info.c
Text conflict in Percona-Server/storage/myisam/mi_key.c
Text conflict in Percona-Server/storage/myisam/mi_keycache.c
Text conflict in Percona-Server/storage/myisam/mi_log.c
Text conflict in Percona-Server/storage/myisam/mi_panic.c
Text conflict in Percona-Server/storage/myisam/mi_rename.c
Text conflict in Percona-Server/storage/myisam/mi_rkey.c
Text conflict in Percona-Server/storage/myisam/mi_rnext_same.c
Text conflict in Percona-Server/storage/myisam/mi_rprev.c
Text conflict in Percona-Server/storage/myisam/mi_rsame.c
Text conflict in Percona-Server/storage/myisam/mi_statrec.c
Text conflict in Percona-Server/storage/myisam/mi_test3.c
Text conflict in Percona-Server/storage/myisam/mi_test_all.sh
Text conflict in Percona-Server/storage/myisam/myisamchk.c
Text conflict in Percona-Server/storage/myisam/rt_test.c
Text conflict in Percona-Server/storage/myisam/sp_key.c
Text conflict in Percona-Server/storage/myisam/sp_test.c
Contents conflict in Percona-Server/storage/myisammrg/Makefile.am
Text conflict in Percona-Server/storage/myisammrg/myrg_close.c
Text conflict in Percona-Server/storage/myisammrg/myrg_def.h
Text conflict in Percona-Server/storage/myisammrg/myrg_extra.c
Text conflict in Percona-Server/storage/myisammrg/myrg_queue.c
Text conflict in Percona-Server/storage/myisammrg/myrg_static.c
Text conflict in Percona-Server/storage/ndb/src/kernel/blocks/backup/read.cpp
Text conflict in Percona-Server/storage/ndb/test/ndbnet/test.run
Text conflict in Percona-Server/storage/ndb/test/ndbnet/testError.run
Text conflict in Percona-Server/storage/ndb/test/ndbnet/testMNF.run
Text conflict in Percona-Server/storage/ndb/test/ndbnet/testNR.run
Text conflict in Percona-Server/storage/ndb/test/ndbnet/testNR1.run
Text conflict in Percona-Server/storage/ndb/test/ndbnet/testNR4.run
Text conflict in Percona-Server/storage/ndb/test/ndbnet/testSRhang.run
Text conflict in Percona-Server/storage/ndb/test/ndbnet/testTR295.run
Text conflict in Percona-Server/storage/ndb/test/run-test/atrt-analyze-result.sh
Text conflict in Percona-Server/storage/ndb/test/run-test/atrt-clear-result.sh
Text conflict in Percona-Server/storage/ndb/test/run-test/atrt-gather-result.sh
Text conflict in Percona-Server/storage/ndb/test/run-test/atrt-mysql-test-run
Text conflict in Percona-Server/storage/ndb/test/run-test/atrt-setup.sh
Text conflict in Percona-Server/storage/ndb/test/run-test/atrt-testBackup
Text conflict in Percona-Server/storage/ndb/test/run-test/atrt.hpp
Text conflict in Percona-Server/storage/ndb/test/run-test/make-config.sh
Text conflict in Percona-Server/storage/ndb/test/run-test/make-html-reports.sh
Text conflict in Percona-Server/storage/ndb/test/run-test/make-index.sh
Text conflict in Percona-Server/storage/ndb/test/run-test/ndb-autotest.sh
Contents conflict in Percona-Server/strings/bfill.c
Contents conflict in Percona-Server/strings/bmove.c
Contents conflict in Percona-Server/strings/bmove512.c
Contents conflict in Percona-Server/strings/bmove_upp-sparc.s
Text conflict in Percona-Server/strings/bmove_upp.c
Text conflict in Percona-Server/strings/ctype-mb.c
Text conflict in Percona-Server/strings/ctype-simple.c
Text conflict in Percona-Server/strings/ctype-uca.c
Text conflict in Percona-Server/strings/ctype-utf8.c
Text conflict in Percona-Server/strings/decimal.c
Text conflict in Percona-Server/strings/do_ctype.c
Text conflict in Percona-Server/strings/int2str.c
Contents conflict in Percona-Server/strings/longlong2str-x86.s
Text conflict in Percona-Server/strings/longlong2str.c
Contents conflict in Percona-Server/strings/longlong2str_asm.c
Contents conflict in Percona-Server/strings/macros.asm
Contents conflict in Percona-Server/strings/my_strtoll10-x86.s
Text conflict in Percona-Server/strings/my_strtoll10.c
Contents conflict in Percona-Server/strings/ptr_cmp.asm
Contents conflict in Percona-Server/strings/r_strinstr.c
Text conflict in Percona-Server/strings/str_alloc.c
Contents conflict in Percona-Server/strings/strappend-sparc.s
Text conflict in Percona-Server/strings/strcend.c
Contents conflict in Percona-Server/strings/strend-sparc.s
Text conflict in Percona-Server/strings/strend.c
Contents conflict in Percona-Server/strings/strings-not-used.h
Contents conflict in Percona-Server/strings/strings-x86.s
Contents conflict in Percona-Server/strings/strings.asm
Contents conflict in Percona-Server/strings/strinstr-sparc.s
Contents conflict in Percona-Server/strings/strinstr.c
Contents conflict in Percona-Server/strings/strmake-sparc.s
Contents conflict in Percona-Server/strings/strmov-sparc.s
Text conflict in Percona-Server/strings/strmov.c
Contents conflict in Percona-Server/strings/strnmov-sparc.s
Contents conflict in Percona-Server/strings/strstr-sparc.s
Contents conflict in Percona-Server/strings/strstr.c
Contents conflict in Percona-Server/strings/strto.c
Contents conflict in Percona-Server/strings/strtol.c
Contents conflict in Percona-Server/strings/strtoll.c
Contents conflict in Percona-Server/strings/strtoul.c
Contents conflict in Percona-Server/strings/strtoull.c
Contents conflict in Percona-Server/strings/strxmov-sparc.s
Contents conflict in Percona-Server/strings/strxmov.asm
Contents conflict in Percona-Server/strings/udiv.c
Contents conflict in Percona-Server/support-files/MacOSX/Makefile.am
Text conflict in Percona-Server/support-files/MySQL-shared-compat.spec.sh
Contents conflict in Percona-Server/support-files/RHEL4-SElinux/Makefile.am
Text conflict in Percona-Server/support-files/mysql.server.sh
Text conflict in Percona-Server/support-files/mysql.spec.sh
Text conflict in Percona-Server/tests/CMakeLists.txt
Contents conflict in Percona-Server/tests/Makefile.am
Text conflict in Percona-Server/tests/big_record.pl
Text conflict in Percona-Server/tests/thread_test.c
Contents conflict in Percona-Server/unittest/Makefile.am
Contents conflict in Percona-Server/unittest/mytap/Makefile.am
Contents conflict in Percona-Server/unittest/mytap/t/Makefile.am
Text conflict in Percona-Server/vio/CMakeLists.txt
Contents conflict in Percona-Server/vio/Makefile.am
Text conflict in Percona-Server/vio/test-ssl.c
Text conflict in Percona-Server/vio/test-sslclient.c
Text conflict in Percona-Server/vio/test-sslserver.c
Text conflict in Percona-Server/vio/viossl.c
Text conflict in Percona-Server/vio/viosslfactories.c
Text conflict in Percona-Server/vio/viotest-ssl.c
Contents conflict in Percona-Server/win/build-nmake-x64.bat
Contents conflict in Percona-Server/win/build-nmake.bat
Contents conflict in Percona-Server/win/build-vs71.bat
Contents conflict in Percona-Server/win/build-vs8.bat
Contents conflict in Percona-Server/win/create_manifest.js
Contents conflict in Percona-Server/win/mysql_manifest.cmake
Text conflict in Percona-Server/zlib/CMakeLists.txt
Contents conflict in Percona-Server/zlib/Makefile.am
Text conflict in build/build-binary.sh
Text conflict in build/build-dpkg.sh
Text conflict in build/build-rpm.sh
Text conflict in build/debian/changelog
Text conflict in build/debian/rules
Text conflict in build/percona-server.spec
Text conflict in build/percona-shared-compat.spec
Text conflict in doc/source/conf.py
Text conflict in doc/source/copyright.rst
Text conflict in doc/source/faq.rst
Contents conflict in doc/source/release-notes/Percona-Server-5.1.67-14.4.rst
Contents conflict in doc/source/release-notes/Percona-Server-5.1.68-14.5.rst
Contents conflict in doc/source/release-notes/Percona-Server-5.1.68-14.6.rst
Text conflict in doc/source/release-notes/release-notes_index.rst
Contents conflict in doc/source/scalability/innodb_io.rst
Text conflict in doc/source/upstream-bug-fixes.rst
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/merge-5.1.72
Reviewer Review Type Date Requested Status
Percona core Pending
Review via email: mp+190646@code.launchpad.net

Description of the change

Merge MySQL 5.1.72.

http://jenkins.percona.com/job/percona-server-5.1-param/578/

Merge MySQL 5.1.72, implementing
https://blueprints.launchpad.net/percona-server/+spec/merge-5.1.72.

An automerge, with the exception of changes in buf_page_get_gen() for
http://bugs.mysql.com/bug.php?id=61132.

Import updated man pages from mysql-5.1.72.tar.gz.

To post a comment you must log in.
595. By Laurynas Biveinis

Automerge lp:~laurynas-biveinis/percona-server/bug1188168-5.1

596. By Laurynas Biveinis

Merge MySQL 5.1.72, implementing
https://blueprints.launchpad.net/percona-server/+spec/merge-5.1.72.

An automerge, with the exception of changes in buf_page_get_gen() for
http://bugs.mysql.com/bug.php?id=61132.

Import updated man pages from mysql-5.1.72.tar.gz.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2013-08-27 14:41:58 +0000
3+++ Makefile 2013-10-11 13:09:36 +0000
4@@ -1,5 +1,10 @@
5+<<<<<<< TREE
6 MYSQL_VERSION=5.5.33
7 PERCONA_SERVER_VERSION=rel31.1
8+=======
9+MYSQL_VERSION=5.1.72
10+PERCONA_SERVER_VERSION=rel14.10
11+>>>>>>> MERGE-SOURCE
12 PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
13 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
14 PERCONA_SERVER_SHORT_2 ?=Percona-Server
15
16=== added file 'Percona-Server/BUILD/Makefile.am.OTHER'
17--- Percona-Server/BUILD/Makefile.am.OTHER 1970-01-01 00:00:00 +0000
18+++ Percona-Server/BUILD/Makefile.am.OTHER 2013-10-11 13:09:36 +0000
19@@ -0,0 +1,82 @@
20+# Copyright (c) 2002, 2004-2008 MySQL AB
21+#
22+# This program is free software; you can redistribute it and/or
23+# modify it under the terms of the GNU Library General Public
24+# License as published by the Free Software Foundation; version 2
25+# of the License.
26+#
27+# This program is distributed in the hope that it will be useful,
28+# but WITHOUT ANY WARRANTY; without even the implied warranty of
29+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
30+# Library General Public License for more details.
31+#
32+# You should have received a copy of the GNU Library General Public
33+# License along with this library; if not, write to the Free
34+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
35+# MA 02110-1301, USA
36+
37+## Process this file with automake to create Makefile.in
38+
39+EXTRA_DIST = FINISH.sh \
40+ SETUP.sh \
41+ autorun.sh \
42+ build_mccge.sh \
43+ check-cpu \
44+ cleanup \
45+ compile-alpha \
46+ compile-alpha-ccc \
47+ compile-alpha-cxx \
48+ compile-alpha-debug \
49+ compile-amd64-debug-max \
50+ compile-amd64-debug-max-no-ndb \
51+ compile-amd64-gcov \
52+ compile-amd64-gprof \
53+ compile-amd64-max \
54+ compile-amd64-max-sci \
55+ compile-amd64-valgrind-max \
56+ compile-darwin-mwcc \
57+ compile-dist \
58+ compile-hpux11-parisc2-aCC \
59+ compile-ia64-debug-max \
60+ compile-irix-mips64-mipspro \
61+ compile-pentium \
62+ compile-pentium-debug \
63+ compile-pentium-debug-max \
64+ compile-pentium-debug-max-no-embedded \
65+ compile-pentium-debug-max-no-ndb \
66+ compile-pentium-debug-openssl \
67+ compile-pentium-debug-yassl \
68+ compile-pentium-gcov \
69+ compile-pentium-gprof \
70+ compile-pentium-icc \
71+ compile-pentium-icc-valgrind-max \
72+ compile-pentium-icc-yassl \
73+ compile-pentium-max \
74+ compile-pentium-myodbc \
75+ compile-pentium-mysqlfs-debug \
76+ compile-pentium-pgcc \
77+ compile-pentium-valgrind-max \
78+ compile-pentium64 \
79+ compile-pentium64-debug \
80+ compile-pentium64-debug-max \
81+ compile-pentium64-gcov \
82+ compile-pentium64-gprof \
83+ compile-pentium64-max \
84+ compile-pentium64-max-sci \
85+ compile-pentium64-valgrind-max \
86+ compile-ppc \
87+ compile-ppc-debug \
88+ compile-ppc-debug-max \
89+ compile-ppc-debug-max-no-ndb \
90+ compile-ppc-max \
91+ compile-solaris-amd64 \
92+ compile-solaris-amd64-debug \
93+ compile-solaris-amd64-forte \
94+ compile-solaris-amd64-forte-debug \
95+ compile-solaris-sparc \
96+ compile-solaris-sparc-debug \
97+ compile-solaris-sparc-forte \
98+ compile-solaris-sparc-purify
99+
100+# Don't update the files from bitkeeper
101+%::SCCS/s.%
102
103=== modified file 'Percona-Server/BUILD/autorun.sh'
104--- Percona-Server/BUILD/autorun.sh 2013-03-20 16:52:15 +0000
105+++ Percona-Server/BUILD/autorun.sh 2013-10-11 13:09:36 +0000
106@@ -1,6 +1,10 @@
107 #!/bin/sh
108
109+<<<<<<< TREE
110 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
111+=======
112+# Copyright (c) 2005-2007 MySQL AB
113+>>>>>>> MERGE-SOURCE
114 #
115 # This program is free software; you can redistribute it and/or
116 # modify it under the terms of the GNU Library General Public
117@@ -14,8 +18,13 @@
118 #
119 # You should have received a copy of the GNU Library General Public
120 # License along with this library; if not, write to the Free
121+<<<<<<< TREE
122 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
123 # MA 02110-1301, USA
124+=======
125+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
126+# MA 02110-1301, USA
127+>>>>>>> MERGE-SOURCE
128
129 # Create MySQL cmake configure wrapper
130
131
132=== modified file 'Percona-Server/BUILD/build_mccge.sh'
133--- Percona-Server/BUILD/build_mccge.sh 2013-03-20 16:52:15 +0000
134+++ Percona-Server/BUILD/build_mccge.sh 2013-10-11 13:09:36 +0000
135@@ -14,8 +14,13 @@
136 #
137 # You should have received a copy of the GNU Library General Public
138 # License along with this library; if not, write to the Free
139+<<<<<<< TREE
140 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
141 # MA 02110-1301, USA
142+=======
143+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
144+# MA 02110-1301, USA
145+>>>>>>> MERGE-SOURCE
146
147 die()
148 {
149
150=== added file 'Percona-Server/BUILD/compile-alpha-ccc.OTHER'
151--- Percona-Server/BUILD/compile-alpha-ccc.OTHER 1970-01-01 00:00:00 +0000
152+++ Percona-Server/BUILD/compile-alpha-ccc.OTHER 2013-10-11 13:09:36 +0000
153@@ -0,0 +1,56 @@
154+#! /bin/sh
155+
156+# Copyright (c) 2000, 2005, 2007 MySQL AB
157+#
158+# This program is free software; you can redistribute it and/or modify
159+# it under the terms of the GNU General Public License as published by
160+# the Free Software Foundation; version 2 of the License.
161+#
162+# This program is distributed in the hope that it will be useful,
163+# but WITHOUT ANY WARRANTY; without even the implied warranty of
164+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
165+# GNU General Public License for more details.
166+#
167+# You should have received a copy of the GNU General Public License
168+# along with this program; if not, write to the Free Software
169+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
170+
171+/bin/rm -f */.deps/*.P */*.o
172+make -k maintainer-clean
173+/bin/rm -f */.deps/*.P */*.o
174+/bin/rm -f config.cache mysql-*.tar.gz
175+
176+path=`dirname $0`
177+. "$path/autorun.sh"
178+
179+CC=ccc CFLAGS="-fast -O3 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -mcpu=ev6 -Wa,-mev6" CXXLDFLAGS='/usr/lib/compaq/libots-2.2.7/libots.so /usr/lib/compaq/cpml-5.0.0/libcpml_ev6.a' ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client
180+make
181+rm */.deps/*
182+make
183+if [ $? = 0 ]
184+then
185+ rm */.deps/*
186+ bin/mysqladmin shutdown
187+ sur make install
188+ if [ $? = 0 ]
189+ then
190+ scripts/make_binary_distribution
191+ fi
192+fi
193+
194+exit
195+
196+# This should give better performance by compiling many files at once, but
197+# according to our benchmarks there isn't any real difference.
198+
199+pwd=`pwd`
200+for i in */make-ccc
201+do
202+ cd `dirname $i`
203+ make-ccc
204+ cd $pwd
205+done
206+cd sql
207+rm mysqld .deps/*.P
208+make mysqld
209+cd $pwd
210
211=== added file 'Percona-Server/BUILD/compile-alpha-cxx.OTHER'
212--- Percona-Server/BUILD/compile-alpha-cxx.OTHER 1970-01-01 00:00:00 +0000
213+++ Percona-Server/BUILD/compile-alpha-cxx.OTHER 2013-10-11 13:09:36 +0000
214@@ -0,0 +1,58 @@
215+#! /bin/sh
216+
217+# Copyright (c) 2000, 2001, 2003, 2005-2007 MySQL AB
218+#
219+# This program is free software; you can redistribute it and/or modify
220+# it under the terms of the GNU General Public License as published by
221+# the Free Software Foundation; version 2 of the License.
222+#
223+# This program is distributed in the hope that it will be useful,
224+# but WITHOUT ANY WARRANTY; without even the implied warranty of
225+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
226+# GNU General Public License for more details.
227+#
228+# You should have received a copy of the GNU General Public License
229+# along with this program; if not, write to the Free Software
230+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
231+
232+/bin/rm -f */.deps/*.P */*.o
233+make -k maintainer-clean
234+/bin/rm -f */.deps/*.P */*.o
235+/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache mysql-*.tar.gz
236+
237+path=`dirname $0`
238+. "$path/autorun.sh"
239+
240+CC=ccc CFLAGS="-fast" CXX=cxx CXXFLAGS="-fast -noexceptions -nortti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-non_shared --with-client-ldflags=-non_shared --without-extra-tools --disable-dependency-tracking
241+
242+make -j2
243+find . -name ".deps" | xargs rm -r
244+make
245+if [ $? = 0 ]
246+then
247+ find . -name ".deps" | xargs rm -r
248+ bin/mysqladmin shutdown
249+ sur make install
250+ if [ $? = 0 ]
251+ then
252+ scripts/make_binary_distribution
253+ fi
254+ make test
255+fi
256+
257+exit
258+
259+# This should give better performance by compiling many files at once, but
260+# according to our benchmarks there isn't any real difference.
261+
262+pwd=`pwd`
263+for i in */make-ccc
264+do
265+ cd `dirname $i`
266+ make-ccc
267+ cd $pwd
268+done
269+cd sql
270+rm mysqld .deps/*.P
271+make mysqld
272+cd $pwd
273
274=== modified file 'Percona-Server/BUILD/compile-alpha-debug'
275--- Percona-Server/BUILD/compile-alpha-debug 2013-03-20 16:52:15 +0000
276+++ Percona-Server/BUILD/compile-alpha-debug 2013-10-11 13:09:36 +0000
277@@ -1,7 +1,11 @@
278 #! /bin/sh
279
280+<<<<<<< TREE
281 # Copyright (c) 2000, 2001, 2005-2007 MySQL AB
282 # Use is subject to license terms
283+=======
284+# Copyright (c) 2000, 2001, 2005-2007 MySQL AB
285+>>>>>>> MERGE-SOURCE
286 #
287 # This program is free software; you can redistribute it and/or modify
288 # it under the terms of the GNU General Public License as published by
289
290=== modified file 'Percona-Server/BUILD/compile-amd64-debug-max'
291--- Percona-Server/BUILD/compile-amd64-debug-max 2013-03-20 16:52:15 +0000
292+++ Percona-Server/BUILD/compile-amd64-debug-max 2013-10-11 13:09:36 +0000
293@@ -1,7 +1,11 @@
294 #! /bin/sh
295
296+<<<<<<< TREE
297 # Copyright (c) 2005, 2006 MySQL AB
298 # Use is subject to license terms
299+=======
300+# Copyright (c) 2005, 2006 MySQL AB
301+>>>>>>> MERGE-SOURCE
302 #
303 # This program is free software; you can redistribute it and/or modify
304 # it under the terms of the GNU General Public License as published by
305
306=== modified file 'Percona-Server/BUILD/compile-amd64-max'
307--- Percona-Server/BUILD/compile-amd64-max 2013-03-20 16:52:15 +0000
308+++ Percona-Server/BUILD/compile-amd64-max 2013-10-11 13:09:36 +0000
309@@ -1,7 +1,11 @@
310 #! /bin/sh
311
312+<<<<<<< TREE
313 # Copyright (c) 2005, 2006 MySQL AB
314 # Use is subject to license terms
315+=======
316+# Copyright (c) 2005, 2006 MySQL AB
317+>>>>>>> MERGE-SOURCE
318 #
319 # This program is free software; you can redistribute it and/or modify
320 # it under the terms of the GNU General Public License as published by
321
322=== modified file 'Percona-Server/BUILD/compile-amd64-valgrind-max'
323=== modified file 'Percona-Server/BUILD/compile-darwin-mwcc'
324--- Percona-Server/BUILD/compile-darwin-mwcc 2013-03-20 16:52:15 +0000
325+++ Percona-Server/BUILD/compile-darwin-mwcc 2013-10-11 13:09:36 +0000
326@@ -1,7 +1,11 @@
327 #! /bin/sh
328
329+<<<<<<< TREE
330 # Copyright (c) 2005, 2006 MySQL AB
331 # Use is subject to license terms
332+=======
333+# Copyright (c) 2005, 2006 MySQL AB
334+>>>>>>> MERGE-SOURCE
335 #
336 # This program is free software; you can redistribute it and/or modify
337 # it under the terms of the GNU General Public License as published by
338
339=== modified file 'Percona-Server/BUILD/compile-hpux11-parisc2-aCC'
340--- Percona-Server/BUILD/compile-hpux11-parisc2-aCC 2013-03-20 16:52:15 +0000
341+++ Percona-Server/BUILD/compile-hpux11-parisc2-aCC 2013-10-11 13:09:36 +0000
342@@ -1,7 +1,11 @@
343 #!/bin/sh
344
345+<<<<<<< TREE
346 # Copyright (c) 2004, 2005, 2007 MySQL AB
347 # Use is subject to license terms
348+=======
349+# Copyright (c) 2004, 2005, 2007 MySQL AB
350+>>>>>>> MERGE-SOURCE
351 #
352 # This program is free software; you can redistribute it and/or modify
353 # it under the terms of the GNU General Public License as published by
354
355=== modified file 'Percona-Server/BUILD/compile-ia64-debug-max'
356--- Percona-Server/BUILD/compile-ia64-debug-max 2013-03-20 16:52:15 +0000
357+++ Percona-Server/BUILD/compile-ia64-debug-max 2013-10-11 13:09:36 +0000
358@@ -1,6 +1,10 @@
359 #! /bin/sh
360
361+<<<<<<< TREE
362 # Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
363+=======
364+# Copyright (c) 2001, 2005-2007 MySQL AB
365+>>>>>>> MERGE-SOURCE
366 #
367 # This program is free software; you can redistribute it and/or modify
368 # it under the terms of the GNU General Public License as published by
369@@ -13,7 +17,11 @@
370 #
371 # You should have received a copy of the GNU General Public License
372 # along with this program; if not, write to the Free Software
373+<<<<<<< TREE
374 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
375+=======
376+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
377+>>>>>>> MERGE-SOURCE
378
379 gmake -k maintainer-clean || true
380 /bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache
381
382=== modified file 'Percona-Server/BUILD/compile-irix-mips64-mipspro'
383--- Percona-Server/BUILD/compile-irix-mips64-mipspro 2013-03-20 16:52:15 +0000
384+++ Percona-Server/BUILD/compile-irix-mips64-mipspro 2013-10-11 13:09:36 +0000
385@@ -1,7 +1,11 @@
386 #!/bin/sh
387
388+<<<<<<< TREE
389 # Copyright (c) 2004, 2005, 2007 MySQL AB
390 # Use is subject to license terms
391+=======
392+# Copyright (c) 2004, 2005, 2007 MySQL AB
393+>>>>>>> MERGE-SOURCE
394 #
395 # This program is free software; you can redistribute it and/or modify
396 # it under the terms of the GNU General Public License as published by
397
398=== modified file 'Percona-Server/BUILD/compile-ndb-autotest'
399=== modified file 'Percona-Server/BUILD/compile-pentium'
400--- Percona-Server/BUILD/compile-pentium 2013-03-20 16:52:15 +0000
401+++ Percona-Server/BUILD/compile-pentium 2013-10-11 13:09:36 +0000
402@@ -1,7 +1,11 @@
403 #! /bin/sh
404
405+<<<<<<< TREE
406 # Copyright (c) 2000-2002, 2007 MySQL AB
407 # Use is subject to license terms
408+=======
409+# Copyright (c) 2000-2002, 2007 MySQL AB
410+>>>>>>> MERGE-SOURCE
411 #
412 # This program is free software; you can redistribute it and/or modify
413 # it under the terms of the GNU General Public License as published by
414
415=== modified file 'Percona-Server/BUILD/compile-pentium-debug'
416--- Percona-Server/BUILD/compile-pentium-debug 2013-03-20 16:52:15 +0000
417+++ Percona-Server/BUILD/compile-pentium-debug 2013-10-11 13:09:36 +0000
418@@ -13,7 +13,11 @@
419 #
420 # You should have received a copy of the GNU General Public License
421 # along with this program; if not, write to the Free Software
422+<<<<<<< TREE
423 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
424+=======
425+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
426+>>>>>>> MERGE-SOURCE
427
428 path=`dirname $0`
429 . "$path/SETUP.sh"
430
431=== modified file 'Percona-Server/BUILD/compile-pentium-debug-max'
432--- Percona-Server/BUILD/compile-pentium-debug-max 2013-03-20 16:52:15 +0000
433+++ Percona-Server/BUILD/compile-pentium-debug-max 2013-10-11 13:09:36 +0000
434@@ -13,7 +13,11 @@
435 #
436 # You should have received a copy of the GNU General Public License
437 # along with this program; if not, write to the Free Software
438+<<<<<<< TREE
439 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
440+=======
441+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
442+>>>>>>> MERGE-SOURCE
443
444 path=`dirname $0`
445 . "$path/SETUP.sh"
446
447=== modified file 'Percona-Server/BUILD/compile-pentium-debug-max-no-embedded'
448--- Percona-Server/BUILD/compile-pentium-debug-max-no-embedded 2013-03-20 16:52:15 +0000
449+++ Percona-Server/BUILD/compile-pentium-debug-max-no-embedded 2013-10-11 13:09:36 +0000
450@@ -1,7 +1,11 @@
451 #! /bin/sh
452
453+<<<<<<< TREE
454 # Copyright (c) 2004-2006 MySQL AB
455 # Use is subject to license terms
456+=======
457+# Copyright (c) 2004-2006 MySQL AB
458+>>>>>>> MERGE-SOURCE
459 #
460 # This program is free software; you can redistribute it and/or modify
461 # it under the terms of the GNU General Public License as published by
462
463=== modified file 'Percona-Server/BUILD/compile-pentium-debug-max-no-ndb'
464=== modified file 'Percona-Server/BUILD/compile-pentium-debug-openssl'
465--- Percona-Server/BUILD/compile-pentium-debug-openssl 2013-03-20 16:52:15 +0000
466+++ Percona-Server/BUILD/compile-pentium-debug-openssl 2013-10-11 13:09:36 +0000
467@@ -1,6 +1,10 @@
468 #! /bin/sh
469
470+<<<<<<< TREE
471 # Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
472+=======
473+# Copyright (c) 2001, 2003, 2006 MySQL AB
474+>>>>>>> MERGE-SOURCE
475 #
476 # This program is free software; you can redistribute it and/or modify
477 # it under the terms of the GNU General Public License as published by
478@@ -13,7 +17,11 @@
479 #
480 # You should have received a copy of the GNU General Public License
481 # along with this program; if not, write to the Free Software
482+<<<<<<< TREE
483 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
484+=======
485+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
486+>>>>>>> MERGE-SOURCE
487
488 path=`dirname $0`
489 . "$path/SETUP.sh"
490
491=== modified file 'Percona-Server/BUILD/compile-pentium-debug-yassl'
492--- Percona-Server/BUILD/compile-pentium-debug-yassl 2013-03-20 16:52:15 +0000
493+++ Percona-Server/BUILD/compile-pentium-debug-yassl 2013-10-11 13:09:36 +0000
494@@ -1,6 +1,10 @@
495 #! /bin/sh
496
497+<<<<<<< TREE
498 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
499+=======
500+# Copyright (c) 2005, 2006 MySQL AB
501+>>>>>>> MERGE-SOURCE
502 #
503 # This program is free software; you can redistribute it and/or modify
504 # it under the terms of the GNU General Public License as published by
505@@ -13,7 +17,11 @@
506 #
507 # You should have received a copy of the GNU General Public License
508 # along with this program; if not, write to the Free Software
509+<<<<<<< TREE
510 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
511+=======
512+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
513+>>>>>>> MERGE-SOURCE
514
515 path=`dirname $0`
516 . "$path/SETUP.sh"
517
518=== modified file 'Percona-Server/BUILD/compile-pentium-max'
519--- Percona-Server/BUILD/compile-pentium-max 2013-03-20 16:52:15 +0000
520+++ Percona-Server/BUILD/compile-pentium-max 2013-10-11 13:09:36 +0000
521@@ -1,7 +1,11 @@
522 #! /bin/sh
523
524+<<<<<<< TREE
525 # Copyright (c) 2001-2006 MySQL AB
526 # Use is subject to license terms
527+=======
528+# Copyright (c) 2001-2006 MySQL AB
529+>>>>>>> MERGE-SOURCE
530 #
531 # This program is free software; you can redistribute it and/or modify
532 # it under the terms of the GNU General Public License as published by
533
534=== modified file 'Percona-Server/BUILD/compile-pentium-pgcc'
535--- Percona-Server/BUILD/compile-pentium-pgcc 2013-03-20 16:52:15 +0000
536+++ Percona-Server/BUILD/compile-pentium-pgcc 2013-10-11 13:09:36 +0000
537@@ -1,7 +1,11 @@
538 #! /bin/sh
539
540+<<<<<<< TREE
541 # Copyright (c) 2000, 2001, 2005, 2007 MySQL AB
542 # Use is subject to license terms
543+=======
544+# Copyright (c) 2000, 2001, 2005, 2007 MySQL AB
545+>>>>>>> MERGE-SOURCE
546 #
547 # This program is free software; you can redistribute it and/or modify
548 # it under the terms of the GNU General Public License as published by
549
550=== modified file 'Percona-Server/BUILD/compile-pentium-valgrind-max-no-ndb'
551=== modified file 'Percona-Server/BUILD/compile-pentium64'
552--- Percona-Server/BUILD/compile-pentium64 2013-03-20 16:52:15 +0000
553+++ Percona-Server/BUILD/compile-pentium64 2013-10-11 13:09:36 +0000
554@@ -14,8 +14,13 @@
555 #
556 # You should have received a copy of the GNU Library General Public
557 # License along with this library; if not, write to the Free
558+<<<<<<< TREE
559 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
560 # MA 02110-1301, USA
561+=======
562+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
563+# MA 02110-1301, USA.
564+>>>>>>> MERGE-SOURCE
565
566 path=`dirname $0`
567 . "$path/SETUP.sh"
568
569=== modified file 'Percona-Server/BUILD/compile-pentium64-debug'
570--- Percona-Server/BUILD/compile-pentium64-debug 2013-03-20 16:52:15 +0000
571+++ Percona-Server/BUILD/compile-pentium64-debug 2013-10-11 13:09:36 +0000
572@@ -13,7 +13,11 @@
573 #
574 # You should have received a copy of the GNU General Public License
575 # along with this program; if not, write to the Free Software
576+<<<<<<< TREE
577 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
578+=======
579+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
580+>>>>>>> MERGE-SOURCE
581
582 path=`dirname $0`
583 . "$path/SETUP.sh"
584
585=== modified file 'Percona-Server/BUILD/compile-pentium64-debug-max'
586--- Percona-Server/BUILD/compile-pentium64-debug-max 2013-03-20 16:52:15 +0000
587+++ Percona-Server/BUILD/compile-pentium64-debug-max 2013-10-11 13:09:36 +0000
588@@ -13,7 +13,11 @@
589 #
590 # You should have received a copy of the GNU General Public License
591 # along with this program; if not, write to the Free Software
592+<<<<<<< TREE
593 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
594+=======
595+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
596+>>>>>>> MERGE-SOURCE
597
598 path=`dirname $0`
599 . "$path/SETUP.sh"
600
601=== modified file 'Percona-Server/BUILD/compile-ppc-debug'
602--- Percona-Server/BUILD/compile-ppc-debug 2013-03-20 16:52:15 +0000
603+++ Percona-Server/BUILD/compile-ppc-debug 2013-10-11 13:09:36 +0000
604@@ -1,7 +1,11 @@
605 #! /bin/sh
606
607+<<<<<<< TREE
608 # Copyright (c) 2004, 2006 MySQL AB
609 # Use is subject to license terms
610+=======
611+# Copyright (c) 2004, 2006 MySQL AB
612+>>>>>>> MERGE-SOURCE
613 #
614 # This program is free software; you can redistribute it and/or modify
615 # it under the terms of the GNU General Public License as published by
616
617=== modified file 'Percona-Server/BUILD/compile-ppc-debug-max'
618--- Percona-Server/BUILD/compile-ppc-debug-max 2013-03-20 16:52:15 +0000
619+++ Percona-Server/BUILD/compile-ppc-debug-max 2013-10-11 13:09:36 +0000
620@@ -1,7 +1,11 @@
621 #! /bin/sh
622
623+<<<<<<< TREE
624 # Copyright (c) 2004-2006 MySQL AB
625 # Use is subject to license terms
626+=======
627+# Copyright (c) 2004-2006 MySQL AB
628+>>>>>>> MERGE-SOURCE
629 #
630 # This program is free software; you can redistribute it and/or modify
631 # it under the terms of the GNU General Public License as published by
632
633=== modified file 'Percona-Server/BUILD/compile-ppc-debug-max-no-ndb'
634--- Percona-Server/BUILD/compile-ppc-debug-max-no-ndb 2013-03-20 16:52:15 +0000
635+++ Percona-Server/BUILD/compile-ppc-debug-max-no-ndb 2013-10-11 13:09:36 +0000
636@@ -1,7 +1,11 @@
637 #! /bin/sh
638
639+<<<<<<< TREE
640 # Copyright (c) 2005, 2006 MySQL AB
641 # Use is subject to license terms
642+=======
643+# Copyright (c) 2005, 2006 MySQL AB
644+>>>>>>> MERGE-SOURCE
645 #
646 # This program is free software; you can redistribute it and/or modify
647 # it under the terms of the GNU General Public License as published by
648
649=== modified file 'Percona-Server/BUILD/compile-ppc-max'
650--- Percona-Server/BUILD/compile-ppc-max 2013-03-20 16:52:15 +0000
651+++ Percona-Server/BUILD/compile-ppc-max 2013-10-11 13:09:36 +0000
652@@ -1,7 +1,11 @@
653 #! /bin/sh
654
655+<<<<<<< TREE
656 # Copyright (c) 2004-2006 MySQL AB
657 # Use is subject to license terms
658+=======
659+# Copyright (c) 2004-2006 MySQL AB
660+>>>>>>> MERGE-SOURCE
661 #
662 # This program is free software; you can redistribute it and/or modify
663 # it under the terms of the GNU General Public License as published by
664
665=== modified file 'Percona-Server/BUILD/compile-solaris-sparc-debug'
666--- Percona-Server/BUILD/compile-solaris-sparc-debug 2013-03-20 16:52:15 +0000
667+++ Percona-Server/BUILD/compile-solaris-sparc-debug 2013-10-11 13:09:36 +0000
668@@ -1,7 +1,11 @@
669 #!/bin/sh
670
671+<<<<<<< TREE
672 # Copyright (c) 2001, 2002, 2005-2007 MySQL AB
673 # Use is subject to license terms
674+=======
675+# Copyright (c) 2001, 2002, 2005-2007 MySQL AB
676+>>>>>>> MERGE-SOURCE
677 #
678 # This program is free software; you can redistribute it and/or modify
679 # it under the terms of the GNU General Public License as published by
680
681=== modified file 'Percona-Server/BUILD/compile-solaris-sparc-purify'
682--- Percona-Server/BUILD/compile-solaris-sparc-purify 2013-03-20 16:52:15 +0000
683+++ Percona-Server/BUILD/compile-solaris-sparc-purify 2013-10-11 13:09:36 +0000
684@@ -1,7 +1,11 @@
685 #! /bin/sh
686
687+<<<<<<< TREE
688 # Copyright (c) 2000-2002, 2005-2007 MySQL AB
689 # Use is subject to license terms
690+=======
691+# Copyright (c) 2000-2002, 2005-2007 MySQL AB
692+>>>>>>> MERGE-SOURCE
693 #
694 # This program is free software; you can redistribute it and/or modify
695 # it under the terms of the GNU General Public License as published by
696
697=== modified file 'Percona-Server/CMakeLists.txt'
698--- Percona-Server/CMakeLists.txt 2013-08-02 09:40:55 +0000
699+++ Percona-Server/CMakeLists.txt 2013-10-11 13:09:36 +0000
700@@ -1,4 +1,8 @@
701+<<<<<<< TREE
702 # Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
703+=======
704+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
705+>>>>>>> MERGE-SOURCE
706 #
707 # This program is free software; you can redistribute it and/or modify
708 # it under the terms of the GNU General Public License as published by
709
710=== added file 'Percona-Server/Docs/Makefile.am.OTHER'
711--- Percona-Server/Docs/Makefile.am.OTHER 1970-01-01 00:00:00 +0000
712+++ Percona-Server/Docs/Makefile.am.OTHER 2013-10-11 13:09:36 +0000
713@@ -0,0 +1,42 @@
714+# Copyright (c) 2000-2008 MySQL AB
715+#
716+# This program is free software; you can redistribute it and/or modify
717+# it under the terms of the GNU General Public License as published by
718+# the Free Software Foundation; version 2 of the License.
719+#
720+# This program is distributed in the hope that it will be useful,
721+# but WITHOUT ANY WARRANTY; without even the implied warranty of
722+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
723+# GNU General Public License for more details.
724+#
725+# You should have received a copy of the GNU General Public License
726+# along with this program; if not, write to the Free Software
727+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
728+
729+EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@
730+
731+# make sure that "make install" installs the info page, too
732+# automake only seems to take care of this automatically,
733+# if we're building the info page from texi directly.
734+install-data-hook: $(srcdir)/mysql.info
735+ if test `basename $(prefix)` = "mysql" ; then \
736+ $(mkinstalldirs) $(DESTDIR)$(prefix)/docs ; \
737+ $(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(prefix)/docs ; \
738+ test ! -f $(top_srcdir)/ChangeLog || $(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DESTDIR)$(prefix)/docs ; \
739+ else \
740+ $(mkinstalldirs) $(DESTDIR)$(infodir) $(DESTDIR)$(pkgdatadir) ; \
741+ $(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir) ; \
742+ test ! -f $(top_srcdir)/ChangeLog || $(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DESTDIR)$(pkgdatadir) ; \
743+ fi
744+
745+uninstall-local:
746+ if test `basename $(prefix)` = "mysql" ; then \
747+ @RM@ -f $(DESTDIR)$(prefix)/docs/mysql.info ; \
748+ @RM@ -f $(DESTDIR)$(prefix)/docs/ChangeLog ; \
749+ else \
750+ @RM@ -f $(DESTDIR)$(infodir)/mysql.info ; \
751+ @RM@ -f $(DESTDIR)$(pkgdatadir)/ChangeLog ; \
752+ fi
753+
754+# Don't update the files from bitkeeper
755+%::SCCS/s.%
756
757=== modified file 'Percona-Server/INSTALL-SOURCE'
758=== modified file 'Percona-Server/INSTALL-WIN-SOURCE'
759=== added file 'Percona-Server/Makefile.am.OTHER'
760--- Percona-Server/Makefile.am.OTHER 1970-01-01 00:00:00 +0000
761+++ Percona-Server/Makefile.am.OTHER 2013-10-11 13:09:36 +0000
762@@ -0,0 +1,333 @@
763+# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
764+#
765+# This program is free software; you can redistribute it and/or modify
766+# it under the terms of the GNU General Public License as published by
767+# the Free Software Foundation; version 2 of the License.
768+#
769+# This program is distributed in the hope that it will be useful,
770+# but WITHOUT ANY WARRANTY; without even the implied warranty of
771+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
772+# GNU General Public License for more details.
773+#
774+# You should have received a copy of the GNU General Public License
775+# along with this program; if not, write to the Free Software
776+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
777+
778+# Process this file with automake to create Makefile.in
779+
780+AUTOMAKE_OPTIONS = foreign
781+
782+# These are built from source in the Docs directory
783+EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
784+ README COPYING CMakeLists.txt
785+
786+SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
787+ @readline_topdir@ sql-common scripts \
788+ @sql_union_dirs@ unittest \
789+ @sql_server@ @man_dirs@ tests \
790+ netware @libmysqld_dirs@ \
791+ mysql-test support-files sql-bench @tools_dirs@ \
792+ win
793+
794+DIST_SUBDIRS = . include Docs zlib \
795+ cmd-line-utils sql-common scripts \
796+ strings mysys dbug extra regex libmysql libmysql_r client unittest storage plugin \
797+ vio sql man tests \
798+ netware libmysqld \
799+ mysql-test support-files sql-bench server-tools \
800+ win \
801+ BUILD
802+DISTCLEANFILES = ac_available_languages_fragment
803+
804+# Create permission databases
805+init-db: all
806+ $(top_builddir)/scripts/mysql_install_db
807+
808+bin-dist: all
809+ $(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@
810+
811+# Remove BK's "SCCS" subdirectories from source distribution
812+# Create initial database files for Windows installations and check them.
813+dist-hook:
814+ rm -rf `find $(distdir) -type d -name SCCS -print`
815+ mkdir -p $(distdir)/win
816+ scripts/mysql_install_db --no-defaults --cross-bootstrap \
817+ --builddir=$(top_builddir) \
818+ --datadir=$(distdir)/win/data \
819+ --srcdir=$(top_srcdir)
820+ storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI
821+
822+all-local: @ABI_CHECK@
823+
824+tags:
825+ support-files/build-tags
826+
827+.PHONY: init-db bin-dist \
828+ test test-force test-full test-force-full test-force-mem \
829+ test-pl test-force-pl test-full-pl test-force-full-pl test-force-pl-mem \
830+ test-unit test-ps test-nr test-pr test-ns test-binlog-statement \
831+ test-ext-funcs test-ext-rpl test-ext-partitions test-ext-jp \
832+ test-ext-stress test-ext test-embedded test-reprepare \
833+ test-fast test-fast-cursor test-fast-view test-fast-prepare \
834+ test-full-qa
835+
836+# Target 'test' will run the regression test suite using the built server.
837+#
838+# If you are running in a shared environment, users can avoid clashing
839+# port numbers by setting individual small numbers 1-100 to the
840+# environment variable MTR_BUILD_THREAD. The script "mysql-test-run"
841+# will then calculate the various port numbers it needs from this,
842+# making sure each user use different ports.
843+
844+test-unit:
845+ cd unittest && $(MAKE) test
846+
847+test-ps:
848+ cd mysql-test ; \
849+ @PERL@ ./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=mixed
850+
851+test-nr:
852+ cd mysql-test ; \
853+ @PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=row
854+
855+test-pr:
856+ cd mysql-test ; \
857+ @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol --mysqld=--binlog-format=row
858+
859+test-ns:
860+ cd mysql-test ; \
861+ @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed
862+
863+test-binlog-statement:
864+ cd mysql-test ; \
865+ @PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement
866+
867+# This code is duplicated in "test-bt", see the Changeset comment of 2007-Dec-07
868+test-embedded:
869+ if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
870+ cd mysql-test ; MTR_BUILD_THREAD=auto \
871+ @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
872+ --embedded-server --skip-rpl --skip-ndbcluster ; \
873+ else \
874+ echo "no program found for 'embedded' tests - skipped testing" ; \
875+ fi
876+
877+test-reprepare:
878+ cd mysql-test ; \
879+ @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol \
880+ --mysqld=--debug=+d,reprepare_each_statement
881+
882+test: test-unit test-ns test-pr
883+
884+smoke:
885+ cd mysql-test ; \
886+ @PERL@ ./mysql-test-run.pl --do-test=s
887+
888+test-full: test test-nr test-ps
889+
890+test-force:
891+ $(MAKE) force=--force test
892+
893+test-force-full:
894+ $(MAKE) force=--force test-full
895+
896+#used by autopush.pl to run memory based tests
897+test-force-mem:
898+ $(MAKE) force=--force mem=--mem test
899+
900+test-bt:
901+ -cd mysql-test ; MTR_BUILD_THREAD=auto \
902+ @PERL@ ./mysql-test-run.pl --comment=normal --force --timer \
903+ --skip-ndbcluster --report-features
904+ -cd mysql-test ; MTR_BUILD_THREAD=auto \
905+ @PERL@ ./mysql-test-run.pl --comment=ps --force --timer \
906+ --skip-ndbcluster --ps-protocol
907+ -if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \
908+ cd mysql-test ; \
909+ MTR_BUILD_THREAD=auto \
910+ @PERL@ ./mysql-test-run.pl --comment=ndb+ps --force --timer \
911+ --ps-protocol --mysqld=--binlog-format=row --suite=ndb ; \
912+ MTR_BUILD_THREAD=auto \
913+ @PERL@ ./mysql-test-run.pl --comment=ndb --force --timer \
914+ --with-ndbcluster-only ; \
915+ else \
916+ echo "no program found for 'ndbcluster' tests - skipped testing" ; \
917+ fi
918+ -cd mysql-test ; MTR_BUILD_THREAD=auto \
919+ @PERL@ ./mysql-test-run.pl --force --comment=funcs1+ps --ps-protocol --reorder --suite=funcs_1
920+ -cd mysql-test ; MTR_BUILD_THREAD=auto \
921+ @PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2
922+ -cd mysql-test ; MTR_BUILD_THREAD=auto \
923+ @PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts
924+ -cd mysql-test ; MTR_BUILD_THREAD=auto \
925+ @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
926+ -cd mysql-test ; MTR_BUILD_THREAD=auto \
927+ @PERL@ ./mysql-test-run.pl --force --comment=jp --suite=jp
928+ -if [ -d mysql-test/suite/nist ] ; then \
929+ cd mysql-test ; MTR_BUILD_THREAD=auto \
930+ @PERL@ ./mysql-test-run.pl --comment=nist --force --suite=nist ; \
931+ fi
932+ -if [ -d mysql-test/suite/nist ] ; then \
933+ cd mysql-test ; MTR_BUILD_THREAD=auto \
934+ @PERL@ ./mysql-test-run.pl --comment=nist+ps --force --suite=nist --ps-protocol ; \
935+ fi
936+ -if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
937+ cd mysql-test ; MTR_BUILD_THREAD=auto \
938+ @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
939+ --embedded-server --skip-rpl --skip-ndbcluster ; \
940+ else \
941+ echo "no program found for 'embedded' tests - skipped testing" ; \
942+ fi
943+
944+test-bt-fast:
945+ -cd mysql-test ; MTR_BUILD_THREAD=auto \
946+ @PERL@ ./mysql-test-run.pl --comment=ps --force --timer \
947+ --skip-ndbcluster --ps-protocol --report-features
948+ -if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \
949+ cd mysql-test ; \
950+ MTR_BUILD_THREAD=auto \
951+ @PERL@ ./mysql-test-run.pl --comment=ndb --force --timer \
952+ --with-ndbcluster-only ; \
953+ else \
954+ echo "no program found for 'ndbcluster' tests - skipped testing" ; \
955+ fi
956+ -cd mysql-test ; MTR_BUILD_THREAD=auto \
957+ @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
958+
959+test-bt-debug:
960+ -cd mysql-test ; MTR_BUILD_THREAD=auto \
961+ @PERL@ ./mysql-test-run.pl --comment=debug --force --timer \
962+ --skip-ndbcluster --skip-rpl --report-features
963+
964+test-bt-debug-fast:
965+
966+test-bt-debug-fast:
967+
968+# Keep these for a while
969+test-pl: test
970+test-full-pl: test-full
971+test-force-pl: test-force
972+test-force-pl-mem: test-force-mem
973+test-force-full-pl: test-force-full
974+
975+test-ext-funcs:
976+ cd mysql-test ; \
977+ @PERL@ ./mysql-test-run.pl --force --reorder --suite=funcs_1 ; \
978+ @PERL@ ./mysql-test-run.pl --force --suite=funcs_2
979+
980+test-ext-rpl:
981+ cd mysql-test ; \
982+ @PERL@ ./mysql-test-run.pl --force --suite=rpl
983+
984+test-ext-partitions:
985+ cd mysql-test ; \
986+ @PERL@ ./mysql-test-run.pl --force --suite=parts
987+
988+test-ext-jp:
989+ cd mysql-test ; \
990+ @PERL@ ./mysql-test-run.pl --force --suite=jp
991+
992+test-ext-stress:
993+ cd mysql-test ; \
994+ @PERL@ ./mysql-test-run.pl --force --big-test --suite=stress
995+
996+test-ext: test-ext-funcs test-ext-rpl test-ext-partitions test-ext-jp test-ext-stress
997+
998+test-fast:
999+ cd mysql-test ; \
1000+ @PERL@ ./mysql-test-run.pl $(subset) --force --skip-ndb --skip-innodb --skip-im --skip-rpl ; \
1001+ @PERL@ ./mysql-test-run.pl $(subset) --force --suite=funcs_1 --do-test=myisam ; \
1002+ @PERL@ ./mysql-test-run.pl $(subset) --force --suite=stress --do-test=ddl_myisam
1003+
1004+test-fast-view:
1005+ $(MAKE) subset=--view-protocol test-fast
1006+
1007+test-fast-cursor:
1008+ $(MAKE) subset=--cursor-protocol test-fast
1009+
1010+test-fast-prepare:
1011+ $(MAKE) subset=--ps-protocol test-fast
1012+
1013+test-full-qa:
1014+ $(MAKE) force=--force test-pr \
1015+ test-binlog-statement test-ext test-fast-view \
1016+ test-fast-cursor test-unit
1017+
1018+#
1019+# Headers which need to be checked for abi/api compatibility.
1020+# API_PREPROCESSOR_HEADER will be used until mysql_priv.h stablizes
1021+# after which TEST_PREPROCESSOR_HEADER will be used.
1022+#
1023+
1024+API_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql/plugin.h \
1025+ $(top_srcdir)/include/mysql.h
1026+
1027+TEST_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql/plugin.h \
1028+ $(top_srcdir)/sql/mysql_priv.h \
1029+ $(top_srcdir)/include/mysql.h
1030+
1031+#
1032+# Rules for checking that the abi/api has not changed.
1033+#
1034+# The following steps are followed in the do_abi_check rule below
1035+#
1036+# 1) Generate preprocessor output for the files that need to
1037+# be tested for abi/api changes. use -nostdinc to prevent
1038+# generation of preprocessor output for system headers. This
1039+# results in messages in stderr saying that these headers
1040+# were not found. Redirect the stderr output to /dev/null
1041+# to prevent seeing these messages.
1042+# 2) sed the output to
1043+# 2.1) remove blank lines and lines that begin with "# "
1044+# 2.2) When gcc -E is run on the Mac OS and solaris sparc platforms it
1045+# introduces a line of output that shows up as a difference between
1046+# the .pp and .out files. Remove these OS specific preprocessor text
1047+# inserted by the preprocessor.
1048+# 3) diff the generated file and the canons (.pp files already in
1049+# the repository).
1050+# 4) delete the .out file that is generated.
1051+#
1052+# If the diff fails, the generated file is not removed. This will
1053+# be useful for analysis of ABI differences (e.g. using a visual
1054+# diff tool).
1055+#
1056+# A ABI change that causes a build to fail will always be accompanied
1057+# by new canons (.out files). The .out files that are not removed will
1058+# be replaced as the new .pp files.
1059+#
1060+# e.g. If include/mysql/plugin.h has an ABI change then this rule would
1061+# leave a <build directory>/abi_check.out file.
1062+#
1063+# A developer with a justified API change will then do a
1064+# mv <build directory>/abi_check.out include/mysql/plugin.pp
1065+# to replace the old canons with the new ones.
1066+#
1067+
1068+abi_check: $(API_PREPROCESSOR_HEADER)
1069+ $(MAKE) abi_headers="$^" do_abi_check
1070+
1071+abi_check_all: $(TEST_PREPROCESSOR_HEADER)
1072+ $(MAKE) abi_headers="$^" do_abi_check
1073+
1074+do_abi_check:
1075+ set -ex; \
1076+ for file in $(abi_headers); do \
1077+ @CC@ -E -nostdinc -dI -DMYSQL_ABI_CHECK \
1078+ -I$(top_srcdir)/include \
1079+ -I$(top_srcdir)/include/mysql \
1080+ -I$(top_srcdir)/sql \
1081+ -I$(top_builddir)/include \
1082+ -I$(top_builddir)/include/mysql \
1083+ -I$(top_builddir)/sql \
1084+ $$file 2>/dev/null | \
1085+ @SED@ -e '/^# /d' \
1086+ -e '/^[ ]*$$/d' \
1087+ -e '/^#pragma GCC set_debug_pwd/d' \
1088+ -e '/^#ident/d' > \
1089+ $(top_builddir)/abi_check.out; \
1090+ @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \
1091+ @RM@ $(top_builddir)/abi_check.out; \
1092+ done
1093+
1094+# Don't update the files from bitkeeper
1095+%::SCCS/s.%
1096
1097=== modified file 'Percona-Server/README'
1098--- Percona-Server/README 2013-03-19 04:35:30 +0000
1099+++ Percona-Server/README 2013-10-11 13:09:36 +0000
1100@@ -1,3 +1,4 @@
1101+<<<<<<< TREE
1102 MySQL Server 5.5
1103
1104 This is a release of MySQL, a dual-license SQL database server.
1105@@ -54,3 +55,61 @@
1106 in any of several formats at the URL given earlier in this file.
1107 Source distributions include a local copy of the manual in the
1108 Docs directory.
1109+=======
1110+MySQL Server 5.1
1111+
1112+This is a release of MySQL, a dual-license SQL database server.
1113+For the avoidance of doubt, this particular copy of the software
1114+is released under the version 2 of the GNU General Public License.
1115+MySQL is brought to you by Oracle.
1116+
1117+Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
1118+
1119+License information can be found in the COPYING file.
1120+
1121+MySQL FOSS License Exception
1122+We want free and open source software applications under certain
1123+licenses to be able to use specified GPL-licensed MySQL client
1124+libraries despite the fact that not all such FOSS licenses are
1125+compatible with version 2 of the GNU General Public License.
1126+Therefore there are special exceptions to the terms and conditions
1127+of the GPLv2 as applied to these client libraries, which are
1128+identified and described in more detail in the FOSS License
1129+Exception at
1130+<http://www.mysql.com/about/legal/licensing/foss-exception.html>.
1131+
1132+This distribution may include materials developed by third
1133+parties. For license and attribution notices for these
1134+materials, please refer to the documentation that accompanies
1135+this distribution (see the "Licenses for Third-Party Components"
1136+appendix) or view the online documentation at
1137+<http://dev.mysql.com/doc/>.
1138+
1139+GPLv2 Disclaimer
1140+For the avoidance of doubt, except that if any license choice
1141+other than GPL or LGPL is available it will apply instead,
1142+Oracle elects to use only the General Public License version 2
1143+(GPLv2) at this time for any software where a choice of GPL
1144+license versions is made available with the language indicating
1145+that GPLv2 or any later version may be used, or where a choice
1146+of which version of the GPL is applied is otherwise unspecified.
1147+
1148+For further information about MySQL or additional documentation,
1149+see:
1150+- The latest information about MySQL: http://www.mysql.com
1151+- The current MySQL documentation: http://dev.mysql.com/doc
1152+
1153+Some Reference Manual sections of special interest:
1154+- If you are migrating from an older version of MySQL, please
1155+ read the "Upgrading from..." section.
1156+- To see what MySQL can do, take a look at the features section.
1157+- For installation instructions, see the Installing and Upgrading
1158+ chapter.
1159+- For the new features/bugfix history, see the MySQL Change History
1160+ appendix.
1161+
1162+You can browse the MySQL Reference Manual online or download it
1163+in any of several formats at the URL given earlier in this file.
1164+Source distributions include a local copy of the manual in the
1165+Docs directory.
1166+>>>>>>> MERGE-SOURCE
1167
1168=== modified file 'Percona-Server/client/completion_hash.cc'
1169--- Percona-Server/client/completion_hash.cc 2013-03-19 12:36:34 +0000
1170+++ Percona-Server/client/completion_hash.cc 2013-10-11 13:09:36 +0000
1171@@ -1,4 +1,8 @@
1172+<<<<<<< TREE
1173 /* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
1174+=======
1175+/* Copyright (c) 2000-2002, 2005, 2007 MySQL AB
1176+>>>>>>> MERGE-SOURCE
1177
1178 This program is free software; you can redistribute it and/or modify
1179 it under the terms of the GNU General Public License as published by
1180@@ -11,7 +15,11 @@
1181
1182 You should have received a copy of the GNU General Public License
1183 along with this program; if not, write to the Free Software
1184+<<<<<<< TREE
1185 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
1186+=======
1187+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1188+>>>>>>> MERGE-SOURCE
1189
1190 /* Quick & light hash implementation for tab completion purposes
1191 *
1192
1193=== modified file 'Percona-Server/client/completion_hash.h'
1194--- Percona-Server/client/completion_hash.h 2013-03-19 14:53:48 +0000
1195+++ Percona-Server/client/completion_hash.h 2013-10-11 13:09:36 +0000
1196@@ -1,5 +1,9 @@
1197+<<<<<<< TREE
1198 /* Copyright (c) 2000-2002, 2006 MySQL AB
1199 Use is subject to license terms
1200+=======
1201+/* Copyright (c) 2000-2002, 2006 MySQL AB
1202+>>>>>>> MERGE-SOURCE
1203
1204 This program is free software; you can redistribute it and/or
1205 modify it under the terms of the GNU Library General Public
1206
1207=== modified file 'Percona-Server/client/echo.c'
1208--- Percona-Server/client/echo.c 2013-03-19 14:53:48 +0000
1209+++ Percona-Server/client/echo.c 2013-10-11 13:09:36 +0000
1210@@ -1,5 +1,9 @@
1211+<<<<<<< TREE
1212 /* Copyright (c) 2000, 2007 MySQL AB
1213 Use is subject to license terms
1214+=======
1215+/* Copyright (c) 2000, 2007 MySQL AB
1216+>>>>>>> MERGE-SOURCE
1217
1218 This program is free software; you can redistribute it and/or modify
1219 it under the terms of the GNU General Public License as published by
1220
1221=== modified file 'Percona-Server/client/get_password.c'
1222--- Percona-Server/client/get_password.c 2013-03-19 14:53:48 +0000
1223+++ Percona-Server/client/get_password.c 2013-10-11 13:09:36 +0000
1224@@ -1,5 +1,9 @@
1225+<<<<<<< TREE
1226 /* Copyright (c) 2000, 2001, 2003, 2006, 2008 MySQL AB
1227 Use is subject to license terms
1228+=======
1229+/* Copyright (c) 2000, 2001, 2003, 2006, 2008 MySQL AB
1230+>>>>>>> MERGE-SOURCE
1231
1232 This program is free software; you can redistribute it and/or modify
1233 it under the terms of the GNU General Public License as published by
1234
1235=== modified file 'Percona-Server/client/mysql.cc'
1236=== modified file 'Percona-Server/client/mysqlbinlog.cc'
1237--- Percona-Server/client/mysqlbinlog.cc 2013-08-02 09:40:55 +0000
1238+++ Percona-Server/client/mysqlbinlog.cc 2013-10-11 13:09:36 +0000
1239@@ -943,6 +943,7 @@
1240 case PRE_GA_DELETE_ROWS_EVENT:
1241 case PRE_GA_UPDATE_ROWS_EVENT:
1242 {
1243+<<<<<<< TREE
1244 bool stmt_end= FALSE;
1245 Table_map_log_event *ignored_map= NULL;
1246
1247@@ -978,6 +979,39 @@
1248 if (stmt_end)
1249 {
1250
1251+=======
1252+ bool stmt_end= FALSE;
1253+ Table_map_log_event *ignored_map= NULL;
1254+
1255+ if (ev_type == WRITE_ROWS_EVENT ||
1256+ ev_type == DELETE_ROWS_EVENT ||
1257+ ev_type == UPDATE_ROWS_EVENT)
1258+ {
1259+ Rows_log_event *new_ev= (Rows_log_event*) ev;
1260+ if (new_ev->get_flags(Rows_log_event::STMT_END_F))
1261+ stmt_end= TRUE;
1262+ ignored_map= print_event_info->m_table_map_ignored.get_table(new_ev->get_table_id());
1263+ }
1264+ else if (ev_type == PRE_GA_WRITE_ROWS_EVENT ||
1265+ ev_type == PRE_GA_DELETE_ROWS_EVENT ||
1266+ ev_type == PRE_GA_UPDATE_ROWS_EVENT)
1267+ {
1268+ Old_rows_log_event *old_ev= (Old_rows_log_event*) ev;
1269+ if (old_ev->get_flags(Rows_log_event::STMT_END_F))
1270+ stmt_end= TRUE;
1271+ ignored_map= print_event_info->m_table_map_ignored.get_table(old_ev->get_table_id());
1272+ }
1273+
1274+ bool skip_event= (ignored_map != NULL);
1275+ /*
1276+ end of statement check:
1277+ i) destroy/free ignored maps
1278+ ii) if skip event, flush cache now
1279+ */
1280+ if (stmt_end)
1281+ {
1282+
1283+>>>>>>> MERGE-SOURCE
1284 /*
1285 Now is safe to clear ignored map (clear_tables will also
1286 delete original table map events stored in the map).
1287
1288=== modified file 'Percona-Server/client/mysqldump.c'
1289--- Percona-Server/client/mysqldump.c 2013-08-02 09:40:55 +0000
1290+++ Percona-Server/client/mysqldump.c 2013-10-11 13:09:36 +0000
1291@@ -2869,7 +2869,7 @@
1292 verbose_msg("-- Retrieving table structure for table %s...\n", table);
1293
1294 len= my_snprintf(query_buff, sizeof(query_buff),
1295- "SET OPTION SQL_QUOTE_SHOW_CREATE=%d",
1296+ "SET SQL_QUOTE_SHOW_CREATE=%d",
1297 (opt_quoted || opt_keywords));
1298 if (!create_options)
1299 strmov(query_buff+len,
1300@@ -3029,6 +3029,7 @@
1301
1302 row= mysql_fetch_row(result);
1303
1304+<<<<<<< TREE
1305 /*
1306 The actual column type doesn't matter anyway, since the table will
1307 be dropped at run time.
1308@@ -3036,6 +3037,15 @@
1309 */
1310 fprintf(sql_file, " %s tinyint NOT NULL",
1311 quote_name(row[0], name_buff, 0));
1312+=======
1313+ /*
1314+ The actual column type doesn't matter anyway, since the table will
1315+ be dropped at run time.
1316+ We do tinyint to avoid hitting the row size limit.
1317+ */
1318+ fprintf(sql_file, " %s tinyint NOT NULL",
1319+ quote_name(row[0], name_buff, 0));
1320+>>>>>>> MERGE-SOURCE
1321
1322 while((row= mysql_fetch_row(result)))
1323 {
1324@@ -5672,7 +5682,7 @@
1325 verbose_msg("-- Retrieving view structure for table %s...\n", table);
1326
1327 #ifdef NOT_REALLY_USED_YET
1328- sprintf(insert_pat,"SET OPTION SQL_QUOTE_SHOW_CREATE=%d",
1329+ sprintf(insert_pat, "SET SQL_QUOTE_SHOW_CREATE=%d",
1330 (opt_quoted || opt_keywords));
1331 #endif
1332
1333
1334=== modified file 'Percona-Server/client/sql_string.cc'
1335=== modified file 'Percona-Server/client/sql_string.h'
1336--- Percona-Server/client/sql_string.h 2013-06-27 15:35:20 +0000
1337+++ Percona-Server/client/sql_string.h 2013-10-11 13:09:36 +0000
1338@@ -1,7 +1,12 @@
1339+<<<<<<< TREE
1340 #ifndef CLIENT_SQL_STRING_INCLUDED
1341 #define CLIENT_SQL_STRING_INCLUDED
1342
1343 /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
1344+=======
1345+/*
1346+ Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
1347+>>>>>>> MERGE-SOURCE
1348
1349 This program is free software; you can redistribute it and/or modify
1350 it under the terms of the GNU General Public License as published by
1351
1352=== added file 'Percona-Server/cmd-line-utils/Makefile.am.OTHER'
1353--- Percona-Server/cmd-line-utils/Makefile.am.OTHER 1970-01-01 00:00:00 +0000
1354+++ Percona-Server/cmd-line-utils/Makefile.am.OTHER 2013-10-11 13:09:36 +0000
1355@@ -0,0 +1,24 @@
1356+# Copyright (c) 2003, 2004 MySQL AB
1357+#
1358+# This library is free software; you can redistribute it and/or
1359+# modify it under the terms of the GNU Library General Public
1360+# License as published by the Free Software Foundation; version 2
1361+# of the License.
1362+#
1363+# This library is distributed in the hope that it will be useful,
1364+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1365+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1366+# Library General Public License for more details.
1367+#
1368+# You should have received a copy of the GNU Library General Public
1369+# License along with this library; if not, write to the Free
1370+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
1371+# MA 02110-1301, USA
1372+
1373+## Process this file with automake to create Makefile.in
1374+
1375+SUBDIRS= @readline_basedir@
1376+DIST_SUBDIRS= libedit readline
1377+
1378+# Don't update the files from bitkeeper
1379+%::SCCS/s.%
1380
1381=== modified file 'Percona-Server/cmd-line-utils/readline/COPYING'
1382--- Percona-Server/cmd-line-utils/readline/COPYING 2013-03-19 14:53:48 +0000
1383+++ Percona-Server/cmd-line-utils/readline/COPYING 2013-10-11 13:09:36 +0000
1384@@ -2,7 +2,11 @@
1385 Version 2, June 1991
1386
1387 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
1388+<<<<<<< TREE
1389 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1390+=======
1391+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1392+>>>>>>> MERGE-SOURCE
1393 Everyone is permitted to copy and distribute verbatim copies
1394 of this license document, but changing it is not allowed.
1395
1396
1397=== modified file 'Percona-Server/cmd-line-utils/readline/ansi_stdlib.h'
1398--- Percona-Server/cmd-line-utils/readline/ansi_stdlib.h 2013-03-19 14:53:48 +0000
1399+++ Percona-Server/cmd-line-utils/readline/ansi_stdlib.h 2013-10-11 13:09:36 +0000
1400@@ -18,7 +18,11 @@
1401
1402 You should have received a copy of the GNU General Public License along
1403 with Bash; see the file COPYING. If not, write to the Free Software
1404+<<<<<<< TREE
1405 Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1406+=======
1407+ Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1408+>>>>>>> MERGE-SOURCE
1409
1410 #if !defined (_STDLIB_H_)
1411 #define _STDLIB_H_ 1
1412
1413=== modified file 'Percona-Server/cmd-line-utils/readline/chardefs.h'
1414--- Percona-Server/cmd-line-utils/readline/chardefs.h 2013-03-19 14:53:48 +0000
1415+++ Percona-Server/cmd-line-utils/readline/chardefs.h 2013-10-11 13:09:36 +0000
1416@@ -18,7 +18,11 @@
1417 The GNU General Public License is often shipped with GNU software, and
1418 is generally kept in a file called COPYING or LICENSE. If you do not
1419 have a copy of the license, write to the Free Software Foundation,
1420+<<<<<<< TREE
1421 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1422+=======
1423+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1424+>>>>>>> MERGE-SOURCE
1425
1426 #ifndef _CHARDEFS_H_
1427 #define _CHARDEFS_H_
1428
1429=== modified file 'Percona-Server/cmd-line-utils/readline/complete.c'
1430--- Percona-Server/cmd-line-utils/readline/complete.c 2013-03-19 14:53:48 +0000
1431+++ Percona-Server/cmd-line-utils/readline/complete.c 2013-10-11 13:09:36 +0000
1432@@ -18,7 +18,11 @@
1433 The GNU General Public License is often shipped with GNU software, and
1434 is generally kept in a file called COPYING or LICENSE. If you do not
1435 have a copy of the license, write to the Free Software Foundation,
1436+<<<<<<< TREE
1437 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1438+=======
1439+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1440+>>>>>>> MERGE-SOURCE
1441 #define READLINE_LIBRARY
1442
1443 #if defined (HAVE_CONFIG_H)
1444
1445=== modified file 'Percona-Server/cmd-line-utils/readline/configure.in'
1446--- Percona-Server/cmd-line-utils/readline/configure.in 2013-03-19 14:53:48 +0000
1447+++ Percona-Server/cmd-line-utils/readline/configure.in 2013-10-11 13:09:36 +0000
1448@@ -19,8 +19,13 @@
1449
1450 # You should have received a copy of the GNU General Public License
1451 # along with this program; if not, write to the Free Software
1452+<<<<<<< TREE
1453 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
1454 # MA 02110-1301, USA.
1455+=======
1456+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
1457+# MA 02110-1301, USA.
1458+>>>>>>> MERGE-SOURCE
1459
1460 AC_REVISION([for Readline 5.2, version 2.61])
1461
1462
1463=== modified file 'Percona-Server/cmd-line-utils/readline/funmap.c'
1464--- Percona-Server/cmd-line-utils/readline/funmap.c 2013-03-19 14:53:48 +0000
1465+++ Percona-Server/cmd-line-utils/readline/funmap.c 2013-10-11 13:09:36 +0000
1466@@ -18,7 +18,11 @@
1467 The GNU General Public License is often shipped with GNU software, and
1468 is generally kept in a file called COPYING or LICENSE. If you do not
1469 have a copy of the license, write to the Free Software Foundation,
1470+<<<<<<< TREE
1471 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1472+=======
1473+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1474+>>>>>>> MERGE-SOURCE
1475 #define READLINE_LIBRARY
1476
1477 #if defined (HAVE_CONFIG_H)
1478
1479=== modified file 'Percona-Server/cmd-line-utils/readline/histexpand.c'
1480--- Percona-Server/cmd-line-utils/readline/histexpand.c 2013-03-19 14:53:48 +0000
1481+++ Percona-Server/cmd-line-utils/readline/histexpand.c 2013-10-11 13:09:36 +0000
1482@@ -18,7 +18,11 @@
1483 The GNU General Public License is often shipped with GNU software, and
1484 is generally kept in a file called COPYING or LICENSE. If you do not
1485 have a copy of the license, write to the Free Software Foundation,
1486+<<<<<<< TREE
1487 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1488+=======
1489+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1490+>>>>>>> MERGE-SOURCE
1491
1492 #define READLINE_LIBRARY
1493
1494
1495=== modified file 'Percona-Server/cmd-line-utils/readline/histlib.h'
1496--- Percona-Server/cmd-line-utils/readline/histlib.h 2013-03-19 14:53:48 +0000
1497+++ Percona-Server/cmd-line-utils/readline/histlib.h 2013-10-11 13:09:36 +0000
1498@@ -17,7 +17,11 @@
1499 The GNU General Public License is often shipped with GNU software, and
1500 is generally kept in a file called COPYING or LICENSE. If you do not
1501 have a copy of the license, write to the Free Software Foundation,
1502+<<<<<<< TREE
1503 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1504+=======
1505+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1506+>>>>>>> MERGE-SOURCE
1507
1508 #if !defined (_HISTLIB_H_)
1509 #define _HISTLIB_H_
1510
1511=== modified file 'Percona-Server/cmd-line-utils/readline/history.c'
1512--- Percona-Server/cmd-line-utils/readline/history.c 2013-03-19 14:53:48 +0000
1513+++ Percona-Server/cmd-line-utils/readline/history.c 2013-10-11 13:09:36 +0000
1514@@ -18,7 +18,11 @@
1515 The GNU General Public License is often shipped with GNU software, and
1516 is generally kept in a file called COPYING or LICENSE. If you do not
1517 have a copy of the license, write to the Free Software Foundation,
1518+<<<<<<< TREE
1519 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1520+=======
1521+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1522+>>>>>>> MERGE-SOURCE
1523
1524 /* The goal is to make the implementation transparent, so that you
1525 don't have to know what data types are used, just what functions
1526
1527=== modified file 'Percona-Server/cmd-line-utils/readline/history.h'
1528--- Percona-Server/cmd-line-utils/readline/history.h 2013-03-19 14:53:48 +0000
1529+++ Percona-Server/cmd-line-utils/readline/history.h 2013-10-11 13:09:36 +0000
1530@@ -17,7 +17,11 @@
1531 The GNU General Public License is often shipped with GNU software, and
1532 is generally kept in a file called COPYING or LICENSE. If you do not
1533 have a copy of the license, write to the Free Software Foundation,
1534+<<<<<<< TREE
1535 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1536+=======
1537+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1538+>>>>>>> MERGE-SOURCE
1539
1540 #ifndef _HISTORY_H_
1541 #define _HISTORY_H_
1542
1543=== modified file 'Percona-Server/cmd-line-utils/readline/histsearch.c'
1544--- Percona-Server/cmd-line-utils/readline/histsearch.c 2013-03-19 14:53:48 +0000
1545+++ Percona-Server/cmd-line-utils/readline/histsearch.c 2013-10-11 13:09:36 +0000
1546@@ -18,7 +18,11 @@
1547 The GNU General Public License is often shipped with GNU software, and
1548 is generally kept in a file called COPYING or LICENSE. If you do not
1549 have a copy of the license, write to the Free Software Foundation,
1550+<<<<<<< TREE
1551 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1552+=======
1553+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1554+>>>>>>> MERGE-SOURCE
1555
1556 #define READLINE_LIBRARY
1557
1558
1559=== modified file 'Percona-Server/cmd-line-utils/readline/keymaps.c'
1560--- Percona-Server/cmd-line-utils/readline/keymaps.c 2013-03-19 14:53:48 +0000
1561+++ Percona-Server/cmd-line-utils/readline/keymaps.c 2013-10-11 13:09:36 +0000
1562@@ -17,7 +17,11 @@
1563
1564 You should have received a copy of the GNU General Public License
1565 along with Readline; see the file COPYING. If not, write to the Free
1566+<<<<<<< TREE
1567 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1568+=======
1569+ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
1570+>>>>>>> MERGE-SOURCE
1571 #define READLINE_LIBRARY
1572
1573 #if defined (HAVE_CONFIG_H)
1574
1575=== modified file 'Percona-Server/cmd-line-utils/readline/keymaps.h'
1576--- Percona-Server/cmd-line-utils/readline/keymaps.h 2013-03-19 14:53:48 +0000
1577+++ Percona-Server/cmd-line-utils/readline/keymaps.h 2013-10-11 13:09:36 +0000
1578@@ -18,7 +18,11 @@
1579 The GNU General Public License is often shipped with GNU software, and
1580 is generally kept in a file called COPYING or LICENSE. If you do not
1581 have a copy of the license, write to the Free Software Foundation,
1582+<<<<<<< TREE
1583 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1584+=======
1585+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1586+>>>>>>> MERGE-SOURCE
1587
1588 #ifndef _KEYMAPS_H_
1589 #define _KEYMAPS_H_
1590
1591=== modified file 'Percona-Server/cmd-line-utils/readline/macro.c'
1592--- Percona-Server/cmd-line-utils/readline/macro.c 2013-03-19 14:53:48 +0000
1593+++ Percona-Server/cmd-line-utils/readline/macro.c 2013-10-11 13:09:36 +0000
1594@@ -18,7 +18,11 @@
1595 The GNU General Public License is often shipped with GNU software, and
1596 is generally kept in a file called COPYING or LICENSE. If you do not
1597 have a copy of the license, write to the Free Software Foundation,
1598+<<<<<<< TREE
1599 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1600+=======
1601+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1602+>>>>>>> MERGE-SOURCE
1603 #define READLINE_LIBRARY
1604
1605 #if defined (HAVE_CONFIG_H)
1606
1607=== modified file 'Percona-Server/cmd-line-utils/readline/misc.c'
1608--- Percona-Server/cmd-line-utils/readline/misc.c 2013-03-19 14:53:48 +0000
1609+++ Percona-Server/cmd-line-utils/readline/misc.c 2013-10-11 13:09:36 +0000
1610@@ -18,7 +18,11 @@
1611 The GNU General Public License is often shipped with GNU software, and
1612 is generally kept in a file called COPYING or LICENSE. If you do not
1613 have a copy of the license, write to the Free Software Foundation,
1614+<<<<<<< TREE
1615 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1616+=======
1617+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1618+>>>>>>> MERGE-SOURCE
1619 #define READLINE_LIBRARY
1620
1621 #if defined (HAVE_CONFIG_H)
1622
1623=== modified file 'Percona-Server/cmd-line-utils/readline/parens.c'
1624--- Percona-Server/cmd-line-utils/readline/parens.c 2013-03-19 14:53:48 +0000
1625+++ Percona-Server/cmd-line-utils/readline/parens.c 2013-10-11 13:09:36 +0000
1626@@ -18,7 +18,11 @@
1627 The GNU General Public License is often shipped with GNU software, and
1628 is generally kept in a file called COPYING or LICENSE. If you do not
1629 have a copy of the license, write to the Free Software Foundation,
1630+<<<<<<< TREE
1631 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1632+=======
1633+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1634+>>>>>>> MERGE-SOURCE
1635 #define READLINE_LIBRARY
1636
1637 #if defined (__TANDEM)
1638
1639=== modified file 'Percona-Server/cmd-line-utils/readline/posixdir.h'
1640--- Percona-Server/cmd-line-utils/readline/posixdir.h 2013-03-19 14:53:48 +0000
1641+++ Percona-Server/cmd-line-utils/readline/posixdir.h 2013-10-11 13:09:36 +0000
1642@@ -16,7 +16,11 @@
1643
1644 You should have received a copy of the GNU General Public License
1645 along with Bash; see the file COPYING. If not, write to the Free
1646+<<<<<<< TREE
1647 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1648+=======
1649+ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1650+>>>>>>> MERGE-SOURCE
1651
1652 /* This file should be included instead of <dirent.h> or <sys/dir.h>. */
1653
1654
1655=== modified file 'Percona-Server/cmd-line-utils/readline/posixjmp.h'
1656--- Percona-Server/cmd-line-utils/readline/posixjmp.h 2013-03-19 14:53:48 +0000
1657+++ Percona-Server/cmd-line-utils/readline/posixjmp.h 2013-10-11 13:09:36 +0000
1658@@ -16,7 +16,12 @@
1659
1660 You should have received a copy of the GNU General Public License
1661 along with Bash; see the file COPYING. If not, write to the Free
1662+<<<<<<< TREE
1663 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1664+=======
1665+ Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
1666+ MA 02110-1301, USA. */
1667+>>>>>>> MERGE-SOURCE
1668
1669 #ifndef _POSIXJMP_H_
1670 #define _POSIXJMP_H_
1671
1672=== modified file 'Percona-Server/cmd-line-utils/readline/posixstat.h'
1673--- Percona-Server/cmd-line-utils/readline/posixstat.h 2013-03-19 14:53:48 +0000
1674+++ Percona-Server/cmd-line-utils/readline/posixstat.h 2013-10-11 13:09:36 +0000
1675@@ -17,7 +17,12 @@
1676
1677 You should have received a copy of the GNU General Public License
1678 along with Bash; see the file COPYING. If not, write to the Free
1679+<<<<<<< TREE
1680 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1681+=======
1682+ Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
1683+ MA 02110-1301, USA. */
1684+>>>>>>> MERGE-SOURCE
1685
1686 /* This file should be included instead of <sys/stat.h>.
1687 It relies on the local sys/stat.h to work though. */
1688
1689=== modified file 'Percona-Server/cmd-line-utils/readline/readline.c'
1690--- Percona-Server/cmd-line-utils/readline/readline.c 2013-03-19 14:53:48 +0000
1691+++ Percona-Server/cmd-line-utils/readline/readline.c 2013-10-11 13:09:36 +0000
1692@@ -19,7 +19,11 @@
1693 The GNU General Public License is often shipped with GNU software, and
1694 is generally kept in a file called COPYING or LICENSE. If you do not
1695 have a copy of the license, write to the Free Software Foundation,
1696+<<<<<<< TREE
1697 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1698+=======
1699+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1700+>>>>>>> MERGE-SOURCE
1701 #define READLINE_LIBRARY
1702
1703 #if defined (HAVE_CONFIG_H)
1704
1705=== modified file 'Percona-Server/cmd-line-utils/readline/readline.h'
1706--- Percona-Server/cmd-line-utils/readline/readline.h 2013-03-19 14:53:48 +0000
1707+++ Percona-Server/cmd-line-utils/readline/readline.h 2013-10-11 13:09:36 +0000
1708@@ -18,7 +18,11 @@
1709 The GNU General Public License is often shipped with GNU software, and
1710 is generally kept in a file called COPYING or LICENSE. If you do not
1711 have a copy of the license, write to the Free Software Foundation,
1712+<<<<<<< TREE
1713 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1714+=======
1715+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1716+>>>>>>> MERGE-SOURCE
1717
1718 #if !defined (_READLINE_H_)
1719 #define _READLINE_H_
1720
1721=== modified file 'Percona-Server/cmd-line-utils/readline/rlconf.h'
1722--- Percona-Server/cmd-line-utils/readline/rlconf.h 2013-03-19 14:53:48 +0000
1723+++ Percona-Server/cmd-line-utils/readline/rlconf.h 2013-10-11 13:09:36 +0000
1724@@ -19,7 +19,11 @@
1725 The GNU General Public License is often shipped with GNU software, and
1726 is generally kept in a file called COPYING or LICENSE. If you do not
1727 have a copy of the license, write to the Free Software Foundation,
1728+<<<<<<< TREE
1729 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1730+=======
1731+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1732+>>>>>>> MERGE-SOURCE
1733
1734 #if !defined (_RLCONF_H_)
1735 #define _RLCONF_H_
1736
1737=== modified file 'Percona-Server/cmd-line-utils/readline/rlmbutil.h'
1738--- Percona-Server/cmd-line-utils/readline/rlmbutil.h 2013-03-19 14:53:48 +0000
1739+++ Percona-Server/cmd-line-utils/readline/rlmbutil.h 2013-10-11 13:09:36 +0000
1740@@ -18,7 +18,11 @@
1741 The GNU General Public License is often shipped with GNU software, and
1742 is generally kept in a file called COPYING or LICENSE. If you do not
1743 have a copy of the license, write to the Free Software Foundation,
1744+<<<<<<< TREE
1745 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1746+=======
1747+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1748+>>>>>>> MERGE-SOURCE
1749
1750 #if !defined (_RL_MBUTIL_H_)
1751 #define _RL_MBUTIL_H_
1752
1753=== modified file 'Percona-Server/cmd-line-utils/readline/rlstdc.h'
1754--- Percona-Server/cmd-line-utils/readline/rlstdc.h 2013-03-19 14:53:48 +0000
1755+++ Percona-Server/cmd-line-utils/readline/rlstdc.h 2013-10-11 13:09:36 +0000
1756@@ -17,7 +17,12 @@
1757
1758 You should have received a copy of the GNU General Public License
1759 along with Bash; see the file COPYING. If not, write to the Free
1760+<<<<<<< TREE
1761 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1762+=======
1763+ Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
1764+ MA 02110-1301, USA. */
1765+>>>>>>> MERGE-SOURCE
1766
1767 #if !defined (_RL_STDC_H_)
1768 #define _RL_STDC_H_
1769
1770=== modified file 'Percona-Server/cmd-line-utils/readline/rltty.c'
1771--- Percona-Server/cmd-line-utils/readline/rltty.c 2013-03-19 14:53:48 +0000
1772+++ Percona-Server/cmd-line-utils/readline/rltty.c 2013-10-11 13:09:36 +0000
1773@@ -19,7 +19,11 @@
1774 The GNU General Public License is often shipped with GNU software, and
1775 is generally kept in a file called COPYING or LICENSE. If you do not
1776 have a copy of the license, write to the Free Software Foundation,
1777+<<<<<<< TREE
1778 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1779+=======
1780+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1781+>>>>>>> MERGE-SOURCE
1782 #define READLINE_LIBRARY
1783
1784 #if defined (HAVE_CONFIG_H)
1785
1786=== modified file 'Percona-Server/cmd-line-utils/readline/rltypedefs.h'
1787--- Percona-Server/cmd-line-utils/readline/rltypedefs.h 2013-03-19 14:53:48 +0000
1788+++ Percona-Server/cmd-line-utils/readline/rltypedefs.h 2013-10-11 13:09:36 +0000
1789@@ -18,7 +18,11 @@
1790 The GNU General Public License is often shipped with GNU software, and
1791 is generally kept in a file called COPYING or LICENSE. If you do not
1792 have a copy of the license, write to the Free Software Foundation,
1793+<<<<<<< TREE
1794 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1795+=======
1796+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1797+>>>>>>> MERGE-SOURCE
1798
1799 #ifndef _RL_TYPEDEFS_H_
1800 #define _RL_TYPEDEFS_H_
1801
1802=== modified file 'Percona-Server/cmd-line-utils/readline/savestring.c'
1803--- Percona-Server/cmd-line-utils/readline/savestring.c 2013-03-19 14:53:48 +0000
1804+++ Percona-Server/cmd-line-utils/readline/savestring.c 2013-10-11 13:09:36 +0000
1805@@ -18,7 +18,11 @@
1806 The GNU General Public License is often shipped with GNU software, and
1807 is generally kept in a file called COPYING or LICENSE. If you do not
1808 have a copy of the license, write to the Free Software Foundation,
1809+<<<<<<< TREE
1810 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1811+=======
1812+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1813+>>>>>>> MERGE-SOURCE
1814 #define READLINE_LIBRARY
1815
1816 #include "config_readline.h"
1817
1818=== modified file 'Percona-Server/cmd-line-utils/readline/search.c'
1819--- Percona-Server/cmd-line-utils/readline/search.c 2013-03-19 14:53:48 +0000
1820+++ Percona-Server/cmd-line-utils/readline/search.c 2013-10-11 13:09:36 +0000
1821@@ -19,7 +19,11 @@
1822 The GNU General Public License is often shipped with GNU software, and
1823 is generally kept in a file called COPYING or LICENSE. If you do not
1824 have a copy of the license, write to the Free Software Foundation,
1825+<<<<<<< TREE
1826 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1827+=======
1828+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1829+>>>>>>> MERGE-SOURCE
1830 #define READLINE_LIBRARY
1831
1832 #if defined (HAVE_CONFIG_H)
1833
1834=== modified file 'Percona-Server/cmd-line-utils/readline/shell.c'
1835--- Percona-Server/cmd-line-utils/readline/shell.c 2013-03-19 14:53:48 +0000
1836+++ Percona-Server/cmd-line-utils/readline/shell.c 2013-10-11 13:09:36 +0000
1837@@ -19,7 +19,11 @@
1838 The GNU General Public License is often shipped with GNU software, and
1839 is generally kept in a file called COPYING or LICENSE. If you do not
1840 have a copy of the license, write to the Free Software Foundation,
1841+<<<<<<< TREE
1842 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1843+=======
1844+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1845+>>>>>>> MERGE-SOURCE
1846 #define READLINE_LIBRARY
1847
1848 #if defined (HAVE_CONFIG_H)
1849
1850=== modified file 'Percona-Server/cmd-line-utils/readline/text.c'
1851--- Percona-Server/cmd-line-utils/readline/text.c 2013-03-19 14:53:48 +0000
1852+++ Percona-Server/cmd-line-utils/readline/text.c 2013-10-11 13:09:36 +0000
1853@@ -18,7 +18,11 @@
1854 The GNU General Public License is often shipped with GNU software, and
1855 is generally kept in a file called COPYING or LICENSE. If you do not
1856 have a copy of the license, write to the Free Software Foundation,
1857+<<<<<<< TREE
1858 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1859+=======
1860+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1861+>>>>>>> MERGE-SOURCE
1862 #define READLINE_LIBRARY
1863
1864 #if defined (HAVE_CONFIG_H)
1865
1866=== modified file 'Percona-Server/cmd-line-utils/readline/tilde.c'
1867--- Percona-Server/cmd-line-utils/readline/tilde.c 2013-03-19 14:53:48 +0000
1868+++ Percona-Server/cmd-line-utils/readline/tilde.c 2013-10-11 13:09:36 +0000
1869@@ -17,7 +17,11 @@
1870
1871 You should have received a copy of the GNU General Public License
1872 along with Readline; see the file COPYING. If not, write to the Free
1873+<<<<<<< TREE
1874 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1875+=======
1876+ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1877+>>>>>>> MERGE-SOURCE
1878
1879 #if defined (HAVE_CONFIG_H)
1880 # include "config_readline.h"
1881
1882=== modified file 'Percona-Server/cmd-line-utils/readline/tilde.h'
1883--- Percona-Server/cmd-line-utils/readline/tilde.h 2013-03-19 14:53:48 +0000
1884+++ Percona-Server/cmd-line-utils/readline/tilde.h 2013-10-11 13:09:36 +0000
1885@@ -19,7 +19,11 @@
1886 The GNU General Public License is often shipped with GNU software, and
1887 is generally kept in a file called COPYING or LICENSE. If you do not
1888 have a copy of the license, write to the Free Software Foundation,
1889+<<<<<<< TREE
1890 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1891+=======
1892+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1893+>>>>>>> MERGE-SOURCE
1894
1895 #if !defined (_TILDE_H_)
1896 # define _TILDE_H_
1897
1898=== modified file 'Percona-Server/cmd-line-utils/readline/util.c'
1899--- Percona-Server/cmd-line-utils/readline/util.c 2013-03-19 14:53:48 +0000
1900+++ Percona-Server/cmd-line-utils/readline/util.c 2013-10-11 13:09:36 +0000
1901@@ -18,7 +18,11 @@
1902 The GNU General Public License is often shipped with GNU software, and
1903 is generally kept in a file called COPYING or LICENSE. If you do not
1904 have a copy of the license, write to the Free Software Foundation,
1905+<<<<<<< TREE
1906 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1907+=======
1908+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1909+>>>>>>> MERGE-SOURCE
1910 #define READLINE_LIBRARY
1911
1912 #if defined (HAVE_CONFIG_H)
1913
1914=== modified file 'Percona-Server/cmd-line-utils/readline/vi_keymap.c'
1915--- Percona-Server/cmd-line-utils/readline/vi_keymap.c 2013-03-19 14:53:48 +0000
1916+++ Percona-Server/cmd-line-utils/readline/vi_keymap.c 2013-10-11 13:09:36 +0000
1917@@ -18,7 +18,11 @@
1918 The GNU General Public License is often shipped with GNU software, and
1919 is generally kept in a file called COPYING or LICENSE. If you do not
1920 have a copy of the license, write to the Free Software Foundation,
1921+<<<<<<< TREE
1922 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1923+=======
1924+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1925+>>>>>>> MERGE-SOURCE
1926
1927 #if !defined (BUFSIZ)
1928 #include <stdio.h>
1929
1930=== modified file 'Percona-Server/cmd-line-utils/readline/vi_mode.c'
1931--- Percona-Server/cmd-line-utils/readline/vi_mode.c 2013-03-19 14:53:48 +0000
1932+++ Percona-Server/cmd-line-utils/readline/vi_mode.c 2013-10-11 13:09:36 +0000
1933@@ -19,7 +19,11 @@
1934 The GNU General Public License is often shipped with GNU software, and
1935 is generally kept in a file called COPYING or LICENSE. If you do not
1936 have a copy of the license, write to the Free Software Foundation,
1937+<<<<<<< TREE
1938 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1939+=======
1940+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1941+>>>>>>> MERGE-SOURCE
1942 #define READLINE_LIBRARY
1943
1944 /* **************************************************************** */
1945
1946=== modified file 'Percona-Server/cmd-line-utils/readline/xmalloc.c'
1947--- Percona-Server/cmd-line-utils/readline/xmalloc.c 2013-03-19 14:53:48 +0000
1948+++ Percona-Server/cmd-line-utils/readline/xmalloc.c 2013-10-11 13:09:36 +0000
1949@@ -17,7 +17,12 @@
1950
1951 You should have received a copy of the GNU General Public License
1952 along with Readline; see the file COPYING. If not, write to the Free
1953+<<<<<<< TREE
1954 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1955+=======
1956+ Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
1957+ MA 02110-1301, USA. */
1958+>>>>>>> MERGE-SOURCE
1959 #define READLINE_LIBRARY
1960
1961 #if defined (HAVE_CONFIG_H)
1962
1963=== modified file 'Percona-Server/cmd-line-utils/readline/xmalloc.h'
1964--- Percona-Server/cmd-line-utils/readline/xmalloc.h 2013-03-19 14:53:48 +0000
1965+++ Percona-Server/cmd-line-utils/readline/xmalloc.h 2013-10-11 13:09:36 +0000
1966@@ -18,7 +18,11 @@
1967 The GNU General Public License is often shipped with GNU software, and
1968 is generally kept in a file called COPYING or LICENSE. If you do not
1969 have a copy of the license, write to the Free Software Foundation,
1970+<<<<<<< TREE
1971 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1972+=======
1973+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
1974+>>>>>>> MERGE-SOURCE
1975
1976 #if !defined (_XMALLOC_H_)
1977 #define _XMALLOC_H_
1978
1979=== added directory 'Percona-Server/config'
1980=== added directory 'Percona-Server/config/ac-macros'
1981=== added file 'Percona-Server/config/ac-macros/misc.m4.OTHER'
1982--- Percona-Server/config/ac-macros/misc.m4.OTHER 1970-01-01 00:00:00 +0000
1983+++ Percona-Server/config/ac-macros/misc.m4.OTHER 2013-10-11 13:09:36 +0000
1984@@ -0,0 +1,695 @@
1985+# Local macros for automake & autoconf
1986+
1987+#---START: Used in for client configure
1988+AC_DEFUN([MYSQL_TYPE_ACCEPT],
1989+[ac_save_CXXFLAGS="$CXXFLAGS"
1990+AC_CACHE_CHECK([base type of last arg to accept], mysql_cv_btype_last_arg_accept,
1991+AC_LANG_PUSH(C++)
1992+if test "$ac_cv_prog_gxx" = "yes"
1993+then
1994+ # Add -Werror, remove -fbranch-probabilities (Bug #268)
1995+ CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-Wcheck//'`
1996+fi
1997+mysql_cv_btype_last_arg_accept=none
1998+[AC_TRY_COMPILE([#if defined(inline)
1999+#undef inline
2000+#endif
2001+#include <stdlib.h>
2002+#include <sys/types.h>
2003+#include <sys/socket.h>
2004+],
2005+[int a = accept(1, (struct sockaddr *) 0, (socklen_t *) 0); return (a != 0);],
2006+mysql_cv_btype_last_arg_accept=socklen_t)]
2007+if test "$mysql_cv_btype_last_arg_accept" = "none"; then
2008+[AC_TRY_COMPILE([#if defined(inline)
2009+#undef inline
2010+#endif
2011+#include <stdlib.h>
2012+#include <sys/types.h>
2013+#include <sys/socket.h>
2014+],
2015+[int a = accept(1, (struct sockaddr *) 0, (size_t *) 0); return (a != 0);],
2016+mysql_cv_btype_last_arg_accept=size_t)]
2017+fi
2018+if test "$mysql_cv_btype_last_arg_accept" = "none"; then
2019+mysql_cv_btype_last_arg_accept=int
2020+fi)
2021+AC_LANG_POP(C++)
2022+AC_DEFINE_UNQUOTED([SOCKET_SIZE_TYPE], [$mysql_cv_btype_last_arg_accept],
2023+ [The base type of the last arg to accept])
2024+CXXFLAGS="$ac_save_CXXFLAGS"
2025+])
2026+#---END:
2027+
2028+dnl Find type of qsort
2029+AC_DEFUN([MYSQL_TYPE_QSORT],
2030+[AC_CACHE_CHECK([return type of qsort], mysql_cv_type_qsort,
2031+[AC_TRY_COMPILE([#include <stdlib.h>
2032+#ifdef __cplusplus
2033+extern "C"
2034+#endif
2035+void qsort(void *base, size_t nel, size_t width,
2036+ int (*compar) (const void *, const void *));
2037+],
2038+[int i;], mysql_cv_type_qsort=void, mysql_cv_type_qsort=int)])
2039+AC_DEFINE_UNQUOTED([RETQSORTTYPE], [$mysql_cv_type_qsort],
2040+ [The return type of qsort (int or void).])
2041+if test "$mysql_cv_type_qsort" = "void"
2042+then
2043+ AC_DEFINE_UNQUOTED([QSORT_TYPE_IS_VOID], [1], [qsort returns void])
2044+fi
2045+])
2046+
2047+#---START: Figure out whether to use 'struct rlimit' or 'struct rlimit64'
2048+AC_DEFUN([MYSQL_TYPE_STRUCT_RLIMIT],
2049+[ac_save_CXXFLAGS="$CXXFLAGS"
2050+AC_CACHE_CHECK([struct type to use with setrlimit], mysql_cv_btype_struct_rlimit,
2051+AC_LANG_PUSH(C++)
2052+if test "$ac_cv_prog_gxx" = "yes"
2053+then
2054+ # Add -Werror, remove -fbranch-probabilities (Bug #268)
2055+ CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-Wcheck//'`
2056+fi
2057+mysql_cv_btype_struct_rlimit=none
2058+[AC_TRY_COMPILE([#if defined(inline)
2059+#undef inline
2060+#endif
2061+#include <stdlib.h>
2062+#include <sys/resource.h>
2063+],
2064+[struct rlimit64 rl; setrlimit(RLIMIT_CORE, &rl);],
2065+mysql_cv_btype_struct_rlimit="struct rlimit64")]
2066+if test "$mysql_cv_btype_struct_rlimit" = "none"; then
2067+mysql_cv_btype_struct_rlimit="struct rlimit"
2068+fi)
2069+AC_LANG_POP(C++)
2070+AC_DEFINE_UNQUOTED([STRUCT_RLIMIT], [$mysql_cv_btype_struct_rlimit],
2071+ [The struct rlimit type to use with setrlimit])
2072+CXXFLAGS="$ac_save_CXXFLAGS"
2073+])
2074+#---END:
2075+
2076+AC_DEFUN([MYSQL_TIMESPEC_TS],
2077+[AC_CACHE_CHECK([if struct timespec has a ts_sec member], mysql_cv_timespec_ts,
2078+[AC_TRY_COMPILE([#include <pthread.h>
2079+#ifdef __cplusplus
2080+extern "C"
2081+#endif
2082+],
2083+[struct timespec abstime;
2084+
2085+abstime.ts_sec = time(NULL)+1;
2086+abstime.ts_nsec = 0;
2087+], mysql_cv_timespec_ts=yes, mysql_cv_timespec_ts=no)])
2088+if test "$mysql_cv_timespec_ts" = "yes"
2089+then
2090+ AC_DEFINE([HAVE_TIMESPEC_TS_SEC], [1],
2091+ [Timespec has a ts_sec instead of tv_sev])
2092+fi
2093+])
2094+
2095+AC_DEFUN([MYSQL_TZNAME],
2096+[AC_CACHE_CHECK([if we have tzname variable], mysql_cv_tzname,
2097+[AC_TRY_COMPILE([#include <time.h>
2098+#ifdef __cplusplus
2099+extern "C"
2100+#endif
2101+],
2102+[ tzset();
2103+ return tzname[0] != 0;
2104+], mysql_cv_tzname=yes, mysql_cv_tzname=no)])
2105+if test "$mysql_cv_tzname" = "yes"
2106+then
2107+ AC_DEFINE([HAVE_TZNAME], [1], [Have the tzname variable])
2108+fi
2109+])
2110+
2111+
2112+AC_DEFUN([MYSQL_PTHREAD_YIELD],
2113+[AC_CACHE_CHECK([if pthread_yield takes zero arguments], ac_cv_pthread_yield_zero_arg,
2114+[AC_TRY_LINK([#define _GNU_SOURCE
2115+#include <pthread.h>
2116+#ifdef __cplusplus
2117+extern "C"
2118+#endif
2119+],
2120+[
2121+ pthread_yield();
2122+], ac_cv_pthread_yield_zero_arg=yes, ac_cv_pthread_yield_zero_arg=yeso)])
2123+if test "$ac_cv_pthread_yield_zero_arg" = "yes"
2124+then
2125+ AC_DEFINE([HAVE_PTHREAD_YIELD_ZERO_ARG], [1],
2126+ [pthread_yield that doesn't take any arguments])
2127+fi
2128+]
2129+[AC_CACHE_CHECK([if pthread_yield takes 1 argument], ac_cv_pthread_yield_one_arg,
2130+[AC_TRY_LINK([#define _GNU_SOURCE
2131+#include <pthread.h>
2132+#ifdef __cplusplus
2133+extern "C"
2134+#endif
2135+],
2136+[
2137+ pthread_yield(0);
2138+], ac_cv_pthread_yield_one_arg=yes, ac_cv_pthread_yield_one_arg=no)])
2139+if test "$ac_cv_pthread_yield_one_arg" = "yes"
2140+then
2141+ AC_DEFINE([HAVE_PTHREAD_YIELD_ONE_ARG], [1],
2142+ [pthread_yield function with one argument])
2143+fi
2144+]
2145+)
2146+
2147+
2148+
2149+#---END:
2150+
2151+# From fileutils-3.14/aclocal.m4
2152+
2153+# @defmac AC_PROG_CC_STDC
2154+# @maindex PROG_CC_STDC
2155+# @ovindex CC
2156+# If the C compiler in not in ANSI C mode by default, try to add an option
2157+# to output variable @code{CC} to make it so. This macro tries various
2158+# options that select ANSI C on some system or another. It considers the
2159+# compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and
2160+# handles function prototypes correctly.
2161+#
2162+# Patched by monty to only check if __STDC__ is defined. With the original
2163+# check it's impossible to get things to work with the Sunpro compiler from
2164+# Workshop 4.2
2165+#
2166+# If you use this macro, you should check after calling it whether the C
2167+# compiler has been set to accept ANSI C; if not, the shell variable
2168+# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source
2169+# code in ANSI C, you can make an un-ANSIfied copy of it by using the
2170+# program @code{ansi2knr}, which comes with Ghostscript.
2171+# @end defmac
2172+
2173+AC_DEFUN([AM_PROG_CC_STDC],
2174+[AC_REQUIRE([AC_PROG_CC])
2175+AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
2176+AC_CACHE_VAL(am_cv_prog_cc_stdc,
2177+[am_cv_prog_cc_stdc=no
2178+ac_save_CC="$CC"
2179+# Don't try gcc -ansi; that turns off useful extensions and
2180+# breaks some systems' header files.
2181+# AIX -qlanglvl=ansi
2182+# Ultrix and OSF/1 -std1
2183+# HP-UX -Aa -D_HPUX_SOURCE
2184+# SVR4 -Xc -D__EXTENSIONS__
2185+# removed "-Xc -D__EXTENSIONS__" beacause sun c++ does not like it.
2186+for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE"
2187+do
2188+ CC="$ac_save_CC $ac_arg"
2189+ AC_TRY_COMPILE(
2190+[#if !defined(__STDC__)
2191+choke me
2192+#endif
2193+/* DYNIX/ptx V4.1.3 can't compile sys/stat.h with -Xc -D__EXTENSIONS__. */
2194+#ifdef _SEQUENT_
2195+# include <sys/types.h>
2196+# include <sys/stat.h>
2197+#endif
2198+], [
2199+int test (int i, double x);
2200+struct s1 {int (*f) (int a);};
2201+struct s2 {int (*f) (double a);};],
2202+[am_cv_prog_cc_stdc="$ac_arg"; break])
2203+done
2204+CC="$ac_save_CC"
2205+])
2206+AC_MSG_RESULT($am_cv_prog_cc_stdc)
2207+case "x$am_cv_prog_cc_stdc" in
2208+ x|xno) ;;
2209+ *) CC="$CC $am_cv_prog_cc_stdc" ;;
2210+esac
2211+])
2212+
2213+# Orginal from bash-2.0 aclocal.m4, Changed to use termcap last by monty.
2214+
2215+AC_DEFUN([MYSQL_CHECK_LIB_TERMCAP],
2216+[
2217+AC_CACHE_VAL(mysql_cv_termcap_lib,
2218+ [AC_CHECK_LIB(ncursesw, tgetent, mysql_cv_termcap_lib=libncursesw,
2219+ [AC_CHECK_LIB(ncurses, tgetent, mysql_cv_termcap_lib=libncurses,
2220+ [AC_CHECK_LIB(curses, tgetent, mysql_cv_termcap_lib=libcurses,
2221+ [AC_CHECK_LIB(termcap, tgetent, mysql_cv_termcap_lib=libtermcap,
2222+ [AC_CHECK_LIB(tinfo, tgetent, mysql_cv_termcap_lib=libtinfo,
2223+ mysql_cv_termcap_lib=NOT_FOUND)])])])])])
2224+AC_MSG_CHECKING(for termcap functions library)
2225+if test "$mysql_cv_termcap_lib" = "NOT_FOUND"; then
2226+AC_MSG_ERROR([No curses/termcap library found])
2227+elif test "$mysql_cv_termcap_lib" = "libtermcap"; then
2228+TERMCAP_LIB=-ltermcap
2229+elif test "$mysql_cv_termcap_lib" = "libncursesw"; then
2230+TERMCAP_LIB=-lncursesw
2231+elif test "$mysql_cv_termcap_lib" = "libncurses"; then
2232+TERMCAP_LIB=-lncurses
2233+elif test "$mysql_cv_termcap_lib" = "libtinfo"; then
2234+TERMCAP_LIB=-ltinfo
2235+else
2236+TERMCAP_LIB=-lcurses
2237+fi
2238+AC_MSG_RESULT($TERMCAP_LIB)
2239+])
2240+
2241+dnl Check type of signal routines (posix, 4.2bsd, 4.1bsd or v7)
2242+AC_DEFUN([MYSQL_SIGNAL_CHECK],
2243+[AC_REQUIRE([AC_TYPE_SIGNAL])
2244+AC_MSG_CHECKING(for type of signal functions)
2245+AC_CACHE_VAL(mysql_cv_signal_vintage,
2246+[
2247+ AC_TRY_LINK([#include <signal.h>],[
2248+ sigset_t ss;
2249+ struct sigaction sa;
2250+ sigemptyset(&ss); sigsuspend(&ss);
2251+ sigaction(SIGINT, &sa, (struct sigaction *) 0);
2252+ sigprocmask(SIG_BLOCK, &ss, (sigset_t *) 0);
2253+ ], mysql_cv_signal_vintage=posix,
2254+ [
2255+ AC_TRY_LINK([#include <signal.h>], [
2256+ int mask = sigmask(SIGINT);
2257+ sigsetmask(mask); sigblock(mask); sigpause(mask);
2258+ ], mysql_cv_signal_vintage=4.2bsd,
2259+ [
2260+ AC_TRY_LINK([
2261+ #include <signal.h>
2262+ RETSIGTYPE foo() { }], [
2263+ int mask = sigmask(SIGINT);
2264+ sigset(SIGINT, foo); sigrelse(SIGINT);
2265+ sighold(SIGINT); sigpause(SIGINT);
2266+ ], mysql_cv_signal_vintage=svr3, mysql_cv_signal_vintage=v7
2267+ )]
2268+ )]
2269+)
2270+])
2271+AC_MSG_RESULT($mysql_cv_signal_vintage)
2272+if test "$mysql_cv_signal_vintage" = posix; then
2273+AC_DEFINE(HAVE_POSIX_SIGNALS, [1],
2274+ [Signal handling is POSIX (sigset/sighold, etc)])
2275+elif test "$mysql_cv_signal_vintage" = "4.2bsd"; then
2276+AC_DEFINE([HAVE_BSD_SIGNALS], [1], [BSD style signals])
2277+elif test "$mysql_cv_signal_vintage" = svr3; then
2278+AC_DEFINE(HAVE_USG_SIGHOLD, [1], [sighold() is present and usable])
2279+fi
2280+])
2281+
2282+AC_DEFUN([MYSQL_CHECK_GETPW_FUNCS],
2283+[AC_MSG_CHECKING(whether programs are able to redeclare getpw functions)
2284+AC_CACHE_VAL(mysql_cv_can_redecl_getpw,
2285+[AC_TRY_COMPILE([#include <sys/types.h>
2286+#include <pwd.h>
2287+extern struct passwd *getpwent();], [struct passwd *z; z = getpwent();],
2288+ mysql_cv_can_redecl_getpw=yes,mysql_cv_can_redecl_getpw=no)])
2289+AC_MSG_RESULT($mysql_cv_can_redecl_getpw)
2290+if test "$mysql_cv_can_redecl_getpw" = "no"; then
2291+AC_DEFINE(HAVE_GETPW_DECLS, [1], [getpwent() declaration present])
2292+fi
2293+])
2294+
2295+AC_DEFUN([MYSQL_HAVE_TIOCGWINSZ],
2296+[AC_MSG_CHECKING(for TIOCGWINSZ in sys/ioctl.h)
2297+AC_CACHE_VAL(mysql_cv_tiocgwinsz_in_ioctl,
2298+[AC_TRY_COMPILE([#include <sys/types.h>
2299+#include <sys/ioctl.h>], [int x = TIOCGWINSZ;],
2300+ mysql_cv_tiocgwinsz_in_ioctl=yes,mysql_cv_tiocgwinsz_in_ioctl=no)])
2301+AC_MSG_RESULT($mysql_cv_tiocgwinsz_in_ioctl)
2302+if test "$mysql_cv_tiocgwinsz_in_ioctl" = "yes"; then
2303+AC_DEFINE([GWINSZ_IN_SYS_IOCTL], [1],
2304+ [READLINE: your system defines TIOCGWINSZ in sys/ioctl.h.])
2305+fi
2306+])
2307+
2308+AC_DEFUN([MYSQL_HAVE_FIONREAD],
2309+[AC_MSG_CHECKING(for FIONREAD in sys/ioctl.h)
2310+AC_CACHE_VAL(mysql_cv_fionread_in_ioctl,
2311+[AC_TRY_COMPILE([#include <sys/types.h>
2312+#include <sys/ioctl.h>], [int x = FIONREAD;],
2313+ mysql_cv_fionread_in_ioctl=yes,mysql_cv_fionread_in_ioctl=no)])
2314+AC_MSG_RESULT($mysql_cv_fionread_in_ioctl)
2315+if test "$mysql_cv_fionread_in_ioctl" = "yes"; then
2316+AC_DEFINE([FIONREAD_IN_SYS_IOCTL], [1], [Do we have FIONREAD])
2317+fi
2318+])
2319+
2320+AC_DEFUN([MYSQL_HAVE_TIOCSTAT],
2321+[AC_MSG_CHECKING(for TIOCSTAT in sys/ioctl.h)
2322+AC_CACHE_VAL(mysql_cv_tiocstat_in_ioctl,
2323+[AC_TRY_COMPILE([#include <sys/types.h>
2324+#include <sys/ioctl.h>], [int x = TIOCSTAT;],
2325+ mysql_cv_tiocstat_in_ioctl=yes,mysql_cv_tiocstat_in_ioctl=no)])
2326+AC_MSG_RESULT($mysql_cv_tiocstat_in_ioctl)
2327+if test "$mysql_cv_tiocstat_in_ioctl" = "yes"; then
2328+AC_DEFINE(TIOCSTAT_IN_SYS_IOCTL, [1],
2329+ [declaration of TIOCSTAT in sys/ioctl.h])
2330+fi
2331+])
2332+
2333+AC_DEFUN([MYSQL_STRUCT_DIRENT_D_INO],
2334+[AC_REQUIRE([AC_HEADER_DIRENT])
2335+AC_MSG_CHECKING(if struct dirent has a d_ino member)
2336+AC_CACHE_VAL(mysql_cv_dirent_has_dino,
2337+[AC_TRY_COMPILE([
2338+#include <stdio.h>
2339+#include <sys/types.h>
2340+#ifdef HAVE_UNISTD_H
2341+# include <unistd.h>
2342+#endif /* HAVE_UNISTD_H */
2343+#if defined(HAVE_DIRENT_H)
2344+# include <dirent.h>
2345+#else
2346+# define dirent direct
2347+# ifdef HAVE_SYS_NDIR_H
2348+# include <sys/ndir.h>
2349+# endif /* SYSNDIR */
2350+# ifdef HAVE_SYS_DIR_H
2351+# include <sys/dir.h>
2352+# endif /* SYSDIR */
2353+# ifdef HAVE_NDIR_H
2354+# include <ndir.h>
2355+# endif
2356+#endif /* HAVE_DIRENT_H */
2357+],[
2358+struct dirent d; int z; z = d.d_ino;
2359+], mysql_cv_dirent_has_dino=yes, mysql_cv_dirent_has_dino=no)])
2360+AC_MSG_RESULT($mysql_cv_dirent_has_dino)
2361+if test "$mysql_cv_dirent_has_dino" = "yes"; then
2362+AC_DEFINE(STRUCT_DIRENT_HAS_D_INO, [1],
2363+ [d_ino member present in struct dirent])
2364+fi
2365+])
2366+
2367+AC_DEFUN([MYSQL_STRUCT_DIRENT_D_NAMLEN],
2368+[AC_REQUIRE([AC_HEADER_DIRENT])
2369+AC_MSG_CHECKING(if struct dirent has a d_namlen member)
2370+AC_CACHE_VAL(mysql_cv_dirent_has_dnamlen,
2371+[AC_TRY_COMPILE([
2372+#include <stdio.h>
2373+#include <sys/types.h>
2374+#ifdef HAVE_UNISTD_H
2375+# include <unistd.h>
2376+#endif /* HAVE_UNISTD_H */
2377+#if defined(HAVE_DIRENT_H)
2378+# include <dirent.h>
2379+#else
2380+# define dirent direct
2381+# ifdef HAVE_SYS_NDIR_H
2382+# include <sys/ndir.h>
2383+# endif /* SYSNDIR */
2384+# ifdef HAVE_SYS_DIR_H
2385+# include <sys/dir.h>
2386+# endif /* SYSDIR */
2387+# ifdef HAVE_NDIR_H
2388+# include <ndir.h>
2389+# endif
2390+#endif /* HAVE_DIRENT_H */
2391+],[
2392+struct dirent d; int z; z = (int)d.d_namlen;
2393+], mysql_cv_dirent_has_dnamlen=yes, mysql_cv_dirent_has_dnamlen=no)])
2394+AC_MSG_RESULT($mysql_cv_dirent_has_dnamlen)
2395+if test "$mysql_cv_dirent_has_dnamlen" = "yes"; then
2396+AC_DEFINE(STRUCT_DIRENT_HAS_D_NAMLEN, [1],
2397+ [d_namlen member present in struct dirent])
2398+fi
2399+])
2400+
2401+
2402+AC_DEFUN([MYSQL_TYPE_SIGHANDLER],
2403+[AC_MSG_CHECKING([whether signal handlers are of type void])
2404+AC_CACHE_VAL(mysql_cv_void_sighandler,
2405+[AC_TRY_COMPILE([#include <sys/types.h>
2406+#include <signal.h>
2407+#ifdef signal
2408+#undef signal
2409+#endif
2410+#ifdef __cplusplus
2411+extern "C"
2412+#endif
2413+void (*signal ()) ();],
2414+[int i;], mysql_cv_void_sighandler=yes, mysql_cv_void_sighandler=no)])dnl
2415+AC_MSG_RESULT($mysql_cv_void_sighandler)
2416+if test "$mysql_cv_void_sighandler" = "yes"; then
2417+AC_DEFINE(VOID_SIGHANDLER, [1], [sighandler type is void (*signal ()) ();])
2418+fi
2419+])
2420+
2421+AC_DEFUN([MYSQL_CXX_BOOL],
2422+[
2423+AC_REQUIRE([AC_PROG_CXX])
2424+AC_MSG_CHECKING(if ${CXX} supports bool types)
2425+AC_CACHE_VAL(mysql_cv_have_bool,
2426+[
2427+AC_LANG_SAVE
2428+AC_LANG_CPLUSPLUS
2429+AC_TRY_COMPILE(,[bool b = true;],
2430+mysql_cv_have_bool=yes,
2431+mysql_cv_have_bool=no)
2432+AC_LANG_RESTORE
2433+])
2434+AC_MSG_RESULT($mysql_cv_have_bool)
2435+if test "$mysql_cv_have_bool" = yes; then
2436+AC_DEFINE([HAVE_BOOL], [1], [bool is not defined by all C++ compilators])
2437+fi
2438+])dnl
2439+
2440+AC_DEFUN([MYSQL_STACK_DIRECTION],
2441+ [AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
2442+ [AC_TRY_RUN([#include <stdlib.h>
2443+ /* Prevent compiler optimization by HP's compiler, see bug#42213 */
2444+#if defined(__HP_cc) || defined (__HP_aCC) || defined (__hpux)
2445+#pragma noinline
2446+#endif
2447+ /* Check stack direction (-1 down, 1 up) */
2448+ int f(int *a)
2449+ {
2450+ int b;
2451+ return(&b > a)?1:-1;
2452+ }
2453+ /*
2454+ Prevent compiler optimizations by calling function
2455+ through pointer.
2456+ */
2457+ volatile int (*ptr_f)(int *) = f;
2458+ int main()
2459+ {
2460+ int a;
2461+ exit(ptr_f(&a) < 0);
2462+ }
2463+ ], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
2464+ ac_cv_c_stack_direction=)])
2465+ AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
2466+])dnl
2467+
2468+AC_DEFUN([MYSQL_CHECK_LONGLONG_TO_FLOAT],
2469+[
2470+AC_MSG_CHECKING(if conversion of longlong to float works)
2471+AC_CACHE_VAL(ac_cv_conv_longlong_to_float,
2472+[AC_TRY_RUN([#include <stdio.h>
2473+typedef long long longlong;
2474+int main()
2475+{
2476+ longlong ll=1;
2477+ float f;
2478+ FILE *file=fopen("conftestval", "w");
2479+ f = (float) ll;
2480+ fprintf(file,"%g\n",f);
2481+ fclose(file);
2482+ return (0);
2483+}], ac_cv_conv_longlong_to_float=`cat conftestval`,
2484+ ac_cv_conv_longlong_to_float=0,
2485+ ac_cv_conv_longlong_to_float="yes")])dnl # Cross compiling, assume can convert
2486+if test "$ac_cv_conv_longlong_to_float" = "1" -o "$ac_cv_conv_longlong_to_float" = "yes"
2487+then
2488+ ac_cv_conv_longlong_to_float=yes
2489+else
2490+ ac_cv_conv_longlong_to_float=no
2491+fi
2492+AC_MSG_RESULT($ac_cv_conv_longlong_to_float)
2493+])
2494+
2495+AC_DEFUN([MYSQL_CHECK_VIO], [
2496+dnl
2497+dnl we always use vio: no need for special defines
2498+dnl
2499+ AC_DEFINE([HAVE_VIO_READ_BUFF], [1],
2500+ [Define to enable buffered read. This works only if syscalls
2501+ read/recv return as soon as there is some data in the kernel
2502+ buffer, no matter how big the given buffer is.])
2503+])
2504+
2505+# Local version of _AC_PROG_CXX_EXIT_DECLARATION that does not
2506+# include #stdlib.h as default as this breaks things on Solaris
2507+# (Conflicts with pthreads and big file handling)
2508+
2509+m4_define([_AC_PROG_CXX_EXIT_DECLARATION],
2510+[for ac_declaration in \
2511+ ''\
2512+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
2513+ 'extern "C" void std::exit (int); using std::exit;' \
2514+ 'extern "C" void exit (int) throw ();' \
2515+ 'extern "C" void exit (int);' \
2516+ 'void exit (int);' \
2517+ '#include <stdlib.h>'
2518+do
2519+ _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$ac_declaration
2520+@%:@include <stdlib.h>],
2521+ [exit (42);])],
2522+ [],
2523+ [continue])
2524+ _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$ac_declaration],
2525+ [exit (42);])],
2526+ [break])
2527+done
2528+rm -f conftest*
2529+if test -n "$ac_declaration"; then
2530+ echo '#ifdef __cplusplus' >>confdefs.h
2531+ echo $ac_declaration >>confdefs.h
2532+ echo '#endif' >>confdefs.h
2533+fi
2534+])# _AC_PROG_CXX_EXIT_DECLARATION
2535+
2536+dnl ---------------------------------------------------------------------------
2537+
2538+
2539+dnl ---------------------------------------------------------------------------
2540+dnl Macro: MYSQL_CHECK_BIG_TABLES
2541+dnl Sets BIG_TABLES if --with-big-tables is used
2542+dnl ---------------------------------------------------------------------------
2543+AC_DEFUN([MYSQL_CHECK_BIG_TABLES], [
2544+ AC_ARG_WITH([big-tables],
2545+ AS_HELP_STRING([--with-big-tables],
2546+ [Support tables with more than 4 G rows even on 32 bit platforms]),
2547+ [bigtables="$withval"],
2548+ [bigtables=no])
2549+ AC_MSG_CHECKING([for big tables support])
2550+
2551+ case "$bigtables" in
2552+ yes )
2553+ AC_DEFINE([BIG_TABLES], [1], [Support big tables])
2554+ AC_MSG_RESULT([yes])
2555+ ;;
2556+ * )
2557+ AC_MSG_RESULT([no])
2558+ ;;
2559+ esac
2560+
2561+])
2562+dnl ---------------------------------------------------------------------------
2563+dnl END OF MYSQL_CHECK_BIG_TABLES SECTION
2564+dnl ---------------------------------------------------------------------------
2565+
2566+
2567+dnl ---------------------------------------------------------------------------
2568+dnl Macro: MYSQL_CHECK_MAX_INDEXES
2569+dnl Sets MAX_INDEXES
2570+dnl ---------------------------------------------------------------------------
2571+AC_DEFUN([MYSQL_CHECK_MAX_INDEXES], [
2572+ AC_ARG_WITH([max-indexes],
2573+ AS_HELP_STRING([--with-max-indexes=N],
2574+ [Sets the maximum number of indexes per table, default 64]),
2575+ [max_indexes="$withval"],
2576+ [max_indexes=64])
2577+ AC_MSG_CHECKING([max indexes per table])
2578+ AC_DEFINE_UNQUOTED([MAX_INDEXES], [$max_indexes],
2579+ [Maximum number of indexes per table])
2580+ AC_MSG_RESULT([$max_indexes])
2581+])
2582+dnl ---------------------------------------------------------------------------
2583+dnl END OF MYSQL_CHECK_MAX_INDEXES SECTION
2584+dnl ---------------------------------------------------------------------------
2585+
2586+
2587+dnl MYSQL_NEEDS_MYSYS_NEW
2588+AC_DEFUN([MYSQL_NEEDS_MYSYS_NEW],
2589+[AC_CACHE_CHECK([needs mysys_new helpers], mysql_cv_use_mysys_new,
2590+[
2591+AC_LANG_PUSH(C++)
2592+AC_TRY_LINK([], [
2593+class A { public: int b; }; A *a=new A; a->b=10; delete a;
2594+], mysql_cv_use_mysys_new=no, mysql_cv_use_mysys_new=yes)
2595+AC_LANG_POP(C++)
2596+])
2597+if test "$mysql_cv_use_mysys_new" = "yes"
2598+then
2599+ AC_DEFINE([USE_MYSYS_NEW], [1], [Needs to use mysys_new helpers])
2600+fi
2601+])
2602+
2603+
2604+AC_DEFUN([MYSQL_CHECK_CXX_VERSION], [
2605+case $SYSTEM_TYPE in
2606+ *netware*)
2607+ CXX_VERSION=`$CXX -version | grep -i version`
2608+ ;;
2609+ *)
2610+ CXX_VERSION=`$CXX --version | sed 1q`
2611+ if test $? -ne "0" -o -z "$CXX_VERSION"
2612+ then
2613+ CXX_VERSION=`$CXX -V 2>&1|sed 1q` # trying harder for Sun and SGI
2614+ fi
2615+ if test $? -ne "0" -o -z "$CXX_VERSION"
2616+ then
2617+ CXX_VERSION=`$CXX -v 2>&1|sed 1q` # even harder for Alpha
2618+ fi
2619+ if test $? -ne "0" -o -z "$CXX_VERSION"
2620+ then
2621+ CXX_VERSION=""
2622+ fi
2623+esac
2624+if test "$CXX_VERSION"
2625+then
2626+ AC_MSG_CHECKING("C++ compiler version")
2627+ AC_MSG_RESULT("$CXX $CXX_VERSION")
2628+fi
2629+AC_SUBST(CXX_VERSION)
2630+])
2631+
2632+AC_DEFUN([MYSQL_PROG_AR], [
2633+case $CXX_VERSION in
2634+ MIPSpro*)
2635+ AR=$CXX
2636+ ARFLAGS="-ar -o"
2637+ ;;
2638+ *Forte*)
2639+ AR=$CXX
2640+ ARFLAGS="-xar -o"
2641+ ;;
2642+ *)
2643+ AC_CHECK_PROG([AR], [ar], [ar])
2644+ if test -z "$AR" || test "$AR" = "false"
2645+ then
2646+ AC_MSG_ERROR([You need ar to build the library])
2647+ fi
2648+ if test -z "$ARFLAGS"
2649+ then
2650+ ARFLAGS="cru"
2651+ fi
2652+esac
2653+AC_SUBST(AR)
2654+AC_SUBST(ARFLAGS)
2655+])
2656+
2657+dnl
2658+dnl Macro to check time_t range: according to C standard
2659+dnl array index must be greater than 0 => if time_t is signed,
2660+dnl the code in the macros below won't compile.
2661+dnl
2662+
2663+AC_DEFUN([MYSQL_CHECK_TIME_T],[
2664+ AC_MSG_CHECKING(if time_t is unsigned)
2665+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
2666+ [[
2667+#include <time.h>
2668+ ]],
2669+ [[
2670+ int array[(((time_t)-1) > 0) ? 1 : -1];
2671+ ]] )
2672+ ], [
2673+ AC_DEFINE([TIME_T_UNSIGNED], 1, [Define to 1 if time_t is unsigned])
2674+ AC_MSG_RESULT(yes)
2675+ ],
2676+ [AC_MSG_RESULT(no)]
2677+ )
2678+])
2679+
2680
2681=== added file 'Percona-Server/configure.in.OTHER'
2682--- Percona-Server/configure.in.OTHER 1970-01-01 00:00:00 +0000
2683+++ Percona-Server/configure.in.OTHER 2013-10-11 13:09:36 +0000
2684@@ -0,0 +1,2981 @@
2685+dnl -*- ksh -*-
2686+dnl Process this file with autoconf to produce a configure script.
2687+
2688+# Minimum Autoconf version required.
2689+AC_PREREQ(2.59)
2690+
2691+dnl Various people throughout the community may parse configure.in to
2692+dnl get the MySQL version from the source branch. If the formatting
2693+dnl of this line is going to be changed, please announce the change to
2694+dnl internals@lists.mysql.com in advance of pushing the change.
2695+dnl
2696+dnl When changing the major version number please also check the switch
2697+dnl statement in mysqlbinlog::check_master_version(). You may also need
2698+dnl to update version.c in ndb.
2699+AC_INIT([MySQL Server], [5.1.72], [], [mysql])
2700+
2701+AC_CONFIG_SRCDIR([sql/mysqld.cc])
2702+AC_CANONICAL_SYSTEM
2703+# USTAR format gives us the possibility to store longer path names in
2704+# TAR files, the path name is split into two parts, a 155 chacater
2705+# first part and a 100 character second part.
2706+AM_INIT_AUTOMAKE([1.9 tar-ustar])
2707+AC_PROG_LIBTOOL
2708+
2709+AC_CONFIG_HEADERS([include/config.h])
2710+
2711+# Request support for automake silent-rules if available.
2712+# Default to verbose output. One can use the configure-time
2713+# option --enable-silent-rules or make V=0 to activate
2714+# silent rules.
2715+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
2716+
2717+PROTOCOL_VERSION=10
2718+DOT_FRM_VERSION=6
2719+# See the libtool docs for information on how to do shared lib versions.
2720+SHARED_LIB_MAJOR_VERSION=16
2721+SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
2722+NDB_SHARED_LIB_MAJOR_VERSION=3
2723+NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
2724+
2725+# Set all version vars based on $VERSION. How do we do this more elegant ?
2726+# Remember that regexps needs to quote [ and ] since this is run through m4
2727+# We take some made up examples
2728+#
2729+# VERSION 5.1.40sp1-alpha 5.0.34a 5.5.1-m2
2730+# MYSQL_U_SCORE_VERSION 5.1.40sp1_alpha 5.0.34a 5.5.1_m2
2731+# MYSQL_NO_DASH_VERSION 5.1.40sp1 5.0.34a 5.5.1
2732+# MYSQL_NUMERIC_VERSION 5.1.40 5.0.34 5.5.1
2733+# MYSQL_BASE_VERSION 5.1 5.0 5.5
2734+# MYSQL_VERSION_ID 50140 50034 50501
2735+#
2736+MYSQL_U_SCORE_VERSION=`echo $VERSION | sed -e "s|-|_|"`
2737+MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|-.*$||"`
2738+MYSQL_NUMERIC_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|[[a-z]][[a-z0-9]]*$||"`
2739+MYSQL_BASE_VERSION=`echo $MYSQL_NUMERIC_VERSION | sed -e "s|\.[[^.]]*$||"`
2740+MYSQL_VERSION_ID=`echo $MYSQL_NUMERIC_VERSION | \
2741+ awk -F. '{printf "%d%0.2d%0.2d", $1, $2, $3}'`
2742+MYSQL_COPYRIGHT_YEAR=`date '+%Y'`
2743+
2744+# Add previous major version for debian package upgrade path
2745+MYSQL_PREVIOUS_BASE_VERSION=5.0
2746+
2747+# The port should be constant for a LONG time
2748+MYSQL_TCP_PORT_DEFAULT=3306
2749+MYSQL_UNIX_ADDR_DEFAULT="/tmp/mysql.sock"
2750+
2751+dnl Include m4
2752+sinclude(config/ac-macros/maintainer.m4)
2753+sinclude(config/ac-macros/alloca.m4)
2754+sinclude(config/ac-macros/check_cpu.m4)
2755+sinclude(config/ac-macros/character_sets.m4)
2756+sinclude(config/ac-macros/compiler_flag.m4)
2757+sinclude(config/ac-macros/plugins.m4)
2758+sinclude(config/ac-macros/ha_ndbcluster.m4)
2759+sinclude(config/ac-macros/large_file.m4)
2760+sinclude(config/ac-macros/misc.m4)
2761+sinclude(config/ac-macros/readline.m4)
2762+sinclude(config/ac-macros/ssl.m4)
2763+sinclude(config/ac-macros/zlib.m4)
2764+
2765+# Remember to add a directory sql/share/LANGUAGE
2766+AVAILABLE_LANGUAGES="\
2767+czech danish dutch english estonian french german greek hungarian \
2768+italian japanese korean norwegian norwegian-ny polish portuguese \
2769+romanian russian serbian slovak spanish swedish ukrainian"
2770+
2771+#####
2772+#####
2773+
2774+AC_SUBST(MYSQL_U_SCORE_VERSION)
2775+AC_SUBST(MYSQL_NO_DASH_VERSION)
2776+AC_SUBST(MYSQL_BASE_VERSION)
2777+AC_SUBST(MYSQL_VERSION_ID)
2778+AC_SUBST(MYSQL_PREVIOUS_BASE_VERSION)
2779+AC_SUBST(MYSQL_COPYRIGHT_YEAR)
2780+AC_SUBST(PROTOCOL_VERSION)
2781+AC_DEFINE_UNQUOTED([PROTOCOL_VERSION], [$PROTOCOL_VERSION],
2782+ [mysql client protocol version])
2783+AC_SUBST(DOT_FRM_VERSION)
2784+AC_DEFINE_UNQUOTED([DOT_FRM_VERSION], [$DOT_FRM_VERSION],
2785+ [Version of .frm files])
2786+AC_SUBST(SHARED_LIB_MAJOR_VERSION)
2787+AC_SUBST(SHARED_LIB_VERSION)
2788+AC_SUBST(AVAILABLE_LANGUAGES)
2789+
2790+# Check whether a debug mode should be enabled.
2791+AC_ARG_WITH([debug],
2792+ AS_HELP_STRING([--with-debug@<:@=full@:>@],
2793+ [Enable various amounts of debugging support (full adds a slow memory checker).]),
2794+ [with_debug=$withval],
2795+ [with_debug=no])
2796+
2797+# Whether the maintainer mode should be enabled.
2798+MY_MAINTAINER_MODE
2799+
2800+# Canonicalize the configuration name.
2801+
2802+# Check whether --with-system-type or --without-system-type was given.
2803+AC_ARG_WITH(system-type,
2804+ [ --with-system-type Set the system type, like "sun-solaris10"],
2805+ [SYSTEM_TYPE="$withval"],
2806+ [SYSTEM_TYPE="$host_vendor-$host_os"])
2807+AC_ARG_WITH(machine-type,
2808+ [ --with-machine-type Set the machine type, like "powerpc"],
2809+ [MACHINE_TYPE="$withval"],
2810+ [MACHINE_TYPE="$host_cpu"])
2811+AC_SUBST(SYSTEM_TYPE)
2812+AC_DEFINE_UNQUOTED([SYSTEM_TYPE], ["$SYSTEM_TYPE"],
2813+ [Name of system, eg sun-solaris])
2814+AC_SUBST(MACHINE_TYPE)
2815+AC_DEFINE_UNQUOTED([MACHINE_TYPE], ["$MACHINE_TYPE"],
2816+ [Machine type name, eg sparc])
2817+
2818+# Detect intel x86 like processor
2819+BASE_MACHINE_TYPE=$MACHINE_TYPE
2820+case $MACHINE_TYPE in
2821+ i?86) BASE_MACHINE_TYPE=i386 ;;
2822+esac
2823+
2824+# Save some variables and the command line options for mysqlbug
2825+SAVE_CC="$CC"
2826+SAVE_CXX="$CXX"
2827+SAVE_ASFLAGS="$ASFLAGS"
2828+SAVE_CFLAGS="$CFLAGS"
2829+SAVE_CXXFLAGS="$CXXFLAGS"
2830+SAVE_LDFLAGS="$LDFLAGS"
2831+SAVE_CXXLDFLAGS="$CXXLDFLAGS"
2832+CONF_COMMAND="$0 $ac_configure_args"
2833+AC_SUBST(CONF_COMMAND)
2834+AC_SUBST(SAVE_CC)
2835+AC_SUBST(SAVE_CXX)
2836+AC_SUBST(SAVE_ASFLAGS)
2837+AC_SUBST(SAVE_CFLAGS)
2838+AC_SUBST(SAVE_CXXFLAGS)
2839+AC_SUBST(SAVE_LDFLAGS)
2840+AC_SUBST(SAVE_CXXLDFLAGS)
2841+AC_SUBST(CXXLDFLAGS)
2842+
2843+#AC_ARG_PROGRAM # Automaticly invoked by AM_INIT_AUTOMAKE
2844+
2845+AM_SANITY_CHECK
2846+# This is needed is SUBDIRS is set
2847+AC_PROG_MAKE_SET
2848+
2849+##############################################################################
2850+# The below section needs to be done before AC_PROG_CC
2851+##############################################################################
2852+
2853+# Hack for OS X/Darwin and Metrowerks CodeWarrior
2854+AC_ARG_WITH(darwin-mwcc,
2855+[ --with-darwin-mwcc Use Metrowerks CodeWarrior wrappers on OS X/Darwin],[
2856+ if [ "with_darwin_mwcc" = yes ] ; then
2857+ builddir=`pwd`
2858+ ccwrapper="$builddir/support-files/MacOSX/mwcc-wrapper"
2859+ arwrapper="$builddir/support-files/MacOSX/mwar-wrapper"
2860+ CC="$ccwrapper"
2861+ CXX="$ccwrapper"
2862+ LD="$ccwrapper"
2863+ AR="$arwrapper"
2864+ RANLIB=:
2865+ export CC CXX LD AR RANLIB
2866+ AC_SUBST(AR)
2867+ AC_SUBST(RANLIB)
2868+ fi
2869+])
2870+
2871+AM_CONDITIONAL(DARWIN_MWCC, test x$with_darwin_mwcc = xyes)
2872+
2873+if test "x${CFLAGS-}" = x ; then
2874+ cflags_is_set=no
2875+else
2876+ cflags_is_set=yes
2877+fi
2878+
2879+if test "x${CPPFLAGS-}" = x ; then
2880+ cppflags_is_set=no
2881+else
2882+ cppflags_is_set=yes
2883+fi
2884+
2885+if test "x${LDFLAGS-}" = x ; then
2886+ ldflags_is_set=no
2887+else
2888+ ldflags_is_set=yes
2889+fi
2890+
2891+################ End of section to be done before AC_PROG_CC #################
2892+
2893+# The following hack should ensure that configure doesn't add optimizing
2894+# or debugging flags to CFLAGS or CXXFLAGS
2895+# C_EXTRA_FLAGS are flags that are automaticly added to both
2896+# CFLAGS and CXXFLAGS
2897+CFLAGS="$CFLAGS $C_EXTRA_FLAGS "
2898+CXXFLAGS="$CXXFLAGS $C_EXTRA_FLAGS "
2899+
2900+dnl Checks for programs.
2901+AC_PROG_AWK
2902+AC_PROG_CC
2903+AC_PROG_CXX
2904+AC_PROG_CPP
2905+
2906+# Print version of CC and CXX compiler (if they support --version)
2907+case $SYSTEM_TYPE in
2908+ *netware*)
2909+CC_VERSION=`$CC -version | grep -i version`
2910+ ;;
2911+ *)
2912+CC_VERSION=`$CC --version | sed 1q`
2913+ ;;
2914+esac
2915+if test $? -eq "0"
2916+then
2917+ AC_MSG_CHECKING("C Compiler version")
2918+ AC_MSG_RESULT("$CC $CC_VERSION")
2919+else
2920+CC_VERSION=""
2921+fi
2922+AC_SUBST(CC_VERSION)
2923+MYSQL_CHECK_CXX_VERSION
2924+
2925+# Fix for sgi gcc / sgiCC which tries to emulate gcc
2926+if test "$CC" = "sgicc"
2927+then
2928+ ac_cv_prog_gcc="no"
2929+fi
2930+if test "$CXX" = "sgi++"
2931+then
2932+ GXX="no"
2933+fi
2934+
2935+if test "$ac_cv_prog_gcc" = "yes"
2936+then
2937+ AS="$CC -c"
2938+ AC_SUBST(AS)
2939+else
2940+ AC_PATH_PROG(AS, as, as)
2941+fi
2942+
2943+# Still need ranlib for readline; local static use only so no libtool.
2944+AC_PROG_RANLIB
2945+# We use libtool
2946+#AC_LIBTOOL_WIN32_DLL
2947+AC_PROG_LIBTOOL
2948+
2949+# Ensure that we have --preserve-dup-deps defines, otherwise we get link
2950+# problems of 'mysql' with CXX=g++
2951+LIBTOOL="$LIBTOOL --preserve-dup-deps"
2952+AC_SUBST(LIBTOOL)dnl
2953+
2954+AC_SUBST(NM)dnl
2955+
2956+##############################################################################
2957+# In automake 1.12, the extension on generated yacc/bison header files changed
2958+##############################################################################
2959+
2960+YACC_HEXT="h"
2961+MAKEFILE_1ST=`head -1 "$srcdir/Makefile.in"`
2962+AMAKE_MAJOR=`expr "$MAKEFILE_1ST" : '.*generated by automake \([[0-9]]*\).*'`
2963+if test $? -eq "0" ; then
2964+ if test "$AMAKE_MAJOR" -gt "1" ; then
2965+ YACC_HEXT="hh"
2966+ CXXFLAGS="$CXXFLAGS -DYACC_HEXT_HH"
2967+ elif test "$AMAKE_MAJOR" -eq "1" ; then
2968+ AMAKE_MINOR=`expr "$MAKEFILE_1ST" : '.*generated by automake 1.\([[0-9]]*\).*'`
2969+ if test $? -eq "0" ; then
2970+ if test "$AMAKE_MINOR" -ge "12" ; then
2971+ YACC_HEXT="hh"
2972+ CXXFLAGS="$CXXFLAGS -DYACC_HEXT_HH"
2973+ fi
2974+ fi
2975+ fi
2976+fi
2977+AC_SUBST(YACC_HEXT)
2978+
2979+##############################################################################
2980+
2981+# NM= "$NM -X64"
2982+#archive_expsym_cmds= `echo "$archive_expsym_cmds" | sed -e '/"$(CC)"//'`
2983+#archive_expsym_cmds= "$CC -q64 $archive_expsym_cmds"
2984+# CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-ansi//; s/-pedantic//; s/-Wcheck//'`
2985+
2986+#AC_LIBTOOL_DLOPEN AC_LIBTOOL_WIN32_DLL AC_DISABLE_FAST_INSTALL AC_DISABLE_SHARED AC_DISABLE_STATIC
2987+
2988+# AC_PROG_INSTALL
2989+AC_PROG_INSTALL
2990+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
2991+
2992+# Not critical since the generated file is distributed
2993+AC_CHECK_PROGS(YACC, ['bison -y -p MYSQL'])
2994+AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf)
2995+AC_CHECK_PROG(DVIS, tex, manual.dvi)
2996+
2997+AC_PATH_PROG(uname_prog, uname, no)
2998+
2999+# We should go through this and put all the explictly system dependent
3000+# stuff in one place
3001+AC_MSG_CHECKING(operating system)
3002+AC_CACHE_VAL(mysql_cv_sys_os,
3003+[
3004+if test "$uname_prog" != "no"; then
3005+ mysql_cv_sys_os="`uname`"
3006+else
3007+ mysql_cv_sys_os="Not Solaris"
3008+fi
3009+])
3010+AC_MSG_RESULT($mysql_cv_sys_os)
3011+
3012+# This should be rewritten to use $target_os
3013+case "$target_os" in
3014+ sco3.2v5*)
3015+ CFLAGS="$CFLAGS -DSCO"
3016+ CXXFLAGS="$CXXFLAGS -DSCO"
3017+ LD='$(CC) $(CFLAGS)'
3018+ case "$CFLAGS" in
3019+ *-belf*)
3020+ AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[
3021+ case "$LDFLAGS" in
3022+ *-belf*) ;;
3023+ *) AC_MSG_WARN([Adding -belf option to ldflags.])
3024+ LDFLAGS="$LDFLAGS -belf"
3025+ ;;
3026+ esac
3027+ ])
3028+ ;;
3029+ *)
3030+ AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[
3031+ case "$LDFLAGS" in
3032+ *-belf*) ;;
3033+ *)
3034+ AC_MSG_WARN([Adding -belf option to ldflags.])
3035+ LDFLAGS="$LDFLAGS -belf"
3036+ ;;
3037+ esac
3038+ ])
3039+ ;;
3040+ esac
3041+ ;;
3042+ sysv5UnixWare* | sysv5OpenUNIX8*)
3043+ if test "$GCC" != "yes"; then
3044+ # Use the built-in alloca()
3045+ CFLAGS="$CFLAGS -Kalloca"
3046+ fi
3047+ CXXFLAGS="$CXXFLAGS -DNO_CPLUSPLUS_ALLOCA"
3048+ ;;
3049+ sysv5SCO_SV6.0.0*)
3050+ if test "$GCC" != "yes"; then
3051+ # Use the built-in alloca()
3052+ CFLAGS="$CFLAGS -Kalloca"
3053+ CXXFLAGS="$CFLAGS -Kalloca"
3054+ # Use no_implicit for templates
3055+ CXXFLAGS="$CXXFLAGS -Tno_implicit"
3056+ AC_DEFINE([HAVE_EXPLICIT_TEMPLATE_INSTANTIATION],
3057+ [1], [Defined by configure. Use explicit template instantiation.])
3058+ fi
3059+ ;;
3060+esac
3061+AC_SUBST(CC)
3062+AC_SUBST(CFLAGS)
3063+AC_SUBST(CXX)
3064+AC_SUBST(CXXFLAGS)
3065+AC_SUBST(ASFLAGS)
3066+AC_SUBST(LD)
3067+AC_SUBST(INSTALL_SCRIPT)
3068+
3069+export CC CXX CFLAGS LD LDFLAGS AR ARFLAGS
3070+
3071+if test "$GCC" = "yes"
3072+then
3073+ # mysqld requires -fno-implicit-templates.
3074+ # Disable exceptions as they seams to create problems with gcc and threads.
3075+ # mysqld doesn't use run-time-type-checking, so we disable it.
3076+ # We should use -Wno-invalid-offsetof flag to disable some warnings from gcc
3077+ # regarding offset() usage in C++ which are done in a safe manner in the
3078+ # server
3079+ CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti"
3080+ AC_DEFINE([HAVE_EXPLICIT_TEMPLATE_INSTANTIATION],
3081+ [1], [Defined by configure. Use explicit template instantiation.])
3082+fi
3083+
3084+MYSQL_PROG_AR
3085+
3086+# libmysqlclient versioning when linked with GNU ld.
3087+if $LD --version 2>/dev/null| grep GNU >/dev/null 2>&1; then
3088+ LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/libmysql/libmysql.ver"
3089+ AC_CONFIG_FILES(libmysql/libmysql.ver)
3090+fi
3091+AC_SUBST(LD_VERSION_SCRIPT)
3092+
3093+
3094+# Avoid bug in fcntl on some versions of linux
3095+AC_MSG_CHECKING([if we should use 'skip-external-locking' as default for $target_os])
3096+# Any variation of Linux
3097+if expr "$target_os" : "[[Ll]]inux.*" > /dev/null
3098+then
3099+ MYSQLD_DEFAULT_SWITCHES="--skip-external-locking"
3100+ TARGET_LINUX="true"
3101+ AC_MSG_RESULT([yes])
3102+ AC_DEFINE([TARGET_OS_LINUX], [1], [Whether we build for Linux])
3103+else
3104+ MYSQLD_DEFAULT_SWITCHES=""
3105+ TARGET_LINUX="false"
3106+ AC_MSG_RESULT([no])
3107+fi
3108+AC_SUBST(MYSQLD_DEFAULT_SWITCHES)
3109+AC_SUBST(TARGET_LINUX)
3110+
3111+dnl Find paths to some shell programs
3112+AC_PATH_PROG(LN, ln, ln)
3113+# This must be able to take a -f flag like normal unix ln.
3114+AC_PATH_PROG(LN_CP_F, ln, ln)
3115+case $SYSTEM_TYPE in
3116+ *netware*) ;;
3117+ *)
3118+ # If ln -f does not exists use -s (AFS systems)
3119+ if test -n "$LN_CP_F"; then
3120+ LN_CP_F="$LN_CP_F -s"
3121+ fi
3122+ ;;
3123+esac
3124+
3125+AC_PATH_PROG(MV, mv, mv)
3126+AC_PATH_PROG(RM, rm, rm)
3127+AC_PATH_PROG(CP, cp, cp)
3128+AC_PATH_PROG(SED, sed, sed)
3129+AC_PATH_PROG(CMP, cmp, cmp)
3130+AC_PATH_PROG(CHMOD, chmod, chmod)
3131+AC_PATH_PROG(HOSTNAME, hostname, hostname)
3132+AC_PATH_PROG(DIFF, diff, diff)
3133+# Check for a GNU tar named 'gtar', or 'gnutar' (MacOS X) and
3134+# fall back to 'tar' otherwise and hope that it's a GNU tar as well
3135+AC_CHECK_PROGS(TAR, gnutar gtar tar)
3136+
3137+dnl We use a path for perl so the script startup works
3138+dnl We make sure to use perl, not perl5, in hopes that the RPMs will
3139+dnl not depend on the perl5 binary being installed (probably a bug in RPM)
3140+AC_PATH_PROG(PERL, perl, no)
3141+if test "$PERL" != "no" && $PERL -e 'require 5' > /dev/null 2>&1
3142+then
3143+ PERL5=$PERL
3144+else
3145+ AC_PATH_PROG(PERL5, perl5, no)
3146+ if test "$PERL5" != no
3147+ then
3148+ PERL=$PERL5
3149+ ac_cv_path_PERL=$ac_cv_path_PERL5
3150+ fi
3151+fi
3152+
3153+AC_SUBST(HOSTNAME)
3154+AC_SUBST(PERL)
3155+AC_SUBST(PERL5)
3156+
3157+# Enable the abi_check rule only if gcc is available
3158+
3159+if test "$GCC" != "yes" || expr "$CC" : ".*icc.*"
3160+then
3161+ ABI_CHECK=""
3162+else
3163+ ABI_CHECK="abi_check"
3164+fi
3165+
3166+AC_SUBST(ABI_CHECK)
3167+
3168+# Look for PS usage. We use double dollar-signs in FIND_PROC because this
3169+# value is written to a makefile, which interprets away one level of
3170+# dollar-signs. So, interpretation stages are m4 and then shell in autoconf,
3171+# then Make, then shell. The autoconf substitution uses single quotes, so
3172+# no unprotected single quotes should appear in the expression.
3173+AC_PATH_PROG(PS, ps, ps)
3174+AC_MSG_CHECKING("how to check if pid exists")
3175+PS=$ac_cv_path_PS
3176+# Linux style
3177+if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
3178+then
3179+ FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
3180+# Solaris
3181+elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
3182+then
3183+ FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
3184+# BSD style
3185+elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null
3186+then
3187+ FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
3188+# SysV style
3189+elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null
3190+then
3191+ FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
3192+# Do anybody use this?
3193+elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null
3194+then
3195+ FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
3196+else
3197+ case $SYSTEM_TYPE in
3198+ *freebsd*|*dragonfly*)
3199+ FIND_PROC="$PS p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
3200+ ;;
3201+ *darwin*)
3202+ FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
3203+ ;;
3204+ *cygwin*)
3205+ FIND_PROC="$PS -e | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
3206+ ;;
3207+ *netware*)
3208+ FIND_PROC=
3209+ ;;
3210+ *)
3211+ AC_MSG_ERROR([Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual.])
3212+ esac
3213+fi
3214+AC_SUBST(FIND_PROC)
3215+AC_MSG_RESULT("$FIND_PROC")
3216+
3217+# Check if a pid is valid
3218+AC_PATH_PROG(KILL, kill, kill)
3219+AC_MSG_CHECKING("for kill switches")
3220+if $ac_cv_path_KILL -0 $$
3221+then
3222+ CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null"
3223+elif kill -s 0 $$
3224+then
3225+ CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
3226+else
3227+ AC_MSG_WARN([kill -0 to check for pid seems to fail])
3228+ CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
3229+fi
3230+AC_SUBST(CHECK_PID)
3231+AC_MSG_RESULT("$CHECK_PID")
3232+
3233+# We need an ANSI C compiler
3234+AM_PROG_CC_STDC
3235+
3236+# We need an assembler, too
3237+AM_PROG_AS
3238+CCASFLAGS="$CCASFLAGS $ASFLAGS"
3239+
3240+# Check if we need noexec stack for assembler
3241+AC_CHECK_NOEXECSTACK
3242+
3243+if test "$am_cv_prog_cc_stdc" = "no"
3244+then
3245+ AC_MSG_ERROR([MySQL requires an ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.])
3246+fi
3247+
3248+NOINST_LDFLAGS="-static"
3249+
3250+static_nss=""
3251+STATIC_NSS_FLAGS=""
3252+OTHER_LIBC_LIB=""
3253+AC_ARG_WITH(other-libc,
3254+ [ --with-other-libc=DIR Link against libc and other standard libraries
3255+ installed in the specified non-standard location
3256+ overriding default. Originally added to be able to
3257+ link against glibc 2.2 without making the user
3258+ upgrade the standard libc installation.],
3259+ [
3260+ other_libc_include="$withval/include"
3261+ other_libc_lib="$withval/lib"
3262+ with_other_libc="yes"
3263+ enable_shared="no"
3264+ all_is_static="yes"
3265+ CFLAGS="$CFLAGS -I$other_libc_include"
3266+ # There seems to be a feature in gcc that treats system and libc headers
3267+ # silently when they violatate ANSI C++ standard, but it is strict otherwise
3268+ # since gcc cannot now recognize that our headers are libc, we work around
3269+ # by telling it to be permissive. Note that this option only works with
3270+ # new versions of gcc (2.95.x and above)
3271+ CXXFLAGS="$CXXFLAGS -fpermissive -I$other_libc_include"
3272+ if test -f "$other_libc_lib/libnss_files.a"
3273+ then
3274+ # libc has been compiled with --enable-static-nss
3275+ # we need special flags, but we will have to add those later
3276+ STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"
3277+ STATIC_NSS_FLAGS="$STATIC_NSS_FLAGS $STATIC_NSS_FLAGS"
3278+ OTHER_LIBC_LIB="-static -L$other_libc_lib"
3279+ static_nss=1
3280+ else
3281+ # this is a dirty hack. We if we detect static nss glibc in the special
3282+ # location, we do not re-direct the linker to get libraries from there
3283+ # during check. The reason is that if we did, we would have to find a
3284+ # way to append the special static nss flags to LIBS every time we do
3285+ # any check - this is definitely feasible, but not worthwhile the risk
3286+ # of breaking other things. So for our purposes it would be sufficient
3287+ # to assume that whoever is using static NSS knows what he is doing and
3288+ # has sensible libraries in the regular location
3289+ LDFLAGS="$LDFLAGS -static -L$other_libc_lib "
3290+ fi
3291+
3292+ # When linking against custom libc installed separately, we want to force
3293+ # all binary builds to be static, including the build done by configure
3294+ # itself to test for system features.
3295+ with_mysqld_ldflags="-all-static"
3296+ with_client_ldflags="-all-static"
3297+ NOINST_LDFLAGS="-all-static"
3298+ ],
3299+ [
3300+ other_libc_include=
3301+ other_libc_lib=
3302+ with_other_libc="no"
3303+ ]
3304+)
3305+AC_SUBST(NOINST_LDFLAGS)
3306+
3307+#
3308+# Check if we are using Linux and a glibc compiled with static nss
3309+# (this is true on the MySQL build machines to avoid NSS problems)
3310+#
3311+AC_CHECK_TOOL([NM], [nm])
3312+
3313+if test "$TARGET_LINUX" = "true" -a "$static_nss" = ""
3314+then
3315+ tmp=`$NM ${other_libc_lib:-/usr/lib*}/libc.a | grep _nss_files_getaliasent_r1`
3316+ if test -n "$tmp"
3317+ then
3318+ STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"
3319+ STATIC_NSS_FLAGS="$STATIC_NSS_FLAGS $STATIC_NSS_FLAGS"
3320+ static_nss=1
3321+ fi
3322+fi
3323+
3324+AC_MSG_CHECKING(whether features provided by the user community should be included.)
3325+AC_ARG_ENABLE(community-features,
3326+ AC_HELP_STRING(
3327+ [--disable-community-features],
3328+ [Disable additional features provided by the user community.]),
3329+ [ ENABLE_COMMUNITY_FEATURES=$enableval ],
3330+ [ ENABLE_COMMUNITY_FEATURES=yes ]
3331+ )
3332+
3333+if test "$ENABLE_COMMUNITY_FEATURES" = "yes"
3334+then
3335+ AC_DEFINE([COMMUNITY_SERVER], [1],
3336+ [Whether features provided by the user community should be included])
3337+ AC_MSG_RESULT([yes])
3338+else
3339+ AC_MSG_RESULT([no])
3340+fi
3341+
3342+AC_ARG_WITH(server-suffix,
3343+ [ --with-server-suffix Append value to the version string.],
3344+ [ MYSQL_SERVER_SUFFIX=`echo "$withval" | sed -e 's/^\(...................................\)..*$/\1/'` ],
3345+ [ MYSQL_SERVER_SUFFIX= ]
3346+ )
3347+AC_SUBST(MYSQL_SERVER_SUFFIX)
3348+
3349+# Set flags if we want to force to use pthreads
3350+AC_ARG_WITH(pthread,
3351+ [ --with-pthread Force use of pthread library.],
3352+ [ with_pthread=$withval ],
3353+ [ with_pthread=no ]
3354+ )
3355+
3356+# Force use of thread libs LIBS
3357+AC_ARG_WITH(named-thread-libs,
3358+ [ --with-named-thread-libs=ARG
3359+ Use specified thread libraries instead of
3360+ those automatically found by configure.],
3361+ [ with_named_thread=$withval ],
3362+ [ with_named_thread=no ]
3363+ )
3364+
3365+# Force use of a curses libs
3366+AC_ARG_WITH(named-curses-libs,
3367+ [ --with-named-curses-libs=ARG
3368+ Use specified curses libraries instead of
3369+ those automatically found by configure.],
3370+ [ with_named_curses=$withval ],
3371+ [ with_named_curses=no ]
3372+ )
3373+
3374+# Make thread safe client
3375+AC_ARG_ENABLE(thread-safe-client,
3376+ [ --disable-thread-safe-client
3377+ Compile the client without threads.],
3378+ [ THREAD_SAFE_CLIENT=$enableval ],
3379+ [ THREAD_SAFE_CLIENT=yes ]
3380+ )
3381+
3382+# compile with strings functions in assembler
3383+AC_ARG_ENABLE(assembler,
3384+ [ --enable-assembler Use assembler versions of some string
3385+ functions if available.],
3386+ [ ENABLE_ASSEMBLER=$enableval ],
3387+ [ ENABLE_ASSEMBLER=no ]
3388+ )
3389+
3390+AC_MSG_CHECKING(if we should use assembler functions)
3391+# For now we only support assembler on i386 and sparc systems
3392+AM_CONDITIONAL(ASSEMBLER_x86, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "i386" && $AS strings/strings-x86.s -o checkassembler >/dev/null 2>&1 && test -f checkassembler && (rm -f checkassembler; exit 0;))
3393+AM_CONDITIONAL(ASSEMBLER_sparc32, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparc")
3394+AM_CONDITIONAL(ASSEMBLER_sparc64, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparcv9")
3395+AM_CONDITIONAL(ASSEMBLER, test "$ASSEMBLER_x86_TRUE" = "" -o "$ASSEMBLER_sparc32_TRUE" = "")
3396+
3397+if test "$ASSEMBLER_TRUE" = ""
3398+then
3399+ AC_MSG_RESULT([yes])
3400+else
3401+ AC_MSG_RESULT([no])
3402+fi
3403+
3404+# Add query profiler
3405+AC_MSG_CHECKING(if SHOW PROFILE should be enabled.)
3406+AC_ARG_ENABLE(profiling,
3407+ AS_HELP_STRING([--enable-profiling], [Build a version with query profiling code (req. community-features)]),
3408+ [ ENABLED_PROFILING=$enableval ],
3409+ [ ENABLED_PROFILING=$ENABLE_COMMUNITY_FEATURES ])
3410+
3411+if test "$ENABLED_PROFILING" = "yes"
3412+then
3413+ if test "$ENABLE_COMMUNITY_FEATURES" = "yes";
3414+ then
3415+ AC_DEFINE([ENABLED_PROFILING], [1],
3416+ [If SHOW PROFILE should be enabled])
3417+ AC_MSG_RESULT([yes])
3418+ else
3419+ ENABLED_PROFILING="no"
3420+ AC_MSG_RESULT([no, overridden by community-features disabled])
3421+ fi
3422+else
3423+ AC_MSG_RESULT([no])
3424+fi
3425+
3426+# Use this to set the place used for unix socket used to local communication.
3427+AC_ARG_WITH(unix-socket-path,
3428+ [ --with-unix-socket-path=SOCKET
3429+ Where to put the unix-domain socket. SOCKET must be
3430+ an absolute file name.],
3431+ [ MYSQL_UNIX_ADDR=$withval ],
3432+ [ MYSQL_UNIX_ADDR=$MYSQL_UNIX_ADDR_DEFAULT ]
3433+ )
3434+AC_SUBST(MYSQL_UNIX_ADDR)
3435+
3436+AC_ARG_WITH(tcp-port,
3437+ [ --with-tcp-port=port-number
3438+ Which port to use for MySQL services (default 3306)],
3439+ [ MYSQL_TCP_PORT=$withval ],
3440+ [ MYSQL_TCP_PORT=$MYSQL_TCP_PORT_DEFAULT
3441+ # if we actually defaulted (as opposed to the pathological case of
3442+ # --with-tcp-port=<MYSQL_TCP_PORT_DEFAULT> which might in theory
3443+ # happen if whole batch of servers was built from a script), set
3444+ # the default to zero to indicate that; we don't lose information
3445+ # that way, because 0 obviously indicates that we can get the
3446+ # default value from MYSQL_TCP_PORT. this seems really evil, but
3447+ # testing for MYSQL_TCP_PORT==MYSQL_TCP_PORT_DEFAULT would make a
3448+ # a port of MYSQL_TCP_PORT_DEFAULT magic even if the builder did not
3449+ # intend it to mean "use the default, in fact, look up a good default
3450+ # from /etc/services if you can", but really, really meant 3306 when
3451+ # they passed in 3306. When they pass in a specific value, let them
3452+ # have it; don't second guess user and think we know better, this will
3453+ # just make people cross. this makes the the logic work like this
3454+ # (which is complicated enough):
3455+ #
3456+ # - if a port was set during build, use that as a default.
3457+ #
3458+ # - otherwise, try to look up a port in /etc/services; if that fails,
3459+ # use MYSQL_TCP_PORT_DEFAULT (at the time of this writing 3306)
3460+ #
3461+ # - allow the MYSQL_TCP_PORT environment variable to override that.
3462+ #
3463+ # - allow command-line parameters to override all of the above.
3464+ #
3465+ # the top-most MYSQL_TCP_PORT_DEFAULT is read from win/configure.js,
3466+ # so don't mess with that.
3467+ MYSQL_TCP_PORT_DEFAULT=0 ]
3468+ )
3469+AC_SUBST(MYSQL_TCP_PORT)
3470+# We might want to document the assigned port in the manual.
3471+AC_SUBST(MYSQL_TCP_PORT_DEFAULT)
3472+
3473+# Use this to set the place used for unix socket used to local communication.
3474+AC_ARG_WITH(mysqld-user,
3475+ [ --with-mysqld-user=username
3476+ What user the mysqld daemon shall be run as.],
3477+ [ MYSQLD_USER=$withval ],
3478+ [ MYSQLD_USER=mysql ]
3479+ )
3480+AC_SUBST(MYSQLD_USER)
3481+
3482+# If we should allow LOAD DATA LOCAL
3483+AC_MSG_CHECKING(If we should should enable LOAD DATA LOCAL by default)
3484+AC_ARG_ENABLE(local-infile,
3485+ [ --enable-local-infile Enable LOAD DATA LOCAL INFILE (default: disabled)],
3486+ [ ENABLED_LOCAL_INFILE=$enableval ],
3487+ [ ENABLED_LOCAL_INFILE=no ]
3488+ )
3489+if test "$ENABLED_LOCAL_INFILE" = "yes"
3490+then
3491+ AC_MSG_RESULT([yes])
3492+ AC_DEFINE([ENABLED_LOCAL_INFILE], [1],
3493+ [If LOAD DATA LOCAL INFILE should be enabled by default])
3494+else
3495+ AC_MSG_RESULT([no])
3496+fi
3497+
3498+# If we should allow init-file, skip-grant-table and bootstrap options
3499+AC_MSG_CHECKING(If we should should enable init-file, skip-grant-table options and bootstrap)
3500+AC_ARG_ENABLE(grant-options,
3501+ [ --disable-grant-options Disables the use of --init-file, --skip-grant-tables and --bootstrap options],
3502+ [ mysql_grant_options_enabled=$enableval ],
3503+ [ mysql_grant_options_enabled=yes ]
3504+ )
3505+if test "$mysql_grant_options_enabled" = "yes"
3506+then
3507+ AC_MSG_RESULT([yes])
3508+else
3509+ AC_DEFINE([DISABLE_GRANT_OPTIONS], [1],
3510+ [Disables the use of --init-file, --skip-grant-tables and --bootstrap options])
3511+ AC_MSG_RESULT([no])
3512+fi
3513+
3514+MYSQL_SYS_LARGEFILE
3515+
3516+# Types that must be checked AFTER large file support is checked
3517+AC_TYPE_SIZE_T
3518+
3519+#--------------------------------------------------------------------
3520+# Check for system header files
3521+#--------------------------------------------------------------------
3522+
3523+AC_HEADER_DIRENT
3524+AC_HEADER_STDC
3525+AC_HEADER_SYS_WAIT
3526+AC_CHECK_HEADERS(fcntl.h fenv.h float.h floatingpoint.h fpu_control.h \
3527+ ieeefp.h limits.h memory.h pwd.h select.h poll.h \
3528+ stdlib.h stddef.h \
3529+ strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \
3530+ sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
3531+ unistd.h utime.h sys/utime.h termio.h termios.h sched.h crypt.h alloca.h \
3532+ sys/ioctl.h malloc.h sys/malloc.h sys/ipc.h sys/shm.h linux/config.h \
3533+ sys/prctl.h sys/resource.h sys/param.h port.h ieeefp.h \
3534+ execinfo.h)
3535+
3536+AC_CHECK_HEADERS([xfs/xfs.h])
3537+
3538+#--------------------------------------------------------------------
3539+# Check for system libraries. Adds the library to $LIBS
3540+# and defines HAVE_LIBM etc
3541+#--------------------------------------------------------------------
3542+
3543+AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
3544+
3545+AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
3546+ AC_CHECK_LIB(nsl, gethostbyname_r))
3547+AC_CHECK_FUNC(gethostbyname_r)
3548+
3549+AC_SEARCH_LIBS(setsockopt, socket)
3550+# This may get things to compile even if bind-8 is installed
3551+AC_SEARCH_LIBS(bind, bind)
3552+# Check if crypt() exists in libc or libcrypt, sets LIBS if needed
3553+AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
3554+# See if we need a library for address lookup.
3555+AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])
3556+
3557+# For the sched_yield() function on Solaris
3558+AC_SEARCH_LIBS(sched_yield, posix4,
3559+ AC_DEFINE(HAVE_SCHED_YIELD, 1, [sched_yield]))
3560+
3561+MYSQL_CHECK_ZLIB_WITH_COMPRESS
3562+
3563+# For large pages support
3564+if test "$TARGET_LINUX" = "true"
3565+then
3566+ # For SHM_HUGETLB on Linux
3567+ AC_CHECK_DECLS(SHM_HUGETLB,
3568+ AC_DEFINE([HAVE_LARGE_PAGES], [1],
3569+ [Define if you have large pages support])
3570+ AC_DEFINE([HUGETLB_USE_PROC_MEMINFO], [1],
3571+ [Define if /proc/meminfo shows the huge page size (Linux only)])
3572+ , ,
3573+ [
3574+#include <sys/shm.h>
3575+ ]
3576+ )
3577+fi
3578+
3579+#--------------------------------------------------------------------
3580+# Check for TCP wrapper support
3581+#--------------------------------------------------------------------
3582+
3583+AC_ARG_WITH(libwrap,
3584+[ --with-libwrap[=DIR] Compile in libwrap (tcp_wrappers) support],[
3585+ case "$with_libwrap" in
3586+ no) : ;;
3587+ yes|*)
3588+ _cppflags=${CPPFLAGS}
3589+ _ldflags=${LDFLAGS}
3590+
3591+ if test "$with_libwrap" != "yes"; then
3592+ CPPFLAGS="${CPPFLAGS} -I$with_libwrap/include"
3593+ LDFLAGS="${LDFLAGS} -L$with_libwrap/lib"
3594+ fi
3595+
3596+ _libs=${LIBS}
3597+ AC_CHECK_HEADER(tcpd.h,
3598+ LIBS="-lwrap $LIBS"
3599+ AC_MSG_CHECKING(for TCP wrappers library -lwrap)
3600+ AC_TRY_LINK([#include <tcpd.h>
3601+int allow_severity = 0;
3602+int deny_severity = 0;
3603+
3604+struct request_info *req;
3605+],[hosts_access (req)],
3606+ AC_MSG_RESULT(yes)
3607+ AC_DEFINE([LIBWRAP], [1], [Define if you have -lwrap])
3608+ AC_DEFINE([HAVE_LIBWRAP], [1], [Define if have -lwrap])
3609+ if test "$with_libwrap" != "yes"; then
3610+ WRAPLIBS="-L${with_libwrap}/lib"
3611+ fi
3612+ WRAPLIBS="${WRAPLIBS} -lwrap",
3613+ AC_MSG_RESULT(no)
3614+ CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
3615+ CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
3616+ LDFLAGS=${_ldflags} LIBS=${_libs}
3617+ ;;
3618+ esac
3619+])
3620+AC_SUBST(WRAPLIBS)
3621+
3622+# Check for gtty if termio.h doesn't exists
3623+if test "$ac_cv_header_termio_h" = "no" -a "$ac_cv_header_termios_h" = "no"
3624+then
3625+ AC_SEARCH_LIBS(gtty, compat)
3626+fi
3627+
3628+# We make a special variable for non-threaded version of LIBS to avoid
3629+# including thread libs into non-threaded version of MySQL client library.
3630+# Later in this script LIBS will be augmented with a threads library.
3631+NON_THREADED_LIBS="$LIBS"
3632+
3633+AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, int64, uint64,
3634+ uchar, uint, ulong],[],[], [
3635+#include <sys/types.h>
3636+])
3637+AC_CHECK_TYPES([in_addr_t], [], [], [
3638+#include <sys/types.h>
3639+#include <sys/socket.h>
3640+#include <netinet/in.h>
3641+#include <arpa/inet.h>
3642+])
3643+AC_CHECK_TYPES([fp_except], [], [], [
3644+#include <sys/types.h>
3645+#include <ieeefp.h>
3646+])
3647+
3648+#
3649+# Some system specific hacks
3650+#
3651+
3652+MAX_C_OPTIMIZE="-O3"
3653+MAX_CXX_OPTIMIZE="-O3"
3654+
3655+case $SYSTEM_TYPE in
3656+ *solaris2.7*)
3657+ # Solaris 2.7 has a broken /usr/include/widec.h
3658+ # Make a fixed copy in ./include
3659+ AC_MSG_WARN([Fixing broken include files for $SYSTEM_TYPE])
3660+ echo " - Creating local copy of widec.h"
3661+ if test ! -d include
3662+ then
3663+ mkdir ./include
3664+ fi
3665+ builddir=`pwd`
3666+ sed -e "s|^#if[ ]*!defined(lint) && !defined(__lint)|#if !defined\(lint\) \&\& !defined\(__lint\) \&\& !defined\(getwc\)|" < /usr/include/widec.h > include/widec.h
3667+ CFLAGS="$CFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
3668+ CXXFLAGS="$CXXFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
3669+ ;;
3670+ *solaris2.8*)
3671+ # Solaris 2.8 has a broken /usr/include/widec.h
3672+ # Make a fixed copy in ./include
3673+ AC_MSG_WARN([Fixing broken include files for $SYSTEM_TYPE])
3674+ echo " - Creating local copy of widec.h"
3675+ if test ! -d include
3676+ then
3677+ mkdir ./include
3678+ fi
3679+ builddir=`pwd`
3680+ sed -e "s|^#if[ ]*!defined(__lint)|#if !defined\(__lint\) \&\& !defined\(getwc\)|" < /usr/include/widec.h > include/widec.h
3681+ CFLAGS="$CFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
3682+ CXXFLAGS="$CXXFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
3683+ ;;
3684+ *solaris2.5.1*)
3685+ AC_MSG_WARN([Enabling getpass() workaround for Solaris 2.5.1])
3686+ CFLAGS="$CFLAGS -DHAVE_BROKEN_GETPASS -DSOLARIS -DHAVE_RWLOCK_T";
3687+ CXXFLAGS="$CXXFLAGS -DHAVE_RWLOCK_T -DSOLARIS"
3688+ ;;
3689+ *solaris*)
3690+ CFLAGS="$CFLAGS -DHAVE_RWLOCK_T"
3691+ CXXFLAGS="$CXXFLAGS -DHAVE_RWLOCK_T"
3692+ ;;
3693+ *SunOS*)
3694+ AC_MSG_WARN([Enabling getpass() workaround for SunOS])
3695+ CFLAGS="$CFLAGS -DHAVE_BROKEN_GETPASS -DSOLARIS";
3696+ ;;
3697+ *hpux10.20*)
3698+ AC_MSG_WARN([Enabling workarounds for hpux 10.20])
3699+ CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX10 -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT -DHAVE_POSIX1003_4a_MUTEX"
3700+ CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX10 -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT -DHAVE_POSIX1003_4a_MUTEX"
3701+ if test "$with_named_thread" = "no"
3702+ then
3703+ AC_MSG_WARN([Using --with-named-thread=-lpthread])
3704+ with_named_thread="-lcma"
3705+ fi
3706+ ;;
3707+ *hpux11.*)
3708+ AC_MSG_WARN([Enabling workarounds for hpux 11])
3709+ CFLAGS="$CFLAGS -DHPUX11 -DSNPRINTF_RETURN_TRUNC -DHAVE_BROKEN_PREAD -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"
3710+ CXXFLAGS="$CXXFLAGS -DHPUX11 -DSNPRINTF_RETURN_TRUNC -DHAVE_BROKEN_PREAD -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"
3711+ if test "$with_named_thread" = "no"
3712+ then
3713+ AC_MSG_WARN([Using --with-named-thread=-lpthread])
3714+ with_named_thread="-lpthread"
3715+ fi
3716+ # Fixes for HPUX 11.0 compiler
3717+ if test "$ac_cv_prog_gcc" = "no"
3718+ then
3719+ CFLAGS="$CFLAGS -DHAVE_BROKEN_INLINE"
3720+# set working flags first in line, letting override it (i. e. for debug):
3721+ CXXFLAGS="+O2 $CXXFLAGS"
3722+ MAX_C_OPTIMIZE=""
3723+ MAX_CXX_OPTIMIZE=""
3724+ ndb_cxxflags_fix="$ndb_cxxflags_fix -Aa"
3725+ fi
3726+ ;;
3727+ *rhapsody*)
3728+ if test "$ac_cv_prog_gcc" = "yes"
3729+ then
3730+ CPPFLAGS="$CPPFLAGS -traditional-cpp "
3731+ CFLAGS="-DHAVE_CTHREADS_WRAPPER -DDO_NOT_REMOVE_THREAD_WRAPPERS"
3732+ CXXFLAGS="-DHAVE_CTHREADS_WRAPPER"
3733+ if test $with_named_curses = "no"
3734+ then
3735+ with_named_curses=""
3736+ fi
3737+ fi
3738+ ;;
3739+ *darwin5*)
3740+ if test "$ac_cv_prog_gcc" = "yes"
3741+ then
3742+ FLAGS="-traditional-cpp -DHAVE_DARWIN5_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"
3743+ CFLAGS="$CFLAGS $FLAGS"
3744+ CXXFLAGS="$CXXFLAGS $FLAGS"
3745+ MAX_C_OPTIMIZE="-O"
3746+ with_named_curses=""
3747+ fi
3748+ ;;
3749+ *darwin6*)
3750+ if test "$ac_cv_prog_gcc" = "yes"
3751+ then
3752+ FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DDONT_DECLARE_CXA_PURE_VIRTUAL "
3753+ CFLAGS="$CFLAGS $FLAGS"
3754+ CXXFLAGS="$CXXFLAGS $FLAGS"
3755+ MAX_C_OPTIMIZE="-O"
3756+ fi
3757+ ;;
3758+ *darwin*)
3759+ if test "$ac_cv_prog_gcc" = "yes"
3760+ then
3761+ FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT -DDONT_DECLARE_CXA_PURE_VIRTUAL"
3762+ CFLAGS="$CFLAGS $FLAGS"
3763+ CXXFLAGS="$CXXFLAGS $FLAGS"
3764+ MAX_C_OPTIMIZE="-O"
3765+ fi
3766+ ;;
3767+ *freebsd*|*dragonfly*)
3768+ AC_MSG_WARN([Adding fix for interrupted reads])
3769+ OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
3770+ if test "$OSVERSION" -gt "480100" && \
3771+ test "$OSVERSION" -lt "500000" || \
3772+ test "$OSVERSION" -gt "500109"
3773+ then
3774+ CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
3775+ else
3776+ CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
3777+ CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
3778+ fi
3779+ ;;
3780+ *netbsd*)
3781+ AC_MSG_WARN([Adding flag -Dunix])
3782+ CFLAGS="$CFLAGS -Dunix"
3783+ CXXFLAGS="$CXXFLAGS -Dunix"
3784+ OVERRIDE_MT_LD_ADD="\$(top_srcdir)/mit-pthreads/obj/libpthread.a"
3785+ ;;
3786+ *bsdi*)
3787+ AC_MSG_WARN([Adding fix for BSDI])
3788+ CFLAGS="$CFLAGS -D__BSD__ -DHAVE_BROKEN_REALPATH"
3789+ AC_DEFINE_UNQUOTED([SOCKOPT_OPTLEN_TYPE], [size_t],
3790+ [Last argument to get/setsockopt])
3791+ ;;
3792+ *sgi-irix6*)
3793+ if test "$with_named_thread" = "no"
3794+ then
3795+ AC_MSG_WARN([Using --with-named-thread=-lpthread])
3796+ with_named_thread="-lpthread"
3797+ fi
3798+ CXXFLAGS="$CXXFLAGS -D_BOOL"
3799+ ;;
3800+ *aix4.3*)
3801+ AC_MSG_WARN([Adding defines for AIX])
3802+ CFLAGS="$CFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS -DSIGNALS_DONT_BREAK_READ"
3803+ CXXFLAGS="$CXXFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS -DSIGNALS_DONT_BREAK_READ"
3804+ ;;
3805+dnl Is this the right match for DEC OSF on alpha?
3806+ *dec-osf*)
3807+ if test "$ac_cv_prog_gcc" = "yes" && test "$host_cpu" = "alpha"
3808+ then
3809+ AC_MSG_WARN([Adding defines for DEC OSF on alpha])
3810+ CFLAGS="$CFLAGS -mieee"
3811+ CXXFLAGS="$CXXFLAGS -mieee"
3812+ fi
3813+ AC_MSG_WARN([Adding defines for OSF1])
3814+ # gethostbyname_r is deprecated and doesn't work ok on OSF1
3815+ CFLAGS="$CFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R -DSNPRINTF_RETURN_TRUNC"
3816+ CXXFLAGS="$CXXFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R -DSNPRINTF_RETURN_TRUNC"
3817+ # fix to handle include of <stdint.h> correctly on OSF1 with cxx compiler
3818+ CXXFLAGS="$CXXFLAGS -I/usr/include/cxx -I/usr/include/cxx_cname -I/usr/include -I/usr/include.dtk"
3819+ ;;
3820+ *netware*)
3821+ # No need for curses library so set it to null
3822+ with_named_curses=""
3823+
3824+ # No thread library - in LibC
3825+ with_named_thread=""
3826+
3827+ #
3828+ # Edit Makefile.in files.
3829+ #
3830+ echo -n "configuring Makefile.in files for NetWare... "
3831+ for file in sql/Makefile.in extra/Makefile.in client/Makefile.in
3832+ do
3833+ # echo "#### $file ####"
3834+ filedir="`dirname $file`"
3835+ filebase="`basename $file`"
3836+ filesed=$filedir/$filebase.sed
3837+ #
3838+ # Backup and always use original file
3839+ #
3840+ if test -f $file.bk
3841+ then
3842+ cp -fp $file.bk $file
3843+ else
3844+ cp -fp $file $file.bk
3845+ fi
3846+ case $file in
3847+ sql/Makefile.in)
3848+ # Use gen_lex_hash.linux instead of gen_lex_hash
3849+ # Add library dependencies to mysqld_DEPENDENCIES
3850+ lib_DEPENDENCIES="\$(openssl_libs) \$(yassl_libs)"
3851+ cat > $filesed << EOF
3852+s,\(\./gen_lex_hash\)\$(EXEEXT),\1.linux,
3853+s%\(mysqld_DEPENDENCIES = \)%\1$lib_DEPENDENCIES %
3854+EOF
3855+ ;;
3856+ extra/Makefile.in)
3857+ cat > $filesed << EOF
3858+s,\(extra/comp_err\)\$(EXEEXT),\1.linux,
3859+EOF
3860+ ;;
3861+ libmysql/Makefile.in)
3862+ cat > $filesed << EOF
3863+s,libyassl.la,.libs/libyassl.a,
3864+s,libtaocrypt.la,.libs/libtaocrypt.a,
3865+EOF
3866+ ;;
3867+ libmysql_r/Makefile.in)
3868+ cat > $filesed << EOF
3869+s,libyassl.la,.libs/libyassl.a,
3870+s,libtaocrypt.la,.libs/libtaocrypt.a,
3871+EOF
3872+ ;;
3873+ client/Makefile.in)
3874+ #
3875+ cat > $filesed << EOF
3876+s,libmysqlclient.la,.libs/libmysqlclient.a,
3877+EOF
3878+ ;;
3879+ esac
3880+ if `sed -f $filesed $file > $file.nw`;\
3881+ then
3882+ mv -f $file.nw $file
3883+ rm -f $filesed
3884+ else
3885+ exit 1
3886+ fi
3887+ # wait for file system changes to complete
3888+ sleep 1
3889+ done
3890+ echo "done"
3891+
3892+ #
3893+ # Make sure the following files are writable.
3894+ #
3895+ # When the files are retrieved from some source code control systems they are read-only.
3896+ #
3897+ echo -n "making sure specific build files are writable... "
3898+ for file in \
3899+ Docs/manual.chm \
3900+ Docs/mysql.info \
3901+ Docs/INSTALL-BINARY \
3902+ INSTALL-SOURCE \
3903+ COPYING
3904+ do
3905+ if test -e $file; then
3906+ chmod +w $file
3907+ fi
3908+ done
3909+ echo "done"
3910+
3911+ ;;
3912+esac
3913+
3914+
3915+#---START: Used in for client configure
3916+# Check if we threads are in libc or if we should use
3917+# -lpthread, -lpthreads or mit-pthreads
3918+# We have to check libc last because else it fails on Solaris 2.6
3919+
3920+with_posix_threads="no"
3921+# Search thread lib on Linux
3922+if test "$with_named_thread" = "no"
3923+then
3924+ AC_MSG_CHECKING("Linux threads")
3925+ if test "$TARGET_LINUX" = "true"
3926+ then
3927+ AC_MSG_RESULT("starting")
3928+ # use getconf to check glibc contents
3929+ AC_MSG_CHECKING("getconf GNU_LIBPTHREAD_VERSION")
3930+ case `getconf GNU_LIBPTHREAD_VERSION | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ` in
3931+ NPTL* )
3932+ AC_MSG_RESULT("NPTL")
3933+ AC_DEFINE([HAVE_NPTL], [1], [NPTL threads implementation])
3934+ with_named_thread="-lpthread"
3935+ ;;
3936+ LINUXTHREADS* )
3937+ AC_MSG_RESULT("Linuxthreads")
3938+ AC_DEFINE([HAVE_LINUXTHREADS], [1],
3939+ [Whether we are using Xavier Leroy's LinuxThreads])
3940+ with_named_thread="-lpthread"
3941+ ;;
3942+ * )
3943+ AC_MSG_RESULT("unknown")
3944+ ;;
3945+ esac
3946+ if test "$with_named_thread" = "no"
3947+ then
3948+ # old method, check headers
3949+ # Look for LinuxThreads.
3950+ AC_MSG_CHECKING("LinuxThreads in header file comment")
3951+ res=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l`
3952+ if test "$res" -gt 0
3953+ then
3954+ AC_MSG_RESULT("Found")
3955+ AC_DEFINE([HAVE_LINUXTHREADS], [1],
3956+ [Whether we are using Xavier Leroy's LinuxThreads])
3957+ # Linux 2.0 sanity check
3958+ AC_TRY_COMPILE([#include <sched.h>], [int a = sched_get_priority_min(1);], ,
3959+ AC_MSG_ERROR([Syntax error in sched.h. Change _P to __P in the /usr/include/sched.h file. See the Installation chapter in the Reference Manual]))
3960+ # RedHat 5.0 does not work with dynamic linking of this. -static also
3961+ # gives a speed increase in linux so it does not hurt on other systems.
3962+ with_named_thread="-lpthread"
3963+ else
3964+ AC_MSG_RESULT("Not found")
3965+ # If this is a linux machine we should barf
3966+ AC_MSG_ERROR([This is a Linux system without a working getconf,
3967+and Linuxthreads was not found. Please install it (or a new glibc) and try again.
3968+See the Installation chapter in the Reference Manual for more information.])
3969+ fi
3970+ else
3971+ AC_MSG_RESULT("no need to check headers")
3972+ fi
3973+
3974+ AC_MSG_CHECKING("for pthread_create in -lpthread")
3975+ ac_save_LIBS="$LIBS"
3976+ LIBS="$LIBS -lpthread"
3977+ AC_TRY_LINK( [#include <pthread.h>],
3978+ [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
3979+ AC_MSG_RESULT("yes"),
3980+ [ AC_MSG_RESULT("no")
3981+ AC_MSG_ERROR([
3982+This is a Linux system claiming to support threads, either Linuxthreads or NPTL, but linking a test program failed.
3983+Please install one of these (or a new glibc) and try again.
3984+See the Installation chapter in the Reference Manual for more information.]) ]
3985+ )
3986+ LIBS="$ac_save_LIBS"
3987+ else
3988+ AC_MSG_RESULT("no")
3989+ fi # "$TARGET_LINUX"
3990+fi # "$with_named_thread" = "no" -a "$with_mit_threads" = "no"
3991+
3992+
3993+# Hack for DEC-UNIX (OSF1 -> Tru64)
3994+if test "$with_named_thread" = "no" -a "$with_mit_threads" = "no"
3995+then
3996+ AC_MSG_CHECKING("DEC threads post OSF/1 3.2")
3997+ if test -f /usr/shlib/libpthread.so -a -f /usr/lib/libmach.a -a -f /usr/ccs/lib/cmplrs/cc/libexc.a
3998+ then
3999+ with_named_thread="-lpthread -lmach -lexc"
4000+ CFLAGS="$CFLAGS -D_REENTRANT"
4001+ CXXFLAGS="$CXXFLAGS -D_REENTRANT"
4002+ AC_DEFINE(HAVE_DEC_THREADS, [1], [Whether we are using DEC threads])
4003+ AC_MSG_RESULT("yes")
4004+ else
4005+ AC_MSG_RESULT("no")
4006+ fi # DEC threads
4007+fi # "$with_named_thread" = "no" -a "$with_mit_threads" = "no"
4008+
4009+
4010+dnl This is needed because -lsocket has to come after the thread
4011+dnl library on SCO.
4012+AC_DEFUN([MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK], [
4013+ LIBS=`echo " $LIBS " | sed -e 's/ -lsocket / /g'`
4014+])
4015+# Hack for SCO UNIX
4016+if test "$with_named_thread" = "no"
4017+then
4018+ AC_MSG_CHECKING("SCO threads")
4019+ if expr "$SYSTEM_TYPE" : ".*sco.*" > /dev/null
4020+ then
4021+ if test -f /usr/lib/libgthreads.a -o -f /usr/lib/libgthreads.so
4022+ then
4023+ MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
4024+ with_named_thread="-lgthreads -lsocket -lgthreads"
4025+ # sched.h conflicts with fsu-threads
4026+ touch ./include/sched.h
4027+ touch ./include/semaphore.h
4028+
4029+ # We must have gcc
4030+ if expr "$CC" : ".*gcc.*"
4031+ then
4032+ AC_MSG_RESULT("yes")
4033+ else
4034+ AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.])
4035+ fi
4036+ AC_MSG_RESULT("yes")
4037+ elif test -f /usr/local/lib/libpthread.a -o -f /usr/local/lib/libpthread.so
4038+ then
4039+ MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
4040+ with_named_thread="-lpthread -lsocket"
4041+ # sched.h conflicts with fsu-threads
4042+ # touch ./include/sched.h
4043+
4044+ AC_MSG_CHECKING("for gcc")
4045+ # We must have gcc
4046+ if expr "$CC" : ".*gcc.*"
4047+ then
4048+ AC_MSG_RESULT("yes")
4049+ else
4050+ AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.])
4051+ fi
4052+ AC_MSG_RESULT("yes")
4053+ # Hack for SCO UnixWare 7.1.x
4054+ #
4055+ elif test "$with_named_thread" = "no"
4056+ then
4057+ AC_MSG_RESULT("no")
4058+ AC_MSG_CHECKING("SCO UnixWare 7.1.x native threads")
4059+ if expr "$SYSTEM_TYPE" : ".*sco.*" > /dev/null
4060+ then
4061+ if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so
4062+ then
4063+ MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
4064+ if expr "$CC" : ".*gcc.*"
4065+ then
4066+ with_named_thread="-pthread -lsocket -lnsl"
4067+ else
4068+ with_named_thread="-Kthread -lsocket -lnsl"
4069+ fi
4070+ if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null
4071+ then
4072+ AC_DEFINE(HAVE_UNIXWARE7_THREADS, [1])
4073+ fi
4074+ AC_MSG_RESULT("yes")
4075+ # We must have cc
4076+ AC_MSG_CHECKING("for gcc")
4077+ if expr "$CC" : ".*gcc.*"
4078+ then
4079+ CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"
4080+ CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"
4081+ else
4082+ CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"
4083+ CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"
4084+ fi
4085+ else
4086+ AC_MSG_ERROR([configure: error: Can't find thread libs on SCO UnixWare7. See the Installation chapter in the Reference Manual.])
4087+ fi
4088+ else
4089+ AC_MSG_RESULT("no")
4090+ fi
4091+ else
4092+ AC_MSG_ERROR([On SCO UNIX MySQL requires that the FSUThreads package is installed. See the Installation chapter in the Reference Manual.])
4093+ fi
4094+ else
4095+ AC_MSG_RESULT("no")
4096+ fi
4097+fi
4098+
4099+#
4100+# Check for SCO threading libraries
4101+#
4102+if test "$with_named_thread" = "no"
4103+then
4104+ AC_MSG_CHECKING([SCO OpenServer 6, UnixWare 7 or OpenUNIX 8 native threads])
4105+ if expr "$SYSTEM_TYPE" : ".*UnixWare.*" > /dev/null || \
4106+ expr "$SYSTEM_TYPE" : ".*SCO_SV6.*" > /dev/null || \
4107+ expr "$SYSTEM_TYPE" : ".*OpenUNIX.*" > /dev/null
4108+ then
4109+ if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so
4110+ then
4111+ MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
4112+ if expr "$CC" : ".*gcc.*" > /dev/null
4113+ then
4114+ with_named_thread="-pthread -lsocket -lnsl"
4115+ CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";
4116+ CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";
4117+ else
4118+ with_named_thread="-Kthread -lsocket -lnsl"
4119+ CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";
4120+ CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";
4121+ fi
4122+ if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null
4123+ then
4124+ AC_DEFINE(HAVE_UNIXWARE7_THREADS, [1], [Have UnixWare 7 (or similar) almost-POSIX threading library])
4125+ fi
4126+ AC_MSG_RESULT(yes)
4127+ else
4128+ AC_MSG_ERROR([configure: error: Can't find thread library on SCO/Caldera system. See the Installation chapter in the Reference Manual.])
4129+ fi
4130+ else
4131+ AC_MSG_RESULT(no)
4132+ fi
4133+fi
4134+
4135+# Hack for Siemens UNIX
4136+if test "$with_named_thread" = "no"
4137+then
4138+ AC_MSG_CHECKING("Siemens threads")
4139+ if test -f /usr/lib/libxnet.so -a "$SYSTEM_TYPE" = "sni-sysv4"
4140+ then
4141+ LIBS="-lxnet $LIBS"
4142+ NON_THREADED_LIBS="-lxnet $NON_THREADED_LIBS"
4143+ with_named_thread="-Kthread $LDFLAGS -lxnet"
4144+ LD_FLAGS=""
4145+ CFLAGS="-Kthread $CFLAGS"
4146+ CXXFLAGS="-Kthread $CXXFLAGS"
4147+ AC_MSG_RESULT("yes")
4148+ else
4149+ AC_MSG_RESULT("no")
4150+ fi
4151+fi
4152+
4153+# Use library named -lpthread
4154+if test "$with_named_thread" = "no" -a "$with_pthread" = "yes"
4155+then
4156+ with_named_thread="-lpthread"
4157+fi
4158+
4159+#---END:
4160+
4161+# Hack for Solaris >= 2.5
4162+# We want both the new and the old interface
4163+
4164+if test "$with_named_thread" = "no"
4165+then
4166+ AC_MSG_CHECKING("Solaris threads")
4167+ if test -f /usr/lib/libpthread.so -a -f /usr/lib/libthread.so
4168+ then
4169+ with_named_thread="-lpthread -lthread"
4170+ AC_MSG_RESULT("yes")
4171+ else
4172+ AC_MSG_RESULT("no")
4173+ fi
4174+fi
4175+
4176+# Should we use named pthread library ?
4177+AC_MSG_CHECKING("named thread libs:")
4178+if test "$with_named_thread" != "no"
4179+then
4180+ LIBS="$with_named_thread $LIBS $with_named_thread"
4181+ CLIENT_THREAD_LIBS="$with_named_thread"
4182+ with_posix_threads="yes"
4183+ AC_MSG_RESULT("$with_named_thread")
4184+else
4185+ AC_MSG_RESULT("no")
4186+ # pthread_create is in standard libraries (As in BSDI 3.0)
4187+ AC_MSG_CHECKING("for pthread_create in -libc");
4188+ AC_TRY_LINK(
4189+ [#include <pthread.h>],
4190+ [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
4191+ with_posix_threads=yes, with_posix_threads=no)
4192+ AC_MSG_RESULT("$with_posix_threads")
4193+ if test "$with_posix_threads" = "no"
4194+ then
4195+ AC_MSG_CHECKING("for pthread_create in -lpthread")
4196+ ac_save_LIBS="$LIBS"
4197+ LIBS="$LIBS -lpthread"
4198+ CLIENT_THREAD_LIBS="-lpthread"
4199+ AC_TRY_LINK(
4200+ [#include <pthread.h>],
4201+ [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
4202+ with_posix_threads=yes, with_posix_threads=no)
4203+ AC_MSG_RESULT("$with_posix_threads")
4204+ if test "$with_posix_threads" = "no"
4205+ then
4206+ LIBS=" $ac_save_LIBS -lpthreads"
4207+ CLIENT_THREAD_LIBS="-lpthreads"
4208+ AC_MSG_CHECKING("for pthread_create in -lpthreads")
4209+ AC_TRY_LINK(
4210+ [#include <pthread.h>],
4211+ [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
4212+ with_posix_threads=yes, with_posix_threads=no)
4213+ AC_MSG_RESULT("$with_posix_threads")
4214+ if test "$with_posix_threads" = "no"
4215+ then
4216+ # This is for FreeBSD
4217+ LIBS="$ac_save_LIBS -pthread"
4218+ CLIENT_THREAD_LIBS="-pthread"
4219+ AC_MSG_CHECKING("for pthread_create in -pthread")
4220+ AC_TRY_LINK(
4221+ [#include <pthread.h>],
4222+ [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
4223+ with_posix_threads=yes, with_posix_threads=no)
4224+ AC_MSG_RESULT("$with_posix_threads")
4225+ fi
4226+ fi
4227+ fi
4228+fi
4229+
4230+#---START: Used in for client configure
4231+# Must be checked after, because strtok_r may be in -lpthread
4232+# On AIX strtok_r is in libc_r
4233+
4234+my_save_LIBS="$LIBS"
4235+AC_CHECK_LIB(pthread,strtok_r)
4236+LIBS="$my_save_LIBS"
4237+if test "$ac_cv_lib_pthread_strtok_r" = "no"
4238+then
4239+ AC_CHECK_LIB(c_r,strtok_r)
4240+ case "$with_osf32_threads---$target_os" in
4241+ # Don't keep -lc_r in LIBS; -pthread handles it magically
4242+ yes---* | *---freebsd* | *---hpux*) LIBS="$my_save_LIBS" ;;
4243+
4244+ esac
4245+ AC_CHECK_FUNCS(strtok_r pthread_init)
4246+else
4247+ AC_CHECK_FUNCS(strtok_r)
4248+fi
4249+#---END:
4250+
4251+# dlopen, dlerror
4252+case "$with_mysqld_ldflags " in
4253+
4254+ *"-all-static "*)
4255+ # No need to check for dlopen when mysqld is linked with
4256+ # -all-static as it won't be able to load any functions.
4257+ # NOTE! It would be better if it was possible to test if dlopen
4258+ # can be used, but a good way to test it couldn't be found
4259+
4260+ ;;
4261+
4262+ *)
4263+ # Check for dlopen, needed for user definable functions
4264+ # This must be checked after threads on AIX
4265+ # We only need this for mysqld, not for the clients.
4266+
4267+ my_save_LIBS="$LIBS"
4268+ LIBS=""
4269+ AC_CHECK_LIB(dl,dlopen)
4270+ LIBDL=$LIBS
4271+ LIBS="$my_save_LIBS"
4272+ AC_SUBST(LIBDL)
4273+
4274+ my_save_LIBS="$LIBS"
4275+ LIBS="$LIBS $LIBDL"
4276+ AC_CHECK_FUNCS(dlopen dlerror)
4277+ LIBS="$my_save_LIBS"
4278+
4279+ ;;
4280+esac
4281+
4282+
4283+# System characteristics
4284+case $SYSTEM_TYPE in
4285+ *netware*) ;;
4286+ *)
4287+AC_SYS_RESTARTABLE_SYSCALLS
4288+ ;;
4289+esac
4290+
4291+# Build optimized or debug version ?
4292+# First check for gcc and g++
4293+if test "$GCC" = "yes"
4294+then
4295+ DEBUG_CFLAGS="-g"
4296+ DEBUG_OPTIMIZE_CC="-O"
4297+ OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
4298+else
4299+ DEBUG_CFLAGS="-g"
4300+ DEBUG_OPTIMIZE_CC=""
4301+ case $SYSTEM_TYPE in
4302+ *solaris*)
4303+ OPTIMIZE_CFLAGS="-O1"
4304+ ;;
4305+ *)
4306+ OPTIMIZE_CFLAGS="-O"
4307+ ;;
4308+ esac
4309+fi
4310+if test "$GXX" = "yes"
4311+then
4312+ DEBUG_CXXFLAGS="-g"
4313+ DEBUG_OPTIMIZE_CXX="-O"
4314+ OPTIMIZE_CXXFLAGS="$MAX_CXX_OPTIMIZE"
4315+else
4316+ DEBUG_OPTIMIZE_CXX=""
4317+ case $SYSTEM_TYPE in
4318+ *solaris*)
4319+ DEBUG_CXXFLAGS="-g0"
4320+ OPTIMIZE_CXXFLAGS="-O1"
4321+ ;;
4322+ *)
4323+ DEBUG_CXXFLAGS="-g"
4324+ OPTIMIZE_CXXFLAGS="-O"
4325+ ;;
4326+ esac
4327+fi
4328+
4329+case $SYSTEM_TYPE in
4330+ *netware*)
4331+ DEBUG_CFLAGS="-g -DDEBUG -sym internal,codeview4"
4332+ DEBUG_CXXFLAGS="-g -DDEBUG -sym internal,codeview4"
4333+ DEBUG_OPTIMIZE_CC="-DDEBUG"
4334+ DEBUG_OPTIMIZE_CXX="-DDEBUG"
4335+ OPTIMIZE_CFLAGS="-O3 -DNDEBUG"
4336+ OPTIMIZE_CXXFLAGS="-O3 -DNDEBUG"
4337+ ;;
4338+esac
4339+
4340+# If the user specified CFLAGS, we won't add any optimizations
4341+if test -n "$SAVE_CFLAGS"
4342+then
4343+ OPTIMIZE_CFLAGS=""
4344+ DEBUG_OPTIMIZE_CC=""
4345+fi
4346+# Ditto for CXXFLAGS
4347+if test -n "$SAVE_CXXFLAGS"
4348+then
4349+ OPTIMIZE_CXXFLAGS=""
4350+ DEBUG_OPTIMIZE_CXX=""
4351+fi
4352+
4353+if test "$with_debug" = "yes"
4354+then
4355+ # Medium debug.
4356+ AC_DEFINE([DBUG_ON], [1], [Use libdbug])
4357+ CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DSAFE_MUTEX $CFLAGS"
4358+ CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"
4359+elif test "$with_debug" = "full"
4360+then
4361+ # Full debug. Very slow in some cases
4362+ AC_DEFINE([DBUG_ON], [1], [Use libdbug])
4363+ CFLAGS="$DEBUG_CFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
4364+ CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
4365+else
4366+ # Optimized version. No debug
4367+ AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug])
4368+ CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS"
4369+ CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS"
4370+fi
4371+
4372+AC_ARG_WITH([valgrind],
4373+ [AS_HELP_STRING([--with-valgrind],
4374+ [Valgrind instrumentation @<:@default=no@:>@])],
4375+ [], [with_valgrind=no])
4376+
4377+if test "$with_valgrind" != "no"
4378+then
4379+ AC_CHECK_HEADERS([valgrind/valgrind.h valgrind/memcheck.h],
4380+ [AC_DEFINE([HAVE_VALGRIND], [1], [Define for Valgrind support])])
4381+fi
4382+
4383+# Debug Sync Facility. NOTE: depends on 'with_debug'. Must be behind it.
4384+AC_MSG_CHECKING(if Debug Sync Facility should be enabled.)
4385+AC_ARG_ENABLE(debug_sync,
4386+ AS_HELP_STRING([--enable-debug-sync],
4387+ [Build a version with Debug Sync Facility]),
4388+ [ enable_debug_sync=$enableval ],
4389+ [ enable_debug_sync=$with_debug ])
4390+
4391+if test "$enable_debug_sync" != "no"
4392+then
4393+ AC_DEFINE([ENABLED_DEBUG_SYNC], [1],
4394+ [If Debug Sync Facility should be enabled])
4395+ AC_MSG_RESULT([yes])
4396+else
4397+ AC_MSG_RESULT([no])
4398+fi
4399+
4400+# If we should allow error injection tests
4401+AC_ARG_WITH(error-inject,
4402+ AC_HELP_STRING([--with-error-inject],[Enable error injection in MySQL Server]),
4403+ [ with_error_inject=$withval ],
4404+ [ with_error_inject=no ])
4405+
4406+if test $with_debug != "no"
4407+then
4408+ if test "$with_error_inject" = "yes"
4409+ then
4410+ AC_DEFINE([ERROR_INJECT_SUPPORT], [1],
4411+ [Enable error injection in MySQL Server])
4412+ fi
4413+fi
4414+
4415+AC_ARG_WITH([fast-mutexes],
4416+ AC_HELP_STRING([--with-fast-mutexes],
4417+ [Compile with fast mutexes (default is disabled)]),
4418+ [with_fast_mutexes=$withval], [with_fast_mutexes=no])
4419+
4420+if test "$with_fast_mutexes" != "no"
4421+then
4422+ if test "$with_debug" != "no"
4423+ then
4424+ AC_MSG_WARN(['--with-fast-mutexes' ignored when '--with-debug' is given])
4425+ else
4426+ AC_DEFINE([MY_PTHREAD_FASTMUTEX], [1],
4427+ [Define to 1 if you want to use fast mutexes])
4428+ fi
4429+fi
4430+
4431+AC_ARG_WITH([atomic-ops],
4432+ AC_HELP_STRING([--with-atomic-ops=rwlocks|smp|up],
4433+ [Implement atomic operations using pthread rwlocks or atomic CPU
4434+ instructions for multi-processor (default) or uniprocessor
4435+ configuration]), , [with_atomic_ops=smp])
4436+case "$with_atomic_ops" in
4437+ "up") AC_DEFINE([MY_ATOMIC_MODE_DUMMY], [1],
4438+ [Assume single-CPU mode, no concurrency]) ;;
4439+ "rwlocks") AC_DEFINE([MY_ATOMIC_MODE_RWLOCKS], [1],
4440+ [Use pthread rwlocks for atomic ops]) ;;
4441+ "smp") ;;
4442+ *) AC_MSG_ERROR(["$with_atomic_ops" is not a valid value for --with-atomic-ops]) ;;
4443+esac
4444+
4445+AC_CACHE_CHECK([whether the compiler provides atomic builtins],
4446+ [mysql_cv_gcc_atomic_builtins], [AC_TRY_RUN([
4447+ int main()
4448+ {
4449+ int foo= -10; int bar= 10;
4450+ long long int foo64= -10; long long int bar64= 10;
4451+ if (!__sync_fetch_and_add(&foo, bar) || foo)
4452+ return -1;
4453+ bar= __sync_lock_test_and_set(&foo, bar);
4454+ if (bar || foo != 10)
4455+ return -1;
4456+ bar= __sync_val_compare_and_swap(&bar, foo, 15);
4457+ if (bar)
4458+ return -1;
4459+ if (!__sync_fetch_and_add(&foo64, bar64) || foo64)
4460+ return -1;
4461+ bar64= __sync_lock_test_and_set(&foo64, bar64);
4462+ if (bar64 || foo64 != 10)
4463+ return -1;
4464+ bar64= __sync_val_compare_and_swap(&bar64, foo, 15);
4465+ if (bar64)
4466+ return -1;
4467+ return 0;
4468+ }
4469+], [mysql_cv_gcc_atomic_builtins=yes],
4470+ [mysql_cv_gcc_atomic_builtins=no],
4471+ [mysql_cv_gcc_atomic_builtins=no])])
4472+
4473+if test "x$mysql_cv_gcc_atomic_builtins" = xyes; then
4474+ AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS, 1,
4475+ [Define to 1 if compiler provides atomic builtins.])
4476+fi
4477+
4478+AC_CACHE_CHECK([whether the OS provides atomic_* functions like Solaris],
4479+ [mysql_cv_solaris_atomic],
4480+ [AC_RUN_IFELSE(
4481+ [AC_LANG_PROGRAM(
4482+ [[
4483+ #include <atomic.h>
4484+ ]],
4485+ [[
4486+ int foo = -10; int bar = 10;
4487+ int64_t foo64 = -10; int64_t bar64 = 10;
4488+ if (atomic_add_int_nv((uint_t *)&foo, bar) || foo)
4489+ return -1;
4490+ bar = atomic_swap_uint((uint_t *)&foo, (uint_t)bar);
4491+ if (bar || foo != 10)
4492+ return -1;
4493+ bar = atomic_cas_uint((uint_t *)&bar, (uint_t)foo, 15);
4494+ if (bar)
4495+ return -1;
4496+ if (atomic_add_64_nv((volatile uint64_t *)&foo64, bar64) || foo64)
4497+ return -1;
4498+ bar64 = atomic_swap_64((volatile uint64_t *)&foo64, (uint64_t)bar64);
4499+ if (bar64 || foo64 != 10)
4500+ return -1;
4501+ bar64 = atomic_cas_64((volatile uint64_t *)&bar64, (uint_t)foo64, 15);
4502+ if (bar64)
4503+ return -1;
4504+ atomic_or_64((volatile uint64_t *)&bar64, 0);
4505+ return 0;
4506+ ]]
4507+ )],
4508+ [mysql_cv_solaris_atomic=yes],
4509+ [mysql_cv_solaris_atomic=no],
4510+ [mysql_cv_solaris_atomic=no]
4511+)])
4512+
4513+if test "x$mysql_cv_solaris_atomic" = xyes; then
4514+ AC_DEFINE(HAVE_SOLARIS_ATOMIC, 1,
4515+ [Define to 1 if OS provides atomic_* functions like Solaris.])
4516+fi
4517+
4518+# Force static compilation to avoid linking problems/get more speed
4519+AC_ARG_WITH(mysqld-ldflags,
4520+ [ --with-mysqld-ldflags Extra linking arguments for mysqld],
4521+ [MYSQLD_EXTRA_LDFLAGS=$withval],
4522+ [MYSQLD_EXTRA_LDFLAGS=])
4523+AC_SUBST(MYSQLD_EXTRA_LDFLAGS)
4524+
4525+AC_ARG_WITH(client-ldflags,
4526+ [ --with-client-ldflags Extra linking arguments for clients],
4527+ [CLIENT_EXTRA_LDFLAGS=$withval],
4528+ [CLIENT_EXTRA_LDFLAGS=])
4529+AC_SUBST(CLIENT_EXTRA_LDFLAGS)
4530+
4531+AC_ARG_WITH(mysqld-libs,
4532+ [ --with-mysqld-libs Extra libraries to link with for mysqld],
4533+ [MYSQLD_EXTRA_LIBS=$withval],
4534+ [MYSQLD_EXTRA_LIBS=])
4535+AC_SUBST(MYSQLD_EXTRA_LIBS)
4536+
4537+AC_ARG_WITH(lib-ccflags,
4538+ [ --with-lib-ccflags Extra CC options for libraries],
4539+ [LIB_EXTRA_CCFLAGS=$withval],
4540+ [LIB_EXTRA_CCFLAGS=])
4541+AC_SUBST(LIB_EXTRA_CCFLAGS)
4542+
4543+# Avoid stupid bug on some OS
4544+AC_ARG_WITH(low-memory,
4545+ [ --with-low-memory Try to use less memory to compile to avoid
4546+ memory limitations.],
4547+ [with_lowmem=$withval],
4548+ [with_lowmem=no])
4549+if test "$with_lowmem" = "yes"
4550+then
4551+ if test "$ac_cv_prog_gcc" = "yes"
4552+ then
4553+ LM_CFLAGS="-fno-inline"
4554+ else
4555+ LM_CFLAGS="-O0"
4556+ fi
4557+else
4558+ LM_CFLAGS=""
4559+fi
4560+AC_SUBST(LM_CFLAGS)
4561+
4562+AC_ARG_WITH(comment,
4563+ [ --with-comment Comment about compilation environment.],
4564+ [with_comment=$withval],
4565+ [with_comment=no])
4566+if test "$with_comment" != "no"
4567+then
4568+ COMPILATION_COMMENT=$with_comment
4569+else
4570+ COMPILATION_COMMENT="Source distribution"
4571+fi
4572+AC_SUBST(COMPILATION_COMMENT)
4573+
4574+AC_MSG_CHECKING("need of special linking flags")
4575+if test "$TARGET_LINUX" = "true" -a "$ac_cv_prog_gcc" = "yes" -a "$all_is_static" != "yes"
4576+then
4577+ LDFLAGS="$LDFLAGS -rdynamic"
4578+ AC_MSG_RESULT("-rdynamic")
4579+else
4580+ case "$SYSTEM_TYPE$with_mysqld_ldflags " in
4581+ *freebsd*"-all-static "*|*dragonfly*"-all-static "*)
4582+ AC_MSG_RESULT("none")
4583+ ;;
4584+ *freebsd*|*dragonfly*)
4585+ MYSQLD_EXTRA_LDFLAGS="$MYSQLD_EXTRA_LDFLAGS -export-dynamic"
4586+ AC_MSG_RESULT("-export-dynamic")
4587+ ;;
4588+ *)
4589+ AC_MSG_RESULT("none")
4590+ ;;
4591+ esac
4592+fi
4593+
4594+dnl Checks for typedefs, structures, and compiler characteristics.
4595+AC_C_CONST
4596+AC_C_INLINE
4597+AC_TYPE_OFF_T
4598+AC_STRUCT_ST_RDEV
4599+AC_HEADER_TIME
4600+AC_STRUCT_TM
4601+MYSQL_NEEDS_MYSYS_NEW
4602+# AC_CHECK_SIZEOF return 0 when it does not find the size of a
4603+# type. We want a error instead.
4604+AC_CHECK_SIZEOF(char, 1)
4605+if test "$ac_cv_sizeof_char" -eq 0
4606+then
4607+ AC_MSG_ERROR([No size for char type.
4608+A likely cause for this could be that there isn't any
4609+static libraries installed. You can verify this by checking if you have libm.a
4610+in /lib, /usr/lib or some other standard place. If this is the problem,
4611+install the static libraries and try again. If this isn't the problem,
4612+examine config.log for possible errors. If you want to report this, use
4613+'scripts/mysqlbug' and include at least the last 20 rows from config.log!])
4614+fi
4615+AC_CHECK_SIZEOF(char*, 4)
4616+AC_CHECK_SIZEOF(short, 2)
4617+AC_CHECK_SIZEOF(int, 4)
4618+if test "$ac_cv_sizeof_int" -eq 0
4619+then
4620+ AC_MSG_ERROR("No size for int type.")
4621+fi
4622+AC_CHECK_SIZEOF(long, 4)
4623+if test "$ac_cv_sizeof_long" -eq 0
4624+then
4625+ AC_MSG_ERROR("No size for long type.")
4626+fi
4627+AC_CHECK_SIZEOF(long long, 8)
4628+if test "$ac_cv_sizeof_long_long" -eq 0
4629+then
4630+ AC_MSG_ERROR("MySQL needs a long long type.")
4631+fi
4632+# off_t is not a builtin type
4633+AC_CHECK_SIZEOF(off_t, 4)
4634+if test "$ac_cv_sizeof_off_t" -eq 0
4635+then
4636+ AC_MSG_ERROR("MySQL needs a off_t type.")
4637+fi
4638+
4639+dnl
4640+dnl check if time_t is unsigned
4641+dnl
4642+
4643+MYSQL_CHECK_TIME_T
4644+
4645+dnl
4646+dnl check size of time_t
4647+dnl
4648+
4649+AC_CHECK_SIZEOF(time_t, 8)
4650+if test "$ac_cv_sizeof_time_t" -eq 0
4651+then
4652+ AC_MSG_ERROR("MySQL needs a time_t type.")
4653+fi
4654+
4655+# do we need #pragma interface/#pragma implementation ?
4656+# yes if it's gcc 2.x, and not icc pretending to be gcc, and not cygwin
4657+AC_MSG_CHECKING(the need for @%:@pragma interface/implementation)
4658+# instead of trying to match SYSTEM_TYPE and CC_VERSION (that doesn't
4659+# follow any standard), we'll use well-defined preprocessor macros:
4660+AC_TRY_CPP([
4661+#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)
4662+#error USE_PRAGMA_IMPLEMENTATION
4663+#endif
4664+],AC_MSG_RESULT(no) ,AC_MSG_RESULT(yes) ; CXXFLAGS="$CXXFLAGS -DUSE_PRAGMA_IMPLEMENTATION")
4665+
4666+# This always gives a warning. Ignore it unless you are cross compiling
4667+AC_C_BIGENDIAN
4668+#---START: Used in for client configure
4669+# Check base type of last arg to accept
4670+MYSQL_TYPE_ACCEPT
4671+#---END:
4672+# Figure out what type of struct rlimit to use with setrlimit
4673+MYSQL_TYPE_STRUCT_RLIMIT
4674+# Find where the stack goes
4675+MYSQL_STACK_DIRECTION
4676+# We want to skip alloca on irix unconditionally. It may work on some version..
4677+MYSQL_FUNC_ALLOCA
4678+# Do struct timespec have members tv_sec or ts_sec
4679+MYSQL_TIMESPEC_TS
4680+# Do we have the tzname variable
4681+MYSQL_TZNAME
4682+# Do the c++ compiler have a bool type
4683+MYSQL_CXX_BOOL
4684+# Check some common bugs with gcc 2.8.# on sparc
4685+case $SYSTEM_TYPE in
4686+ *netware*) ;;
4687+ *)
4688+ MYSQL_CHECK_LONGLONG_TO_FLOAT
4689+ if test "$ac_cv_conv_longlong_to_float" != "yes"
4690+ then
4691+ AC_MSG_ERROR([Your compiler cannot convert a longlong value to a float!
4692+ If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try
4693+ again])
4694+ fi
4695+ ;;
4696+esac
4697+AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
4698+AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>])
4699+AC_CHECK_TYPES([u_int32_t])
4700+
4701+MYSQL_PTHREAD_YIELD
4702+
4703+######################################################################
4704+# For readline/libedit (We simply move the mimimum amount of stuff from
4705+# the readline/libedit configure.in here)
4706+
4707+dnl Checks for header files.
4708+AC_CHECK_HEADERS(malloc.h sys/cdefs.h)
4709+
4710+dnl Checks for library functions.
4711+AC_FUNC_ALLOCA
4712+AC_PROG_GCC_TRADITIONAL
4713+AC_TYPE_SIGNAL
4714+AC_CHECK_FUNCS(re_comp regcomp strdup)
4715+
4716+dnl Sun compilers have their own vis.h that is about something
4717+dnl totally different. So, not to change the libedit source, we
4718+dnl do some additional checks before we define HAVE_VIS_H.
4719+AC_CHECK_HEADER(vis.h,
4720+ [AC_CHECK_FUNC(strvis,
4721+ [AC_DEFINE([HAVE_VIS_H], [1],[Found vis.h and the strvis() function])])])
4722+
4723+AC_CHECK_FUNCS(strlcat strlcpy)
4724+AC_CHECK_FUNCS(issetugid getuid geteuid getgid getegid)
4725+AC_CHECK_FUNCS(fgetln)
4726+AC_CHECK_FUNCS(getline flockfile)
4727+
4728+# from old readline settting:
4729+
4730+MAKE_SHELL=/bin/sh
4731+AC_SUBST(MAKE_SHELL)
4732+
4733+# Already-done: stdlib.h string.h unistd.h termios.h
4734+AC_CHECK_HEADERS(varargs.h stdarg.h dirent.h locale.h ndir.h sys/dir.h \
4735+ sys/file.h sys/ndir.h sys/ptem.h sys/pte.h sys/select.h sys/stream.h \
4736+ sys/mman.h curses.h termcap.h termio.h termbits.h asm/termbits.h grp.h \
4737+paths.h semaphore.h)
4738+
4739+# Already-done: strcasecmp
4740+AC_CHECK_FUNCS(lstat putenv select setenv setlocale strcoll tcgetattr)
4741+
4742+AC_STAT_MACROS_BROKEN
4743+MYSQL_SIGNAL_CHECK
4744+MYSQL_CHECK_GETPW_FUNCS
4745+MYSQL_HAVE_TIOCGWINSZ
4746+MYSQL_HAVE_FIONREAD
4747+MYSQL_HAVE_TIOCSTAT
4748+MYSQL_STRUCT_DIRENT_D_INO
4749+MYSQL_STRUCT_DIRENT_D_NAMLEN
4750+MYSQL_TYPE_SIGHANDLER
4751+MYSQL_CHECK_MULTIBYTE
4752+if test "$with_named_curses" = "no"
4753+then
4754+ MYSQL_CHECK_LIB_TERMCAP
4755+else
4756+ TERMCAP_LIB="$with_named_curses"
4757+fi
4758+AC_SUBST(TERMCAP_LIB)
4759+
4760+# Check if the termcap function 'tgoto' is already declared in
4761+# system header files or if it need to be declared locally
4762+AC_CHECK_DECLS(tgoto,,,[
4763+#ifdef HAVE_CURSES_H
4764+# include <curses.h>
4765+#elif HAVE_NCURSES_H
4766+# include <ncurses.h>
4767+#endif
4768+#ifdef HAVE_TERM_H
4769+# include <term.h>
4770+#endif
4771+])
4772+
4773+LIBEDIT_LOBJECTS=""
4774+AC_CHECK_FUNC(strunvis, ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS unvis.o"])
4775+AC_CHECK_FUNC(strvis, ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS vis.o"])
4776+AC_CHECK_FUNC(strlcpy, ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS strlcpy.o"])
4777+AC_CHECK_FUNC(strlcat, ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS strlcat.o"])
4778+AC_CHECK_FUNC(fgetln, ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS fgetln.o"])
4779+AC_SUBST(LIBEDIT_LOBJECTS)
4780+enable_readline="yes"
4781+
4782+# End of readline/libedit stuff
4783+#########################################################################
4784+
4785+dnl Checks for library functions.
4786+
4787+#
4788+# The following code disables intrinsic function support while we test for
4789+# library functions. This is to avoid configure problems with Intel ecc
4790+# compiler
4791+
4792+ORG_CFLAGS="$CFLAGS"
4793+if test "$GCC" != "yes"; then
4794+ AC_SYS_COMPILER_FLAG(-nolib_inline,nolib_inline,CFLAGS,[],[])
4795+fi
4796+
4797+#AC_FUNC_MMAP
4798+AC_TYPE_SIGNAL
4799+MYSQL_TYPE_QSORT
4800+AC_FUNC_UTIME_NULL
4801+AC_FUNC_VPRINTF
4802+
4803+AC_CHECK_DECLS([fdatasync, bzero])
4804+
4805+AC_CHECK_FUNCS(alarm bfill bmove bsearch bzero \
4806+ chsize cuserid fchmod fcntl \
4807+ fconvert fdatasync fesetround finite fpresetsticky fpsetmask fsync ftruncate \
4808+ getcwd gethostbyaddr_r gethostbyname_r getpass getpassphrase getpwnam \
4809+ getpwuid getrlimit getrusage getwd index initgroups isnan \
4810+ localtime_r gethrtime gmtime_r \
4811+ locking longjmp lrand48 madvise mallinfo memcpy memmove \
4812+ mkstemp mlockall perror poll pread pthread_attr_create mmap mmap64 getpagesize \
4813+ pthread_attr_getstacksize pthread_attr_setprio pthread_attr_setschedparam \
4814+ pthread_attr_setstacksize pthread_condattr_create pthread_getsequence_np \
4815+ pthread_key_delete pthread_rwlock_rdlock pthread_setprio \
4816+ pthread_setprio_np pthread_setschedparam pthread_sigmask readlink \
4817+ realpath rename rint rwlock_init setupterm \
4818+ shmget shmat shmdt shmctl sigaction sigemptyset sigaddset \
4819+ sighold sigset sigthreadmask port_create sleep \
4820+ snprintf socket strsep stpcpy strcasecmp strerror strsignal strnlen strpbrk strstr \
4821+ strtol strtoll strtoul strtoull tell tempnam thr_setconcurrency vidattr \
4822+ posix_fallocate backtrace backtrace_symbols backtrace_symbols_fd printstack \
4823+ fedisableexcept)
4824+
4825+#
4826+#
4827+#
4828+# The following change can be safely null-merged to 5.5
4829+# since configure.cmake in 5.5 does the same check
4830+AC_SEARCH_LIBS(clock_gettime, rt, LIBRT="-lrt")
4831+case "$target" in
4832+ *-*-aix4* | *-*-sco*)
4833+ # (grr) aix 4.3 has a stub for clock_gettime, (returning ENOSYS)
4834+ # and using AC_TRY_RUN is hard when cross-compiling
4835+ # We also disable for SCO for the time being, the headers for the
4836+ # thread library we use conflicts with other headers.
4837+ ;;
4838+ *) AC_CHECK_FUNCS(clock_gettime)
4839+ ;;
4840+esac
4841+
4842+case "$mysql_cv_sys_os" in
4843+ OS400) # i5/OS (OS/400) emits a SIGILL (Function not implemented) when
4844+ # unsupported priority values are passed to pthread_setschedprio.
4845+ # Since the only supported value is 1, treat it as inexistent.
4846+ ;;
4847+ SunOS) # Bug#42599 error: `pthread_setschedprio' was not declared in this scope
4848+ # In some installations, the pthread.h header used by GCC does not
4849+ # declare the pthread_setscheprio prototype, but the function is
4850+ # implemented. Since the function is used in C++ code, ensure that
4851+ # the function prototype is present.
4852+ AC_MSG_CHECKING([whether pthread_setschedprio is declared])
4853+ AC_LANG_PUSH([C++])
4854+ AC_COMPILE_IFELSE([
4855+ AC_LANG_PROGRAM([#include <pthread.h>],
4856+ [(void)(pthread_setschedprio);])],
4857+ [ac_cv_func_pthread_setschedprio=yes],
4858+ [ac_cv_func_pthread_setschedprio=no])
4859+ AC_LANG_POP([C++])
4860+ AC_MSG_RESULT([$ac_cv_func_pthread_setschedprio])
4861+ if test "$ac_cv_func_pthread_setschedprio" = yes; then
4862+ AC_DEFINE(HAVE_PTHREAD_SETSCHEDPRIO, 1,
4863+ [Define to 1 if you have the `pthread_setschedprio' function.])
4864+ fi
4865+ ;;
4866+ *) AC_CHECK_FUNCS(pthread_setschedprio)
4867+ ;;
4868+esac
4869+
4870+# Check that isinf() is available in math.h and can be used in both C and C++
4871+# code
4872+AC_MSG_CHECKING(for isinf in <math.h>)
4873+AC_TRY_LINK([#include <math.h>], [float f = 0.0; int r = isinf(f); return r],
4874+ AC_MSG_RESULT(yes)
4875+ AC_MSG_CHECKING(whether isinf() is safe to use in C code)
4876+ AC_TRY_RUN([
4877+#include <math.h>
4878+int main()
4879+{
4880+ double a= 10.0;
4881+ double b= 1e308;
4882+
4883+ return !isinf(a * b);
4884+}
4885+],
4886+ [AC_MSG_RESULT(yes)],
4887+ [AC_MSG_RESULT(no)
4888+ AC_DEFINE([HAVE_BROKEN_ISINF], [1],
4889+ [Define to 1 if isinf() uses 80-bit register for intermediate values])
4890+ ],
4891+ [
4892+# Let's be optimistic when cross-compiling, since the only compiler known
4893+# to be affected by this isinf() bug is GCC 4.3 on 32-bit x86.
4894+ AC_MSG_RESULT([[cross-compiling, assuming 'yes']])
4895+ ])
4896+ AC_MSG_CHECKING(whether isinf() can be used in C++ code)
4897+ AC_LANG_SAVE
4898+ AC_LANG_CPLUSPLUS
4899+ AC_TRY_LINK([#include <math.h>], [float f = 0.0; int r = isinf(f); return r],
4900+ AC_MSG_RESULT(yes)
4901+ AC_DEFINE(HAVE_ISINF, [1], [isinf() macro or function]),
4902+ AC_MSG_RESULT(no))
4903+ AC_LANG_RESTORE,
4904+ AC_MSG_RESULT(no))
4905+
4906+CFLAGS="$ORG_CFLAGS"
4907+
4908+# Sanity check: We chould not have any fseeko symbol unless
4909+# large_file_support=yes
4910+AC_CHECK_FUNC(fseeko,
4911+[if test "$large_file_support" = no -a "$TARGET_LINUX" = "true";
4912+then
4913+ AC_MSG_ERROR("Found fseeko symbol but large_file_support is not enabled!")
4914+fi]
4915+)
4916+
4917+# Check definition of gethostbyaddr_r (glibc2 defines this with 8 arguments)
4918+ac_save_CXXFLAGS="$CXXFLAGS"
4919+AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style,
4920+AC_LANG_SAVE
4921+AC_LANG_CPLUSPLUS
4922+
4923+# Test whether madvise() is declared in C++ code -- it is not on some
4924+# systems, such as Solaris
4925+AC_CHECK_DECLS(madvise, [], [], [#if HAVE_SYS_MMAN_H
4926+#include <sys/types.h>
4927+#include <sys/mman.h>
4928+#endif])
4929+
4930+# Do not treat warnings as errors if we are linking against other libc
4931+# this is to work around gcc not being permissive on non-system includes
4932+# with respect to ANSI C++
4933+# We also remove the -fbranch-probabilities option as this will give warnings
4934+# about not profiled code, which confuses configure
4935+# We also must remove -W and -Wcheck which on icc produces warnings that
4936+# we don't want to catch with -Werror
4937+
4938+if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
4939+then
4940+ CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-ansi//; s/-pedantic//; s/-Wcheck//'`
4941+fi
4942+
4943+AC_TRY_COMPILE(
4944+[#undef inline
4945+#if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT)
4946+#define _REENTRANT
4947+#endif
4948+#include <pthread.h>
4949+#include <sys/types.h>
4950+#include <sys/socket.h>
4951+#include <netinet/in.h>
4952+#include <arpa/inet.h>
4953+#include <netdb.h>],
4954+[int skr;
4955+ struct hostent *foo = gethostbyaddr_r((const char *) 0,
4956+ 0, 0, (struct hostent *) 0, (char *) NULL, 0, &skr); return (foo == 0);],
4957+mysql_cv_gethost_style=solaris, mysql_cv_gethost_style=other))
4958+AC_LANG_RESTORE
4959+CXXFLAGS="$ac_save_CXXFLAGS"
4960+if test "$mysql_cv_gethost_style" = "solaris"
4961+then
4962+ AC_DEFINE([HAVE_SOLARIS_STYLE_GETHOST], [1],
4963+ [Solaris define gethostbyaddr_r with 7 arguments. glibc2 defines this with 8 arguments])
4964+fi
4965+
4966+#---START: Used in for client configure
4967+
4968+# Check definition of gethostbyname_r (glibc2.0.100 is different from Solaris)
4969+ac_save_CXXFLAGS="$CXXFLAGS"
4970+AC_CACHE_CHECK([style of gethostbyname_r routines], mysql_cv_gethostbyname_style,
4971+AC_LANG_SAVE
4972+AC_LANG_CPLUSPLUS
4973+if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
4974+then
4975+ CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-ansi//; s/-pedantic//; s/-Wcheck//'`
4976+fi
4977+AC_TRY_COMPILE(
4978+[#undef inline
4979+#if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT)
4980+#define _REENTRANT
4981+#endif
4982+#include <pthread.h>
4983+#include <sys/types.h>
4984+#include <sys/socket.h>
4985+#include <netinet/in.h>
4986+#include <arpa/inet.h>
4987+#include <netdb.h>],
4988+[int skr;
4989+
4990+ skr = gethostbyname_r((const char *) 0,
4991+ (struct hostent*) 0, (char*) 0, 0, (struct hostent **) 0, &skr);],
4992+mysql_cv_gethostbyname_style=glibc2, mysql_cv_gethostbyname_style=other))
4993+AC_LANG_RESTORE
4994+CXXFLAGS="$ac_save_CXXFLAGS"
4995+if test "$mysql_cv_gethostbyname_style" = "glibc2"
4996+then
4997+ AC_DEFINE([HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE], [1],
4998+ [Solaris define gethostbyname_r with 5 arguments. glibc2 defines this with 6 arguments])
4999+fi
5000+
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches