From 3d30668eccc1395ba60deeab0247d0f22b9a1d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sun, 2 Mar 2014 01:37:11 +0200 Subject: [PATCH] Imported upstream 5.5.36 --- CMakeLists.txt | 10 +- Docs/INFO_SRC | 10 +- VERSION | 2 +- client/mysql_plugin.c | 4 +- client/mysqlcheck.c | 2 +- client/mysqldump.c | 22 +- client/mysqltest.cc | 18 +- cmake/CPackRPM.cmake | 16 + cmake/cpack_rpm.cmake | 132 +- cmake/install_macros.cmake | 1 + cmake/zlib.cmake | 3 +- config.h.cmake | 4 +- extra/yassl/CMakeLists.txt | 2 +- extra/yassl/include/yassl_error.hpp | 2 +- extra/yassl/include/yassl_types.hpp | 2 +- extra/yassl/src/handshake.cpp | 2 +- extra/yassl/src/yassl_error.cpp | 2 +- extra/yassl/src/yassl_imp.cpp | 2 +- extra/yassl/taocrypt/CMakeLists.txt | 2 +- include/my_getopt.h | 2 +- include/my_global.h | 7 - include/my_net.h | 2 +- include/my_pthread.h | 6 +- include/my_valgrind.h | 6 +- include/myisam.h | 2 +- include/mysql/plugin.h | 4 +- include/mysql/plugin_audit.h | 2 +- include/mysql/psi/mysql_thread.h | 4 +- include/welcome_copyright_notice.h | 4 +- libmysql/CMakeLists.txt | 147 +- libmysql/conf_to_src.c | 2 +- libmysql/libmysql.c | 4 +- libmysql/libmysql.ver.in | 1 - libmysql/libmysql_rpm_version.in | 62 - libmysql/libmysql_versions.ld.in | 45 + libmysql/rpm_support.cc | 41 - libmysqld/lib_sql.cc | 2 +- mysql-test/CMakeLists.txt | 2 +- mysql-test/collections/default.weekly | 3 + mysql-test/extra/rpl_tests/rpl_ddl.test | 1 + mysql-test/include/ctype_filesort2.inc | 9 + mysql-test/include/mtr_check.sql | 15 +- mysql-test/lib/My/SafeProcess/safe_process.cc | 2 +- mysql-test/lib/My/SysInfo.pm | 3 +- mysql-test/mysql-test-run.pl | 1 + mysql-test/r/comments.result | 5 +- mysql-test/r/ctype_utf16.result | 15 + mysql-test/r/ctype_utf32.result | 15 + mysql-test/r/ctype_utf8mb4.result | 15 + mysql-test/r/derived_view.result | 2 +- mysql-test/r/distinct.result | 40 + mysql-test/r/error_simulation.result | 2 +- mysql-test/r/events_trans.result | 1 + mysql-test/r/func_compress.result | 1 - mysql-test/r/func_group.result | 11 +- mysql-test/r/func_misc.result | 10 +- mysql-test/r/func_regexp.result | 2 +- mysql-test/r/func_str.result | 1 - mysql-test/r/gis-precise.result | 3 + mysql-test/r/gis.result | 21 + mysql-test/r/join_outer.result | 2 +- mysql-test/r/join_outer_jcl6.result | 2 +- mysql-test/r/mysqld--help.result | 2 +- mysql-test/r/mysqldump.result | 14 + mysql-test/r/partition.result | 67 + mysql-test/r/partition_order.result | 2 +- mysql-test/r/ps.result | 32 + mysql-test/r/rpl_mysqldump_slave.result | 7 + mysql-test/r/select.result | 6 +- mysql-test/r/select_jcl6.result | 6 +- mysql-test/r/select_pkeycache.result | 6 +- mysql-test/r/subselect.result | 4 +- mysql-test/r/subselect4.result | 27 + mysql-test/r/subselect_extra.result | 4 +- mysql-test/r/subselect_no_mat.result | 4 +- mysql-test/r/subselect_no_opts.result | 4 +- mysql-test/r/subselect_no_scache.result | 4 +- mysql-test/r/subselect_no_semijoin.result | 4 +- mysql-test/r/subselect_sj.result | 16 + mysql-test/r/subselect_sj2.result | 17 + mysql-test/r/subselect_sj2_jcl6.result | 17 + mysql-test/r/subselect_sj2_mat.result | 17 + mysql-test/r/subselect_sj_jcl6.result | 16 + mysql-test/r/type_datetime.result | 4 +- mysql-test/r/udf_debug_sync.result | 20 + mysql-test/r/union_crash-714.result | 5 + mysql-test/r/view.result | 2 +- mysql-test/r/xml.result | 3 + mysql-test/std_data/cacert.pem | 31 +- mysql-test/std_data/client-cert.pem | 95 +- mysql-test/std_data/client-key.pem | 26 +- mysql-test/std_data/server-cert.pem | 90 +- mysql-test/std_data/server-key.pem | 20 +- mysql-test/std_data/server8k-cert.pem | 116 +- mysql-test/std_data/server8k-key.pem | 110 +- mysql-test/suite.pm | 12 +- .../federated/federated_maybe_16324629.result | 16 + .../federated/federated_maybe_16324629.test | 23 + .../r/innodb-change-buffer-recovery.result | 39 + mysql-test/suite/innodb/r/row_lock.result | 16 + .../innodb-change-buffer-recovery-master.opt | 1 + .../t/innodb-change-buffer-recovery.test | 70 + mysql-test/suite/innodb/t/row_lock.test | 48 + .../r/innodb-create-options.result | 0 .../r/innodb-zip.result | 0 .../r/innodb_bug36169.result | 0 .../r/innodb_bug36172.result | 0 .../r/innodb_bug52745.result | 0 .../r/innodb_bug53591.result | 0 .../r/innodb_bug56680.result | 0 .../r/innodb_cmp_drop_table.result | 0 .../r/innodb_index_large_prefix.result | 0 .../r/innodb_prefix_index_liftedlimit.result | 0 .../t/innodb-create-options.test | 0 .../{innodb => innodb_zip}/t/innodb-zip.test | 0 .../t/innodb_bug36169.test | 0 .../t/innodb_bug36172.test | 0 .../t/innodb_bug52745.test | 0 .../t/innodb_bug53591.test | 0 .../t/innodb_bug56680.test | 0 .../t/innodb_cmp_drop_table-master.opt | 0 .../t/innodb_cmp_drop_table.test | 0 .../t/innodb_index_large_prefix.test | 0 .../t/innodb_prefix_index_liftedlimit.test | 0 .../suite/perfschema/r/all_instances.result | 1 + mysql-test/suite/plugins/t/unix_socket.test | 13 + mysql-test/suite/rpl/r/rpl_ddl.result | 1 + mysql-test/suite/sphinx/sphinx.result | 2 +- mysql-test/suite/sphinx/suite.pm | 1 + mysql-test/suite/sphinx/union-5539.result | 10 + mysql-test/suite/sphinx/union-5539.test | 16 + .../r/progress_report_time_basic.result | 12 +- mysql-test/suite/vcol/r/vcol_misc.result | 5 + mysql-test/suite/vcol/t/vcol_misc.test | 7 + mysql-test/t/comments.test | 3 +- mysql-test/t/distinct.test | 38 + mysql-test/t/error_simulation.test | 2 +- mysql-test/t/events_trans.test | 1 + mysql-test/t/func_group.test | 12 +- mysql-test/t/func_misc.test | 11 +- mysql-test/t/gis-precise.test | 3 + mysql-test/t/gis.test | 18 + mysql-test/t/mysqldump.test | 15 + mysql-test/t/partition.test | 332 ++++ mysql-test/t/ps.test | 38 + mysql-test/t/rpl_mysqldump_slave.test | 9 + mysql-test/t/subselect4.test | 35 + mysql-test/t/subselect_sj.test | 18 + mysql-test/t/subselect_sj2.test | 18 + mysql-test/t/udf_debug_sync.test | 40 + mysql-test/t/union_crash-714.test | 9 + mysql-test/t/xml.test | 6 + mysys/file_logger.c | 1 + mysys/md5.c | 2 +- mysys/mf_keycache.c | 3 +- mysys/mf_qsort.c | 3 +- mysys/mf_radix.c | 3 +- mysys/mf_same.c | 3 +- mysys/mf_soundex.c | 3 +- mysys/mf_tempdir.c | 4 +- mysys/mf_tempfile.c | 4 +- mysys/mf_wcomp.c | 3 +- mysys/mulalloc.c | 3 +- mysys/my_access.c | 4 +- mysys/my_aes.c | 3 +- mysys/my_conio.c | 3 +- mysys/my_crc32.c | 3 +- mysys/my_div.c | 3 +- mysys/my_error.c | 2 +- mysys/my_fopen.c | 4 +- mysys/my_getpagesize.c | 3 +- mysys/my_libwrap.c | 2 +- mysys/my_lockmem.c | 2 +- mysys/my_malloc.c | 4 +- mysys/my_memmem.c | 3 +- mysys/my_mkdir.c | 3 +- mysys/my_once.c | 2 +- mysys/my_symlink2.c | 3 +- mysys/my_wincond.c | 4 +- mysys/my_winthread.c | 2 +- mysys/test_dir.c | 3 +- mysys/test_xml.c | 3 +- mysys/thr_alarm.c | 5 +- packaging/WiX/CPackWixConfig.cmake | 2 +- packaging/WiX/custom_ui.wxs | 4 +- packaging/WiX/mysql_server.wxs.in | 2 +- packaging/rpm-oel/CMakeLists.txt | 36 + packaging/rpm-oel/filter-provides.sh | 6 + packaging/rpm-oel/filter-requires.sh | 6 + packaging/rpm-oel/my.cnf | 31 + packaging/rpm-oel/my_config.h | 30 + packaging/rpm-oel/mysql-embedded-check.c | 26 + packaging/rpm-oel/mysql-systemd-start | 52 + packaging/rpm-oel/mysql.conf | 1 + packaging/rpm-oel/mysql.init | 209 +++ packaging/rpm-oel/mysql.spec.in | 1556 +++++++++++++++++ packaging/rpm-oel/mysql_config.sh | 28 + packaging/rpm-oel/mysqld.service | 48 + plugin/daemon_example/daemon_example.cc | 1 + plugin/win_auth_client/CMakeLists.txt | 2 +- scripts/CMakeLists.txt | 2 +- scripts/comp_sql.c | 2 +- scripts/mysql_config.pl.in | 2 +- scripts/mysql_config.sh | 2 +- scripts/mysql_install_db.pl.in | 9 +- scripts/mysql_install_db.sh | 15 +- scripts/mysql_system_tables.sql | 7 +- scripts/mysql_system_tables_fix.sql | 4 +- scripts/mysqlaccess.sh | 7 +- sql-common/pack.c | 3 +- sql/CMakeLists.txt | 2 +- sql/custom_conf.h | 3 +- sql/event_scheduler.cc | 2 +- sql/event_scheduler.h | 2 +- sql/events.cc | 2 +- sql/events.h | 2 +- sql/field.h | 16 +- sql/filesort.cc | 134 +- sql/ha_ndbcluster_cond.cc | 2 +- sql/ha_ndbcluster_cond.h | 2 +- sql/ha_ndbcluster_tables.h | 3 +- sql/ha_partition.cc | 72 +- sql/hostname.cc | 4 +- sql/item.cc | 46 +- sql/item.h | 7 +- sql/item_cmpfunc.h | 2 +- sql/item_func.h | 4 +- sql/item_geofunc.cc | 6 +- sql/item_strfunc.cc | 28 +- sql/item_subselect.cc | 9 +- sql/item_subselect.h | 1 - sql/item_sum.cc | 71 +- sql/item_sum.h | 43 +- sql/item_xmlfunc.cc | 5 +- sql/key.cc | 2 +- sql/key.h | 2 +- sql/lex_symbol.h | 3 +- sql/log.cc | 4 +- sql/log_event.cc | 20 + sql/log_event.h | 9 +- sql/log_event_old.h | 9 +- sql/mem_root_array.h | 2 +- sql/my_decimal.h | 4 +- sql/mysqld.cc | 6 +- sql/mysqld.h | 2 +- sql/opt_subselect.cc | 9 +- sql/opt_subselect.h | 2 +- sql/partition_element.h | 2 +- sql/partition_info.h | 2 +- sql/rpl_filter.cc | 2 +- sql/rpl_record.cc | 23 +- sql/rpl_record.h | 11 +- sql/rpl_utility.cc | 19 +- sql/scheduler.cc | 1 - sql/set_var.cc | 2 +- sql/set_var.h | 1 + sql/share/charsets/Index.xml | 2 +- sql/share/charsets/armscii8.xml | 3 +- sql/share/charsets/ascii.xml | 2 +- sql/share/charsets/cp1250.xml | 2 +- sql/share/charsets/cp852.xml | 3 +- sql/share/charsets/hebrew.xml | 2 +- sql/share/charsets/latin1.xml | 2 +- sql/share/charsets/latin2.xml | 2 +- sql/share/charsets/latin5.xml | 2 +- sql/signal_handler.cc | 4 +- sql/slave.cc | 4 +- sql/spatial.cc | 3 +- sql/sql_acl.cc | 4 +- sql/sql_admin.h | 2 +- sql/sql_analyse.cc | 2 +- sql/sql_audit.cc | 2 +- sql/sql_audit.h | 2 +- sql/sql_binlog.cc | 2 +- sql/sql_bitmap.h | 2 +- sql/sql_cache.cc | 1 + sql/sql_connect.cc | 4 +- sql/sql_derived.cc | 2 +- sql/sql_help.cc | 3 +- sql/sql_lex.cc | 33 +- sql/sql_lifo_buffer.h | 3 +- sql/sql_manager.cc | 2 +- sql/sql_parse.cc | 7 +- sql/sql_partition_admin.cc | 2 +- sql/sql_plugin.cc | 14 +- sql/sql_repl.cc | 2 +- sql/sql_select.cc | 18 +- sql/sql_select.h | 3 +- sql/sql_show.cc | 4 + sql/sql_string.cc | 3 +- sql/sql_trigger.cc | 2 +- sql/sql_udf.cc | 18 +- sql/sql_union.cc | 3 +- sql/sql_view.cc | 4 +- sql/strfunc.cc | 2 +- sql/sys_vars.cc | 2 +- sql/table.cc | 5 +- sql/table.h | 4 +- sql/transaction.h | 3 +- storage/example/ha_example.cc | 3 +- storage/federated/ha_federated.cc | 6 +- storage/federated/ha_federated.h | 3 +- storage/federatedx/federatedx_io_mysql.cc | 17 +- storage/federatedx/ha_federatedx.cc | 11 +- storage/heap/_check.c | 3 +- storage/heap/_rectest.c | 3 +- storage/heap/hp_delete.c | 2 +- storage/heap/hp_extra.c | 3 +- storage/heap/hp_rfirst.c | 3 +- storage/heap/hp_rlast.c | 3 +- storage/heap/hp_rnext.c | 3 +- storage/heap/hp_rprev.c | 3 +- storage/heap/hp_rrnd.c | 3 +- storage/heap/hp_rsame.c | 3 +- storage/heap/hp_scan.c | 3 +- storage/heap/hp_update.c | 3 +- storage/innobase/handler/ha_innodb.cc | 10 - storage/myisam/ft_stopwords.c | 2 +- storage/myisam/ftbench/Ecompare.pl | 2 +- storage/myisam/ftbench/Ecreate.pl | 2 +- storage/myisam/ftbench/Ereport.pl | 2 +- storage/myisam/ftbench/ft-test-run.sh | 5 +- storage/myisam/mi_check.c | 3 +- storage/myisam/mi_checksum.c | 2 +- storage/myisam/mi_rfirst.c | 3 +- storage/myisam/mi_rlast.c | 3 +- storage/myisam/mi_rrnd.c | 3 +- storage/myisam/mi_rsamepos.c | 3 +- storage/myisam/mi_scan.c | 3 +- storage/myisam/mi_write.c | 3 +- storage/myisam/myisampack.c | 2 +- storage/myisam/rt_index.h | 3 +- storage/myisam/rt_key.c | 3 +- storage/myisam/rt_key.h | 3 +- storage/myisam/rt_mbr.c | 3 +- storage/myisam/rt_mbr.h | 3 +- storage/myisam/sp_defs.h | 3 +- storage/myisammrg/myrg_delete.c | 3 +- storage/myisammrg/myrg_locking.c | 3 +- storage/myisammrg/myrg_panic.c | 3 +- storage/myisammrg/myrg_range.c | 3 +- storage/myisammrg/myrg_rfirst.c | 3 +- storage/myisammrg/myrg_rlast.c | 3 +- storage/myisammrg/myrg_rnext.c | 3 +- storage/myisammrg/myrg_rnext_same.c | 3 +- storage/myisammrg/myrg_rprev.c | 3 +- storage/myisammrg/myrg_rrnd.c | 3 +- storage/myisammrg/myrg_rsame.c | 3 +- storage/myisammrg/myrg_update.c | 3 +- storage/myisammrg/myrg_write.c | 3 +- storage/ndb/config/win-includes | 2 +- storage/ndb/config/win-libraries | 2 +- storage/ndb/config/win-name | 2 +- storage/ndb/config/win-sources | 2 +- .../ndb/include/debugger/DebuggerNames.hpp | 2 +- storage/ndb/include/debugger/EventLogger.hpp | 2 +- storage/ndb/include/debugger/GrepError.hpp | 2 +- .../include/debugger/SignalLoggerManager.hpp | 2 +- storage/ndb/include/editline/editline.h | 2 +- .../include/kernel/AttributeDescriptor.hpp | 2 +- .../ndb/include/kernel/AttributeHeader.hpp | 2 +- storage/ndb/include/kernel/AttributeList.hpp | 2 +- storage/ndb/include/kernel/BlockNumbers.h | 2 +- .../ndb/include/kernel/GlobalSignalNumbers.h | 2 +- storage/ndb/include/kernel/GrepEvent.hpp | 2 +- storage/ndb/include/kernel/Interpreter.hpp | 2 +- storage/ndb/include/kernel/LogLevel.hpp | 2 +- storage/ndb/include/kernel/NodeBitmask.hpp | 2 +- storage/ndb/include/kernel/NodeInfo.hpp | 2 +- storage/ndb/include/kernel/NodeState.hpp | 2 +- storage/ndb/include/kernel/RefConvert.hpp | 2 +- storage/ndb/include/kernel/kernel_types.h | 2 +- storage/ndb/include/kernel/ndb_limits.h | 2 +- .../include/kernel/signaldata/AbortAll.hpp | 2 +- .../ndb/include/kernel/signaldata/AccFrag.hpp | 2 +- .../ndb/include/kernel/signaldata/AccLock.hpp | 3 +- .../ndb/include/kernel/signaldata/AccScan.hpp | 2 +- .../kernel/signaldata/AccSizeAltReq.hpp | 2 +- .../include/kernel/signaldata/AllocNodeId.hpp | 2 +- .../include/kernel/signaldata/AlterIndx.hpp | 2 +- .../include/kernel/signaldata/AlterTab.hpp | 4 +- .../include/kernel/signaldata/AlterTable.hpp | 2 +- .../include/kernel/signaldata/AlterTrig.hpp | 2 +- .../kernel/signaldata/ApiBroadcast.hpp | 2 +- .../kernel/signaldata/ApiRegSignalData.hpp | 2 +- .../include/kernel/signaldata/ApiVersion.hpp | 2 +- .../kernel/signaldata/ArbitSignalData.hpp | 2 +- .../include/kernel/signaldata/AttrInfo.hpp | 2 +- .../kernel/signaldata/BackupContinueB.hpp | 4 +- .../include/kernel/signaldata/BackupImpl.hpp | 2 +- .../kernel/signaldata/BackupSignalData.hpp | 2 +- .../kernel/signaldata/BlockCommitOrd.hpp | 2 +- .../include/kernel/signaldata/BuildIndx.hpp | 2 +- .../kernel/signaldata/CheckNodeGroups.hpp | 2 +- .../kernel/signaldata/CloseComReqConf.hpp | 2 +- .../ndb/include/kernel/signaldata/CmInit.hpp | 2 +- .../kernel/signaldata/CmRegSignalData.hpp | 3 +- .../kernel/signaldata/CmvmiCfgConf.hpp | 2 +- .../kernel/signaldata/CntrMasterConf.hpp | 2 +- .../kernel/signaldata/CntrMasterReq.hpp | 2 +- .../kernel/signaldata/ConfigParamId.hpp | 2 +- .../kernel/signaldata/ContinueFragmented.hpp | 2 +- .../include/kernel/signaldata/CopyActive.hpp | 2 +- .../include/kernel/signaldata/CopyFrag.hpp | 2 +- .../include/kernel/signaldata/CopyGCIReq.hpp | 2 +- .../include/kernel/signaldata/CreateEvnt.hpp | 2 +- .../kernel/signaldata/CreateFilegroup.hpp | 2 +- .../kernel/signaldata/CreateFilegroupImpl.hpp | 2 +- .../include/kernel/signaldata/CreateFrag.hpp | 2 +- .../kernel/signaldata/CreateFragmentation.hpp | 2 +- .../include/kernel/signaldata/CreateIndx.hpp | 2 +- .../include/kernel/signaldata/CreateObj.hpp | 3 +- .../include/kernel/signaldata/CreateTab.hpp | 2 +- .../include/kernel/signaldata/CreateTable.hpp | 2 +- .../include/kernel/signaldata/CreateTrig.hpp | 2 +- .../include/kernel/signaldata/DiAddTab.hpp | 2 +- .../include/kernel/signaldata/DiGetNodes.hpp | 2 +- .../include/kernel/signaldata/DictLock.hpp | 2 +- .../include/kernel/signaldata/DictObjOp.hpp | 2 +- .../kernel/signaldata/DictSchemaInfo.hpp | 2 +- .../kernel/signaldata/DictSizeAltReq.hpp | 2 +- .../include/kernel/signaldata/DictStart.hpp | 2 +- .../include/kernel/signaldata/DictTabInfo.hpp | 2 +- .../include/kernel/signaldata/DihAddFrag.hpp | 2 +- .../kernel/signaldata/DihContinueB.hpp | 2 +- .../kernel/signaldata/DihSizeAltReq.hpp | 2 +- .../include/kernel/signaldata/DihStartTab.hpp | 2 +- .../kernel/signaldata/DihSwitchReplica.hpp | 2 +- .../kernel/signaldata/DisconnectRep.hpp | 2 +- .../kernel/signaldata/DropFilegroup.hpp | 2 +- .../kernel/signaldata/DropFilegroupImpl.hpp | 2 +- .../include/kernel/signaldata/DropIndx.hpp | 2 +- .../ndb/include/kernel/signaldata/DropObj.hpp | 2 +- .../ndb/include/kernel/signaldata/DropTab.hpp | 2 +- .../include/kernel/signaldata/DropTabFile.hpp | 2 +- .../include/kernel/signaldata/DropTable.hpp | 2 +- .../include/kernel/signaldata/DropTrig.hpp | 2 +- .../kernel/signaldata/DumpStateOrd.hpp | 2 +- .../include/kernel/signaldata/EmptyLcp.hpp | 2 +- .../ndb/include/kernel/signaldata/EndTo.hpp | 2 +- .../include/kernel/signaldata/EventReport.hpp | 2 +- .../kernel/signaldata/EventSubscribeReq.hpp | 2 +- .../include/kernel/signaldata/ExecFragReq.hpp | 2 +- .../ndb/include/kernel/signaldata/Extent.hpp | 2 +- .../ndb/include/kernel/signaldata/FailRep.hpp | 2 +- .../include/kernel/signaldata/FireTrigOrd.hpp | 2 +- .../include/kernel/signaldata/FsAppendReq.hpp | 2 +- .../include/kernel/signaldata/FsCloseReq.hpp | 2 +- .../ndb/include/kernel/signaldata/FsConf.hpp | 2 +- .../include/kernel/signaldata/FsOpenReq.hpp | 2 +- .../kernel/signaldata/FsReadWriteReq.hpp | 2 +- .../ndb/include/kernel/signaldata/FsRef.hpp | 2 +- .../include/kernel/signaldata/FsRemoveReq.hpp | 2 +- .../ndb/include/kernel/signaldata/GCPSave.hpp | 2 +- .../include/kernel/signaldata/GetTabInfo.hpp | 2 +- .../include/kernel/signaldata/GetTableId.hpp | 2 +- .../include/kernel/signaldata/GrepImpl.hpp | 2 +- .../include/kernel/signaldata/HotSpareRep.hpp | 2 +- .../kernel/signaldata/IndxAttrInfo.hpp | 2 +- .../include/kernel/signaldata/IndxKeyInfo.hpp | 2 +- .../signaldata/InvalidateNodeLCPConf.hpp | 2 +- .../signaldata/InvalidateNodeLCPReq.hpp | 2 +- .../ndb/include/kernel/signaldata/KeyInfo.hpp | 2 +- storage/ndb/include/kernel/signaldata/LCP.hpp | 2 +- .../kernel/signaldata/LgmanContinueB.hpp | 2 +- .../include/kernel/signaldata/ListTables.hpp | 2 +- .../ndb/include/kernel/signaldata/LqhFrag.hpp | 2 +- .../ndb/include/kernel/signaldata/LqhKey.hpp | 2 +- .../kernel/signaldata/LqhSizeAltReq.hpp | 2 +- .../kernel/signaldata/LqhTransConf.hpp | 2 +- .../kernel/signaldata/ManagementServer.hpp | 2 +- .../include/kernel/signaldata/MasterGCP.hpp | 2 +- .../include/kernel/signaldata/MasterLCP.hpp | 2 +- .../kernel/signaldata/NFCompleteRep.hpp | 2 +- .../include/kernel/signaldata/NdbSttor.hpp | 2 +- .../kernel/signaldata/NdbfsContinueB.hpp | 2 +- .../include/kernel/signaldata/NextScan.hpp | 2 +- .../include/kernel/signaldata/NodeFailRep.hpp | 2 +- .../kernel/signaldata/NodeStateSignalData.hpp | 2 +- .../kernel/signaldata/PackedSignal.hpp | 2 +- .../kernel/signaldata/PgmanContinueB.hpp | 2 +- .../include/kernel/signaldata/PrepDropTab.hpp | 2 +- .../kernel/signaldata/PrepFailReqRef.hpp | 2 +- .../kernel/signaldata/ReadNodesConf.hpp | 2 +- .../include/kernel/signaldata/RelTabMem.hpp | 2 +- .../ndb/include/kernel/signaldata/RepImpl.hpp | 2 +- .../kernel/signaldata/RestoreContinueB.hpp | 2 +- .../include/kernel/signaldata/RestoreImpl.hpp | 2 +- .../include/kernel/signaldata/ResumeReq.hpp | 2 +- .../include/kernel/signaldata/RouteOrd.hpp | 2 +- .../include/kernel/signaldata/ScanFrag.hpp | 2 +- .../ndb/include/kernel/signaldata/ScanTab.hpp | 2 +- .../kernel/signaldata/SetLogLevelOrd.hpp | 2 +- .../include/kernel/signaldata/SetVarReq.hpp | 2 +- .../include/kernel/signaldata/SignalData.hpp | 2 +- .../kernel/signaldata/SignalDataPrint.hpp | 2 +- .../kernel/signaldata/SignalDroppedRep.hpp | 2 +- .../kernel/signaldata/SrFragidConf.hpp | 2 +- .../kernel/signaldata/StartFragReq.hpp | 2 +- .../include/kernel/signaldata/StartInfo.hpp | 2 +- .../ndb/include/kernel/signaldata/StartMe.hpp | 2 +- .../include/kernel/signaldata/StartOrd.hpp | 2 +- .../include/kernel/signaldata/StartPerm.hpp | 2 +- .../include/kernel/signaldata/StartRec.hpp | 2 +- .../ndb/include/kernel/signaldata/StartTo.hpp | 2 +- .../ndb/include/kernel/signaldata/StopMe.hpp | 2 +- .../include/kernel/signaldata/StopPerm.hpp | 2 +- .../ndb/include/kernel/signaldata/StopReq.hpp | 2 +- .../include/kernel/signaldata/SumaImpl.hpp | 2 +- .../include/kernel/signaldata/SystemError.hpp | 2 +- .../include/kernel/signaldata/TamperOrd.hpp | 2 +- .../include/kernel/signaldata/TcCommit.hpp | 2 +- .../include/kernel/signaldata/TcContinueB.hpp | 2 +- .../ndb/include/kernel/signaldata/TcHbRep.hpp | 2 +- .../ndb/include/kernel/signaldata/TcIndx.hpp | 2 +- .../include/kernel/signaldata/TcKeyConf.hpp | 2 +- .../kernel/signaldata/TcKeyFailConf.hpp | 2 +- .../include/kernel/signaldata/TcKeyRef.hpp | 2 +- .../include/kernel/signaldata/TcKeyReq.hpp | 2 +- .../kernel/signaldata/TcRollbackRep.hpp | 2 +- .../kernel/signaldata/TcSizeAltReq.hpp | 2 +- .../ndb/include/kernel/signaldata/TestOrd.hpp | 2 +- .../include/kernel/signaldata/TransIdAI.hpp | 2 +- .../kernel/signaldata/TrigAttrInfo.hpp | 2 +- .../kernel/signaldata/TsmanContinueB.hpp | 2 +- .../include/kernel/signaldata/TupCommit.hpp | 2 +- .../ndb/include/kernel/signaldata/TupFrag.hpp | 2 +- .../ndb/include/kernel/signaldata/TupKey.hpp | 2 +- .../kernel/signaldata/TupSizeAltReq.hpp | 2 +- .../include/kernel/signaldata/TuxBound.hpp | 2 +- .../kernel/signaldata/TuxContinueB.hpp | 2 +- .../include/kernel/signaldata/TuxMaint.hpp | 2 +- .../kernel/signaldata/TuxSizeAltReq.hpp | 2 +- .../include/kernel/signaldata/UpdateTo.hpp | 2 +- .../include/kernel/signaldata/UtilDelete.hpp | 2 +- .../include/kernel/signaldata/UtilExecute.hpp | 2 +- .../include/kernel/signaldata/UtilLock.hpp | 2 +- .../include/kernel/signaldata/UtilPrepare.hpp | 2 +- .../include/kernel/signaldata/UtilRelease.hpp | 2 +- .../kernel/signaldata/UtilSequence.hpp | 2 +- .../ndb/include/kernel/signaldata/WaitGCP.hpp | 2 +- .../ndb/include/kernel/trigger_definitions.h | 2 +- .../ndb/include/logger/ConsoleLogHandler.hpp | 2 +- storage/ndb/include/logger/FileLogHandler.hpp | 2 +- storage/ndb/include/logger/LogHandler.hpp | 2 +- storage/ndb/include/logger/Logger.hpp | 2 +- storage/ndb/include/logger/SysLogHandler.hpp | 2 +- storage/ndb/include/mgmapi/mgmapi.h | 2 +- storage/ndb/include/mgmapi/mgmapi_debug.h | 2 +- storage/ndb/include/mgmapi/mgmapi_error.h | 2 +- storage/ndb/include/mgmapi/ndb_logevent.h | 2 +- storage/ndb/include/mgmapi/ndbd_exit_codes.h | 2 +- .../ndb/include/mgmcommon/ConfigRetriever.hpp | 2 +- storage/ndb/include/mgmcommon/IPCConfig.hpp | 2 +- .../include/mgmcommon/MgmtErrorReporter.hpp | 2 +- storage/ndb/include/ndb_constants.h | 2 +- storage/ndb/include/ndb_global.h.in | 2 +- storage/ndb/include/ndb_init.h | 2 +- storage/ndb/include/ndb_types.h.in | 2 +- storage/ndb/include/ndb_version.h.in | 2 +- storage/ndb/include/ndbapi/Ndb.hpp | 2 +- storage/ndb/include/ndbapi/NdbApi.hpp | 2 +- storage/ndb/include/ndbapi/NdbBlob.hpp | 2 +- storage/ndb/include/ndbapi/NdbDictionary.hpp | 2 +- storage/ndb/include/ndbapi/NdbError.hpp | 2 +- .../ndb/include/ndbapi/NdbEventOperation.hpp | 2 +- .../ndb/include/ndbapi/NdbIndexOperation.hpp | 2 +- .../include/ndbapi/NdbIndexScanOperation.hpp | 2 +- storage/ndb/include/ndbapi/NdbIndexStat.hpp | 2 +- storage/ndb/include/ndbapi/NdbOperation.hpp | 2 +- storage/ndb/include/ndbapi/NdbPool.hpp | 2 +- storage/ndb/include/ndbapi/NdbRecAttr.hpp | 2 +- storage/ndb/include/ndbapi/NdbReceiver.hpp | 2 +- storage/ndb/include/ndbapi/NdbScanFilter.hpp | 2 +- .../ndb/include/ndbapi/NdbScanOperation.hpp | 2 +- storage/ndb/include/ndbapi/NdbTransaction.hpp | 2 +- .../include/ndbapi/ndb_cluster_connection.hpp | 2 +- storage/ndb/include/ndbapi/ndb_opt_defaults.h | 2 +- storage/ndb/include/ndbapi/ndbapi_limits.h | 2 +- storage/ndb/include/ndbapi/ndberror.h | 2 +- storage/ndb/include/newtonapi/dba.h | 2 +- .../ndb/include/newtonapi/defs/pcn_types.h | 2 +- storage/ndb/include/portlib/NdbCondition.h | 2 +- storage/ndb/include/portlib/NdbConfig.h | 2 +- storage/ndb/include/portlib/NdbDaemon.h | 2 +- storage/ndb/include/portlib/NdbEnv.h | 2 +- storage/ndb/include/portlib/NdbHost.h | 2 +- storage/ndb/include/portlib/NdbMain.h | 2 +- storage/ndb/include/portlib/NdbMem.h | 2 +- storage/ndb/include/portlib/NdbMutex.h | 2 +- storage/ndb/include/portlib/NdbSleep.h | 2 +- storage/ndb/include/portlib/NdbTCP.h | 2 +- storage/ndb/include/portlib/NdbThread.h | 2 +- storage/ndb/include/portlib/NdbTick.h | 2 +- storage/ndb/include/portlib/PortDefs.h | 2 +- storage/ndb/include/portlib/prefetch.h | 2 +- .../transporter/TransporterCallback.hpp | 2 +- .../transporter/TransporterDefinitions.hpp | 2 +- .../transporter/TransporterRegistry.hpp | 2 +- storage/ndb/include/util/BaseString.hpp | 2 +- storage/ndb/include/util/Bitmask.hpp | 2 +- storage/ndb/include/util/File.hpp | 2 +- storage/ndb/include/util/InputStream.hpp | 2 +- storage/ndb/include/util/NdbAutoPtr.hpp | 2 +- storage/ndb/include/util/NdbOut.hpp | 2 +- storage/ndb/include/util/NdbSqlUtil.hpp | 2 +- storage/ndb/include/util/OutputStream.hpp | 2 +- storage/ndb/include/util/Parser.hpp | 2 +- storage/ndb/include/util/Properties.hpp | 2 +- storage/ndb/include/util/SimpleProperties.hpp | 2 +- .../ndb/include/util/SocketAuthenticator.hpp | 2 +- storage/ndb/include/util/SocketClient.hpp | 2 +- storage/ndb/include/util/SocketServer.hpp | 2 +- storage/ndb/include/util/UtilBuffer.hpp | 2 +- storage/ndb/include/util/Vector.hpp | 2 +- .../ndb/include/util/basestring_vsnprintf.h | 2 +- storage/ndb/include/util/md5_hash.hpp | 2 +- storage/ndb/include/util/ndb_opts.h | 2 +- storage/ndb/include/util/ndb_rand.h | 2 +- storage/ndb/include/util/random.h | 2 +- storage/ndb/include/util/socket_io.h | 2 +- storage/ndb/include/util/uucode.h | 2 +- storage/ndb/include/util/version.h | 2 +- .../ndbapi-examples/mgmapi_logevent/main.cpp | 2 +- .../ndbapi-examples/mgmapi_logevent2/main.cpp | 2 +- .../ndbapi_async/ndbapi_async.cpp | 2 +- .../ndbapi_async1/ndbapi_async1.cpp | 2 +- .../ndbapi_event/ndbapi_event.cpp | 2 +- .../ndbapi_retries/ndbapi_retries.cpp | 2 +- .../ndbapi_scan/ndbapi_scan.cpp | 2 +- .../ndbapi_simple/ndbapi_simple.cpp | 2 +- .../ndbapi_simple_dual/main.cpp | 2 +- .../ndbapi_simple_index/main.cpp | 2 +- .../ndb/src/common/debugger/BlockNames.cpp | 2 +- .../ndb/src/common/debugger/DebuggerNames.cpp | 2 +- .../ndb/src/common/debugger/EventLogger.cpp | 2 +- storage/ndb/src/common/debugger/GrepError.cpp | 2 +- .../common/debugger/SignalLoggerManager.cpp | 2 +- .../common/debugger/signaldata/AccLock.cpp | 2 +- .../common/debugger/signaldata/AlterIndx.cpp | 2 +- .../common/debugger/signaldata/AlterTab.cpp | 2 +- .../common/debugger/signaldata/AlterTable.cpp | 2 +- .../common/debugger/signaldata/AlterTrig.cpp | 2 +- .../common/debugger/signaldata/BackupImpl.cpp | 2 +- .../debugger/signaldata/BackupSignalData.cpp | 2 +- .../debugger/signaldata/CloseComReqConf.cpp | 2 +- .../common/debugger/signaldata/ContinueB.cpp | 2 +- .../common/debugger/signaldata/CopyGCI.cpp | 2 +- .../common/debugger/signaldata/CreateEvnt.cpp | 2 +- .../signaldata/CreateFragmentation.cpp | 2 +- .../common/debugger/signaldata/CreateIndx.cpp | 2 +- .../common/debugger/signaldata/CreateTrig.cpp | 2 +- .../debugger/signaldata/DictTabInfo.cpp | 2 +- .../debugger/signaldata/DihContinueB.cpp | 2 +- .../signaldata/DihSwitchReplicaReq.cpp | 2 +- .../debugger/signaldata/DisconnectRep.cpp | 2 +- .../common/debugger/signaldata/DropIndx.cpp | 2 +- .../common/debugger/signaldata/DropTab.cpp | 2 +- .../common/debugger/signaldata/DropTrig.cpp | 2 +- .../common/debugger/signaldata/FailRep.cpp | 2 +- .../debugger/signaldata/FireTrigOrd.cpp | 2 +- .../debugger/signaldata/FsAppendReq.cpp | 2 +- .../common/debugger/signaldata/FsCloseReq.cpp | 2 +- .../src/common/debugger/signaldata/FsConf.cpp | 2 +- .../common/debugger/signaldata/FsOpenReq.cpp | 2 +- .../debugger/signaldata/FsReadWriteReq.cpp | 2 +- .../src/common/debugger/signaldata/FsRef.cpp | 2 +- .../common/debugger/signaldata/GCPSave.cpp | 2 +- .../debugger/signaldata/IndxAttrInfo.cpp | 2 +- .../debugger/signaldata/IndxKeyInfo.cpp | 2 +- .../src/common/debugger/signaldata/LCP.cpp | 2 +- .../common/debugger/signaldata/LqhFrag.cpp | 2 +- .../src/common/debugger/signaldata/LqhKey.cpp | 2 +- .../common/debugger/signaldata/LqhTrans.cpp | 2 +- .../common/debugger/signaldata/MasterLCP.cpp | 2 +- .../debugger/signaldata/NFCompleteRep.cpp | 2 +- .../common/debugger/signaldata/NdbSttor.cpp | 2 +- .../debugger/signaldata/NdbfsContinueB.cpp | 2 +- .../debugger/signaldata/PackedSignal.cpp | 2 +- .../debugger/signaldata/PrepDropTab.cpp | 2 +- .../debugger/signaldata/PrepFailReqRef.cpp | 2 +- .../common/debugger/signaldata/ScanFrag.cpp | 2 +- .../common/debugger/signaldata/ScanTab.cpp | 2 +- .../debugger/signaldata/SignalDataPrint.cpp | 2 +- .../debugger/signaldata/SignalDroppedRep.cpp | 2 +- .../debugger/signaldata/SignalNames.cpp | 2 +- .../common/debugger/signaldata/StartRec.cpp | 2 +- .../common/debugger/signaldata/SumaImpl.cpp | 2 +- .../debugger/signaldata/SystemError.cpp | 2 +- .../src/common/debugger/signaldata/TcIndx.cpp | 2 +- .../common/debugger/signaldata/TcKeyConf.cpp | 2 +- .../common/debugger/signaldata/TcKeyRef.cpp | 2 +- .../common/debugger/signaldata/TcKeyReq.cpp | 2 +- .../debugger/signaldata/TcRollbackRep.cpp | 2 +- .../debugger/signaldata/TrigAttrInfo.cpp | 2 +- .../common/debugger/signaldata/TupCommit.cpp | 2 +- .../src/common/debugger/signaldata/TupKey.cpp | 2 +- .../common/debugger/signaldata/TuxMaint.cpp | 2 +- .../common/debugger/signaldata/UtilDelete.cpp | 2 +- .../debugger/signaldata/UtilExecute.cpp | 2 +- .../common/debugger/signaldata/UtilLock.cpp | 2 +- .../debugger/signaldata/UtilPrepare.cpp | 2 +- .../debugger/signaldata/UtilSequence.cpp | 2 +- .../src/common/logger/ConsoleLogHandler.cpp | 2 +- .../ndb/src/common/logger/FileLogHandler.cpp | 2 +- storage/ndb/src/common/logger/LogHandler.cpp | 2 +- .../ndb/src/common/logger/LogHandlerList.cpp | 2 +- .../ndb/src/common/logger/LogHandlerList.hpp | 2 +- storage/ndb/src/common/logger/Logger.cpp | 2 +- .../ndb/src/common/logger/SysLogHandler.cpp | 2 +- .../listtest/LogHandlerListUnitTest.cpp | 2 +- .../listtest/LogHandlerListUnitTest.hpp | 2 +- .../logger/loggertest/LoggerUnitTest.cpp | 2 +- .../logger/loggertest/LoggerUnitTest.hpp | 2 +- .../src/common/mgmcommon/ConfigRetriever.cpp | 2 +- .../ndb/src/common/mgmcommon/IPCConfig.cpp | 2 +- .../mgmcommon/printConfig/printConfig.cpp | 2 +- storage/ndb/src/common/portlib/NdbCondition.c | 2 +- storage/ndb/src/common/portlib/NdbConfig.c | 2 +- storage/ndb/src/common/portlib/NdbDaemon.c | 2 +- storage/ndb/src/common/portlib/NdbEnv.c | 2 +- storage/ndb/src/common/portlib/NdbHost.c | 2 +- storage/ndb/src/common/portlib/NdbMem.c | 2 +- storage/ndb/src/common/portlib/NdbMutex.c | 2 +- .../ndb/src/common/portlib/NdbPortLibTest.cpp | 2 +- storage/ndb/src/common/portlib/NdbSleep.c | 2 +- storage/ndb/src/common/portlib/NdbTCP.cpp | 2 +- storage/ndb/src/common/portlib/NdbThread.c | 2 +- storage/ndb/src/common/portlib/NdbTick.c | 2 +- storage/ndb/src/common/portlib/memtest.c | 2 +- storage/ndb/src/common/portlib/mmstest.cpp | 2 +- storage/ndb/src/common/portlib/munmaptest.cpp | 2 +- .../src/common/portlib/win32/NdbCondition.c | 2 +- .../ndb/src/common/portlib/win32/NdbDaemon.c | 2 +- storage/ndb/src/common/portlib/win32/NdbEnv.c | 2 +- .../ndb/src/common/portlib/win32/NdbHost.c | 2 +- storage/ndb/src/common/portlib/win32/NdbMem.c | 2 +- .../ndb/src/common/portlib/win32/NdbMutex.c | 2 +- .../ndb/src/common/portlib/win32/NdbSleep.c | 2 +- storage/ndb/src/common/portlib/win32/NdbTCP.c | 2 +- .../ndb/src/common/portlib/win32/NdbThread.c | 2 +- .../ndb/src/common/portlib/win32/NdbTick.c | 2 +- storage/ndb/src/common/transporter/Packer.cpp | 2 +- storage/ndb/src/common/transporter/Packer.hpp | 2 +- .../common/transporter/SCI_Transporter.cpp | 2 +- .../common/transporter/SCI_Transporter.hpp | 2 +- .../ndb/src/common/transporter/SHM_Buffer.hpp | 2 +- .../common/transporter/SHM_Transporter.cpp | 2 +- .../common/transporter/SHM_Transporter.hpp | 2 +- .../transporter/SHM_Transporter.unix.cpp | 2 +- .../transporter/SHM_Transporter.win32.cpp | 2 +- .../ndb/src/common/transporter/SendBuffer.cpp | 2 +- .../ndb/src/common/transporter/SendBuffer.hpp | 2 +- .../common/transporter/TCP_Transporter.cpp | 2 +- .../common/transporter/TCP_Transporter.hpp | 2 +- .../src/common/transporter/Transporter.cpp | 2 +- .../src/common/transporter/Transporter.hpp | 2 +- .../TransporterInternalDefinitions.hpp | 2 +- .../transporter/TransporterRegistry.cpp | 2 +- .../basictest/basicTransporterTest.cpp | 2 +- storage/ndb/src/common/transporter/buddy.cpp | 2 +- storage/ndb/src/common/transporter/buddy.hpp | 2 +- .../transporter/failoverSCI/failoverSCI.cpp | 2 +- .../perftest/perfTransporterTest.cpp | 2 +- .../transporter/priotest/prioSCI/prioSCI.cpp | 2 +- .../transporter/priotest/prioSHM/prioSHM.cpp | 2 +- .../transporter/priotest/prioTCP/prioTCP.cpp | 2 +- .../priotest/prioTransporterTest.cpp | 2 +- .../priotest/prioTransporterTest.hpp | 2 +- storage/ndb/src/common/util/BaseString.cpp | 2 +- storage/ndb/src/common/util/File.cpp | 2 +- storage/ndb/src/common/util/InputStream.cpp | 2 +- storage/ndb/src/common/util/NdbOut.cpp | 2 +- storage/ndb/src/common/util/NdbSqlUtil.cpp | 2 +- storage/ndb/src/common/util/OutputStream.cpp | 2 +- storage/ndb/src/common/util/Parser.cpp | 2 +- storage/ndb/src/common/util/Properties.cpp | 2 +- .../ndb/src/common/util/SimpleProperties.cpp | 2 +- .../src/common/util/SocketAuthenticator.cpp | 2 +- storage/ndb/src/common/util/SocketClient.cpp | 2 +- storage/ndb/src/common/util/SocketServer.cpp | 2 +- .../src/common/util/basestring_vsnprintf.c | 2 +- .../src/common/util/filetest/FileUnitTest.cpp | 2 +- .../src/common/util/filetest/FileUnitTest.hpp | 2 +- storage/ndb/src/common/util/md5_hash.cpp | 2 +- storage/ndb/src/common/util/ndb_init.c | 2 +- storage/ndb/src/common/util/ndb_rand.c | 2 +- storage/ndb/src/common/util/random.c | 2 +- storage/ndb/src/common/util/socket_io.cpp | 2 +- storage/ndb/src/common/util/strdup.c | 2 +- .../util/testProperties/testProperties.cpp | 2 +- .../util/testSimpleProperties/sp_test.cpp | 2 +- storage/ndb/src/common/util/uucode.c | 2 +- storage/ndb/src/common/util/version.c | 2 +- storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp | 2 +- storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h | 2 +- .../ndb/src/cw/cpcc-win32/C++/NdbControls.cpp | 2 +- storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp | 2 +- storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h | 2 +- .../ndb/src/cw/cpcc-win32/C++/TreeView.cpp | 2 +- storage/ndb/src/cw/cpcc-win32/C++/TreeView.h | 2 +- storage/ndb/src/cw/cpcc-win32/C++/resource.h | 2 +- .../ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs | 2 +- .../ndb/src/cw/cpcc-win32/csharp/Computer.cs | 2 +- .../cw/cpcc-win32/csharp/ComputerAddDialog.cs | 2 +- .../cpcc-win32/csharp/ComputerRemoveDialog.cs | 2 +- .../ndb/src/cw/cpcc-win32/csharp/Database.cs | 2 +- .../src/cw/cpcc-win32/csharp/PanelWizard.cs | 2 +- .../ndb/src/cw/cpcc-win32/csharp/Process.cs | 2 +- .../cpcc-win32/csharp/ProcessDefineDialog.cs | 2 +- .../cpcc-win32/csharp/fileaccess/FileMgmt.cs | 2 +- .../csharp/simpleparser/SimpleCPCParser.cs | 2 +- .../csharp/socketcomm/SocketComm.cs | 2 +- .../csharp/socketcomm/myTcpClient.cs | 2 +- .../cw/cpcc-win32/csharp/startDatabaseDlg.cs | 2 +- .../csharp/telnetclient/telnetClient.cs | 2 +- storage/ndb/src/cw/cpcd/APIService.cpp | 2 +- storage/ndb/src/cw/cpcd/APIService.hpp | 2 +- storage/ndb/src/cw/cpcd/CPCD.cpp | 2 +- storage/ndb/src/cw/cpcd/CPCD.hpp | 2 +- storage/ndb/src/cw/cpcd/Monitor.cpp | 2 +- storage/ndb/src/cw/cpcd/Process.cpp | 2 +- storage/ndb/src/cw/cpcd/common.cpp | 2 +- storage/ndb/src/cw/cpcd/common.hpp | 2 +- storage/ndb/src/cw/cpcd/main.cpp | 2 +- .../cw/test/socketclient/socketClientTest.cpp | 2 +- storage/ndb/src/cw/util/ClientInterface.cpp | 2 +- storage/ndb/src/cw/util/ClientInterface.hpp | 2 +- storage/ndb/src/cw/util/SocketRegistry.cpp | 2 +- storage/ndb/src/cw/util/SocketRegistry.hpp | 2 +- storage/ndb/src/cw/util/SocketService.cpp | 2 +- storage/ndb/src/cw/util/SocketService.hpp | 2 +- storage/ndb/src/kernel/SimBlockList.cpp | 2 +- .../ndb/src/kernel/blocks/backup/Backup.cpp | 2 +- .../ndb/src/kernel/blocks/backup/Backup.hpp | 2 +- .../src/kernel/blocks/backup/BackupFormat.hpp | 2 +- .../src/kernel/blocks/backup/BackupInit.cpp | 2 +- .../ndb/src/kernel/blocks/backup/FsBuffer.hpp | 2 +- storage/ndb/src/kernel/blocks/backup/read.cpp | 2 +- storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp | 2 +- storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp | 2 +- storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp | 2 +- .../ndb/src/kernel/blocks/dbacc/DbaccInit.cpp | 2 +- .../ndb/src/kernel/blocks/dbacc/DbaccMain.cpp | 2 +- .../ndb/src/kernel/blocks/dbdict/Dbdict.cpp | 2 +- .../ndb/src/kernel/blocks/dbdict/Dbdict.hpp | 2 +- .../src/kernel/blocks/dbdict/SchemaFile.hpp | 2 +- .../kernel/blocks/dbdict/printSchemaFile.cpp | 2 +- storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp | 2 +- .../ndb/src/kernel/blocks/dbdih/DbdihInit.cpp | 2 +- .../ndb/src/kernel/blocks/dbdih/DbdihMain.cpp | 2 +- .../ndb/src/kernel/blocks/dbdih/Sysfile.hpp | 2 +- .../src/kernel/blocks/dbdih/printSysfile.cpp | 2 +- .../dbdih/printSysfile/printSysfile.cpp | 2 +- storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp | 2 +- .../ndb/src/kernel/blocks/dblqh/DblqhInit.cpp | 2 +- .../ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 2 +- .../blocks/dblqh/redoLogReader/reader.cpp | 2 +- .../blocks/dblqh/redoLogReader/records.cpp | 2 +- .../blocks/dblqh/redoLogReader/records.hpp | 2 +- storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp | 2 +- .../ndb/src/kernel/blocks/dbtc/DbtcInit.cpp | 2 +- .../ndb/src/kernel/blocks/dbtc/DbtcMain.cpp | 2 +- .../kernel/blocks/dbtup/AttributeOffset.hpp | 2 +- storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp | 2 +- .../src/kernel/blocks/dbtup/DbtupAbort.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupBuffer.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupCommit.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupDebug.cpp | 2 +- .../kernel/blocks/dbtup/DbtupDiskAlloc.cpp | 2 +- .../kernel/blocks/dbtup/DbtupExecQuery.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupFixAlloc.cpp | 2 +- .../ndb/src/kernel/blocks/dbtup/DbtupGen.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupIndex.cpp | 2 +- .../ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupPagMan.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupPageMap.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupRoutines.cpp | 2 +- .../ndb/src/kernel/blocks/dbtup/DbtupScan.cpp | 2 +- .../blocks/dbtup/DbtupStoredProcDef.cpp | 2 +- .../kernel/blocks/dbtup/DbtupTabDesMan.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupTrigger.cpp | 2 +- .../src/kernel/blocks/dbtup/DbtupVarAlloc.cpp | 2 +- .../src/kernel/blocks/dbtup/Undo_buffer.cpp | 2 +- .../src/kernel/blocks/dbtup/Undo_buffer.hpp | 2 +- .../ndb/src/kernel/blocks/dbtup/tuppage.cpp | 2 +- .../ndb/src/kernel/blocks/dbtup/tuppage.hpp | 2 +- storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp | 2 +- .../src/kernel/blocks/dbtux/DbtuxDebug.cpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp | 2 +- .../src/kernel/blocks/dbtux/DbtuxMaint.cpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp | 2 +- .../src/kernel/blocks/dbtux/DbtuxSearch.cpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp | 2 +- .../ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp | 2 +- .../ndb/src/kernel/blocks/dbutil/DbUtil.cpp | 2 +- .../ndb/src/kernel/blocks/dbutil/DbUtil.hpp | 2 +- storage/ndb/src/kernel/blocks/diskpage.hpp | 2 +- storage/ndb/src/kernel/blocks/lgman.hpp | 2 +- storage/ndb/src/kernel/blocks/mutexes.hpp | 2 +- .../ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp | 2 +- .../src/kernel/blocks/ndbcntr/NdbcntrInit.cpp | 2 +- .../src/kernel/blocks/ndbcntr/NdbcntrMain.cpp | 2 +- .../kernel/blocks/ndbcntr/NdbcntrSysTable.cpp | 2 +- .../ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp | 2 +- .../ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp | 2 +- .../ndbfs/AsyncFileTest/AsyncFileTest.cpp | 2 +- .../src/kernel/blocks/ndbfs/CircularIndex.cpp | 2 +- .../src/kernel/blocks/ndbfs/CircularIndex.hpp | 2 +- .../ndb/src/kernel/blocks/ndbfs/Filename.cpp | 2 +- .../ndb/src/kernel/blocks/ndbfs/Filename.hpp | 2 +- .../src/kernel/blocks/ndbfs/MemoryChannel.cpp | 2 +- .../src/kernel/blocks/ndbfs/MemoryChannel.hpp | 2 +- .../MemoryChannelTest/MemoryChannelTest.cpp | 2 +- storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp | 2 +- storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp | 2 +- .../ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp | 2 +- storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp | 2 +- .../ndb/src/kernel/blocks/ndbfs/VoidFs.cpp | 2 +- storage/ndb/src/kernel/blocks/pgman.cpp | 2 +- storage/ndb/src/kernel/blocks/pgman.hpp | 2 +- storage/ndb/src/kernel/blocks/print_file.cpp | 2 +- storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp | 2 +- .../ndb/src/kernel/blocks/qmgr/QmgrInit.cpp | 2 +- .../ndb/src/kernel/blocks/qmgr/QmgrMain.cpp | 2 +- storage/ndb/src/kernel/blocks/qmgr/timer.hpp | 2 +- .../ndb/src/kernel/blocks/record_types.hpp | 2 +- storage/ndb/src/kernel/blocks/restore.cpp | 2 +- storage/ndb/src/kernel/blocks/restore.hpp | 2 +- storage/ndb/src/kernel/blocks/suma/Suma.cpp | 2 +- storage/ndb/src/kernel/blocks/suma/Suma.hpp | 2 +- .../ndb/src/kernel/blocks/suma/SumaInit.cpp | 2 +- storage/ndb/src/kernel/blocks/trix/Trix.cpp | 2 +- storage/ndb/src/kernel/blocks/trix/Trix.hpp | 2 +- storage/ndb/src/kernel/blocks/tsman.cpp | 2 +- storage/ndb/src/kernel/blocks/tsman.hpp | 2 +- .../src/kernel/error/ErrorHandlingMacros.hpp | 2 +- .../ndb/src/kernel/error/ErrorReporter.cpp | 2 +- .../ndb/src/kernel/error/ErrorReporter.hpp | 2 +- storage/ndb/src/kernel/error/TimeModule.cpp | 2 +- storage/ndb/src/kernel/error/TimeModule.hpp | 2 +- .../ndb/src/kernel/error/ndbd_exit_codes.c | 2 +- storage/ndb/src/kernel/main.cpp | 2 +- storage/ndb/src/kernel/vm/Array.hpp | 2 +- storage/ndb/src/kernel/vm/ArrayPool.hpp | 2 +- storage/ndb/src/kernel/vm/CArray.hpp | 2 +- storage/ndb/src/kernel/vm/Callback.hpp | 2 +- .../src/kernel/vm/ClusterConfiguration.cpp | 2 +- .../src/kernel/vm/ClusterConfiguration.hpp | 2 +- storage/ndb/src/kernel/vm/Configuration.cpp | 2 +- storage/ndb/src/kernel/vm/Configuration.hpp | 2 +- storage/ndb/src/kernel/vm/DLCFifoList.hpp | 2 +- storage/ndb/src/kernel/vm/DLCHashTable.hpp | 2 +- storage/ndb/src/kernel/vm/DLFifoList.hpp | 2 +- storage/ndb/src/kernel/vm/DLHashTable.hpp | 2 +- storage/ndb/src/kernel/vm/DLHashTable2.hpp | 2 +- storage/ndb/src/kernel/vm/DLList.hpp | 2 +- storage/ndb/src/kernel/vm/DataBuffer.hpp | 2 +- storage/ndb/src/kernel/vm/DynArr256.cpp | 2 +- storage/ndb/src/kernel/vm/DynArr256.hpp | 2 +- storage/ndb/src/kernel/vm/Emulator.cpp | 2 +- storage/ndb/src/kernel/vm/Emulator.hpp | 2 +- storage/ndb/src/kernel/vm/FastScheduler.cpp | 2 +- storage/ndb/src/kernel/vm/FastScheduler.hpp | 2 +- storage/ndb/src/kernel/vm/GlobalData.hpp | 2 +- storage/ndb/src/kernel/vm/KeyDescriptor.hpp | 2 +- storage/ndb/src/kernel/vm/KeyTable.hpp | 2 +- storage/ndb/src/kernel/vm/KeyTable2.hpp | 2 +- storage/ndb/src/kernel/vm/KeyTable2Ref.hpp | 2 +- storage/ndb/src/kernel/vm/LinearPool.hpp | 2 +- storage/ndb/src/kernel/vm/LongSignal.hpp | 2 +- storage/ndb/src/kernel/vm/Mutex.cpp | 2 +- storage/ndb/src/kernel/vm/Mutex.hpp | 2 +- storage/ndb/src/kernel/vm/NdbdSuperPool.cpp | 2 +- storage/ndb/src/kernel/vm/NdbdSuperPool.hpp | 2 +- storage/ndb/src/kernel/vm/Pool.cpp | 2 +- storage/ndb/src/kernel/vm/Pool.hpp | 2 +- storage/ndb/src/kernel/vm/Prio.hpp | 2 +- storage/ndb/src/kernel/vm/RWPool.cpp | 2 +- storage/ndb/src/kernel/vm/RWPool.hpp | 2 +- storage/ndb/src/kernel/vm/RequestTracker.hpp | 2 +- storage/ndb/src/kernel/vm/Rope.hpp | 2 +- storage/ndb/src/kernel/vm/SLFifoList.hpp | 2 +- storage/ndb/src/kernel/vm/SLList.hpp | 2 +- storage/ndb/src/kernel/vm/SafeCounter.cpp | 2 +- storage/ndb/src/kernel/vm/SafeCounter.hpp | 2 +- storage/ndb/src/kernel/vm/SectionReader.cpp | 2 +- storage/ndb/src/kernel/vm/SectionReader.hpp | 2 +- storage/ndb/src/kernel/vm/SignalCounter.hpp | 2 +- storage/ndb/src/kernel/vm/SimBlockList.hpp | 2 +- .../src/kernel/vm/SimplePropertiesSection.cpp | 2 +- storage/ndb/src/kernel/vm/SimulatedBlock.cpp | 2 +- storage/ndb/src/kernel/vm/SimulatedBlock.hpp | 2 +- storage/ndb/src/kernel/vm/SuperPool.cpp | 2 +- storage/ndb/src/kernel/vm/SuperPool.hpp | 2 +- storage/ndb/src/kernel/vm/ThreadConfig.cpp | 2 +- storage/ndb/src/kernel/vm/ThreadConfig.hpp | 2 +- storage/ndb/src/kernel/vm/TimeQueue.cpp | 2 +- storage/ndb/src/kernel/vm/TimeQueue.hpp | 2 +- .../ndb/src/kernel/vm/TransporterCallback.cpp | 2 +- storage/ndb/src/kernel/vm/VMSignal.cpp | 2 +- storage/ndb/src/kernel/vm/VMSignal.hpp | 2 +- storage/ndb/src/kernel/vm/WOPool.cpp | 2 +- storage/ndb/src/kernel/vm/WOPool.hpp | 2 +- storage/ndb/src/kernel/vm/WaitQueue.hpp | 2 +- storage/ndb/src/kernel/vm/WatchDog.cpp | 2 +- storage/ndb/src/kernel/vm/WatchDog.hpp | 2 +- .../src/kernel/vm/al_test/arrayListTest.cpp | 2 +- .../src/kernel/vm/al_test/arrayPoolTest.cpp | 2 +- storage/ndb/src/kernel/vm/al_test/main.cpp | 2 +- storage/ndb/src/kernel/vm/bench_pool.cpp | 2 +- storage/ndb/src/kernel/vm/ndbd_malloc.cpp | 2 +- storage/ndb/src/kernel/vm/ndbd_malloc.hpp | 2 +- .../ndb/src/kernel/vm/ndbd_malloc_impl.cpp | 2 +- .../ndb/src/kernel/vm/ndbd_malloc_impl.hpp | 2 +- storage/ndb/src/kernel/vm/pc.hpp | 2 +- storage/ndb/src/kernel/vm/testCopy/rr.cpp | 2 +- .../ndb/src/kernel/vm/testCopy/testCopy.cpp | 2 +- .../vm/testDataBuffer/testDataBuffer.cpp | 2 +- .../src/kernel/vm/testLongSig/testLongSig.cpp | 2 +- .../vm/testSimplePropertiesSection/test.cpp | 2 +- storage/ndb/src/kernel/vm/testSuperPool.cpp | 2 +- storage/ndb/src/mgmapi/LocalConfig.cpp | 2 +- storage/ndb/src/mgmapi/LocalConfig.hpp | 2 +- storage/ndb/src/mgmapi/mgmapi.cpp | 2 +- .../ndb/src/mgmapi/mgmapi_configuration.hpp | 2 +- storage/ndb/src/mgmapi/mgmapi_internal.h | 2 +- storage/ndb/src/mgmapi/ndb_logevent.cpp | 2 +- storage/ndb/src/mgmapi/ndb_logevent.hpp | 2 +- storage/ndb/src/mgmapi/test/keso.c | 2 +- storage/ndb/src/mgmapi/test/mgmSrvApi.cpp | 2 +- .../ndb/src/mgmclient/CommandInterpreter.cpp | 2 +- storage/ndb/src/mgmclient/main.cpp | 2 +- storage/ndb/src/mgmclient/ndb_mgmclient.h | 2 +- storage/ndb/src/mgmclient/ndb_mgmclient.hpp | 2 +- .../ndb/src/mgmclient/test_cpcd/test_cpcd.cpp | 2 +- storage/ndb/src/mgmsrv/Config.cpp | 2 +- storage/ndb/src/mgmsrv/Config.hpp | 2 +- storage/ndb/src/mgmsrv/ConfigInfo.cpp | 2 +- storage/ndb/src/mgmsrv/ConfigInfo.hpp | 2 +- .../ndb/src/mgmsrv/InitConfigFileParser.cpp | 2 +- .../ndb/src/mgmsrv/InitConfigFileParser.hpp | 2 +- storage/ndb/src/mgmsrv/MgmtSrvr.cpp | 2 +- storage/ndb/src/mgmsrv/MgmtSrvr.hpp | 2 +- storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp | 2 +- .../mgmsrv/MgmtSrvrGeneralSignalHandling.cpp | 2 +- storage/ndb/src/mgmsrv/Services.cpp | 2 +- storage/ndb/src/mgmsrv/Services.hpp | 2 +- storage/ndb/src/mgmsrv/SignalQueue.cpp | 2 +- storage/ndb/src/mgmsrv/SignalQueue.hpp | 2 +- storage/ndb/src/mgmsrv/convertStrToInt.cpp | 2 +- storage/ndb/src/mgmsrv/convertStrToInt.hpp | 2 +- storage/ndb/src/mgmsrv/main.cpp | 2 +- storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp | 2 +- storage/ndb/src/ndbapi/API.hpp | 2 +- storage/ndb/src/ndbapi/ClusterMgr.cpp | 2 +- storage/ndb/src/ndbapi/ClusterMgr.hpp | 2 +- storage/ndb/src/ndbapi/DictCache.cpp | 2 +- storage/ndb/src/ndbapi/DictCache.hpp | 2 +- storage/ndb/src/ndbapi/Ndb.cpp | 2 +- storage/ndb/src/ndbapi/NdbApiSignal.cpp | 2 +- storage/ndb/src/ndbapi/NdbApiSignal.hpp | 2 +- storage/ndb/src/ndbapi/NdbBlob.cpp | 2 +- storage/ndb/src/ndbapi/NdbBlobImpl.hpp | 2 +- storage/ndb/src/ndbapi/NdbDictionary.cpp | 2 +- storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp | 2 +- storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp | 2 +- storage/ndb/src/ndbapi/NdbErrorOut.cpp | 2 +- storage/ndb/src/ndbapi/NdbEventOperation.cpp | 2 +- .../ndb/src/ndbapi/NdbEventOperationImpl.cpp | 2 +- .../ndb/src/ndbapi/NdbEventOperationImpl.hpp | 2 +- storage/ndb/src/ndbapi/NdbImpl.hpp | 2 +- storage/ndb/src/ndbapi/NdbIndexOperation.cpp | 2 +- storage/ndb/src/ndbapi/NdbIndexStat.cpp | 2 +- storage/ndb/src/ndbapi/NdbLinHash.hpp | 2 +- storage/ndb/src/ndbapi/NdbOperation.cpp | 2 +- storage/ndb/src/ndbapi/NdbOperationDefine.cpp | 2 +- storage/ndb/src/ndbapi/NdbOperationExec.cpp | 2 +- storage/ndb/src/ndbapi/NdbOperationInt.cpp | 2 +- storage/ndb/src/ndbapi/NdbOperationScan.cpp | 2 +- storage/ndb/src/ndbapi/NdbOperationSearch.cpp | 2 +- storage/ndb/src/ndbapi/NdbPool.cpp | 2 +- storage/ndb/src/ndbapi/NdbPoolImpl.cpp | 2 +- storage/ndb/src/ndbapi/NdbPoolImpl.hpp | 2 +- storage/ndb/src/ndbapi/NdbRecAttr.cpp | 2 +- storage/ndb/src/ndbapi/NdbReceiver.cpp | 2 +- storage/ndb/src/ndbapi/NdbScanFilter.cpp | 2 +- storage/ndb/src/ndbapi/NdbScanOperation.cpp | 2 +- storage/ndb/src/ndbapi/NdbTransaction.cpp | 2 +- storage/ndb/src/ndbapi/NdbTransactionScan.cpp | 2 +- storage/ndb/src/ndbapi/NdbUtil.cpp | 2 +- storage/ndb/src/ndbapi/NdbUtil.hpp | 2 +- storage/ndb/src/ndbapi/NdbWaiter.hpp | 2 +- storage/ndb/src/ndbapi/Ndberr.cpp | 2 +- storage/ndb/src/ndbapi/Ndbif.cpp | 2 +- storage/ndb/src/ndbapi/Ndbinit.cpp | 2 +- storage/ndb/src/ndbapi/Ndblist.cpp | 2 +- storage/ndb/src/ndbapi/ObjectMap.cpp | 2 +- storage/ndb/src/ndbapi/ObjectMap.hpp | 2 +- storage/ndb/src/ndbapi/SignalSender.cpp | 2 +- storage/ndb/src/ndbapi/SignalSender.hpp | 2 +- storage/ndb/src/ndbapi/TransporterFacade.cpp | 2 +- storage/ndb/src/ndbapi/TransporterFacade.hpp | 2 +- .../ndb/src/ndbapi/ndb_cluster_connection.cpp | 2 +- .../ndbapi/ndb_cluster_connection_impl.hpp | 2 +- storage/ndb/src/ndbapi/ndberror.c | 2 +- .../src/ndbapi/signal-sender/SignalSender.cpp | 2 +- .../src/ndbapi/signal-sender/SignalSender.hpp | 2 +- storage/ndb/test/include/AtrtClient.hpp | 2 +- storage/ndb/test/include/CpcClient.hpp | 2 +- storage/ndb/test/include/DbUtil.hpp | 2 +- .../test/include/HugoAsynchTransactions.hpp | 2 +- storage/ndb/test/include/HugoCalculator.hpp | 2 +- storage/ndb/test/include/HugoOperations.hpp | 2 +- storage/ndb/test/include/HugoTransactions.hpp | 2 +- storage/ndb/test/include/NDBT.hpp | 2 +- storage/ndb/test/include/NDBT_DataSet.hpp | 2 +- .../test/include/NDBT_DataSetTransaction.hpp | 2 +- storage/ndb/test/include/NDBT_Error.hpp | 2 +- storage/ndb/test/include/NDBT_Output.hpp | 2 +- storage/ndb/test/include/NDBT_ResultRow.hpp | 2 +- storage/ndb/test/include/NDBT_ReturnCodes.h | 2 +- storage/ndb/test/include/NDBT_Stats.hpp | 2 +- storage/ndb/test/include/NDBT_Table.hpp | 2 +- storage/ndb/test/include/NDBT_Tables.hpp | 2 +- storage/ndb/test/include/NDBT_Test.hpp | 2 +- storage/ndb/test/include/NDBT_Thread.hpp | 2 +- storage/ndb/test/include/NdbBackup.hpp | 2 +- storage/ndb/test/include/NdbConfig.hpp | 2 +- storage/ndb/test/include/NdbGrep.hpp | 2 +- storage/ndb/test/include/NdbMixRestarter.hpp | 2 +- storage/ndb/test/include/NdbRestarter.hpp | 2 +- storage/ndb/test/include/NdbRestarts.hpp | 2 +- storage/ndb/test/include/NdbSchemaCon.hpp | 2 +- storage/ndb/test/include/NdbSchemaOp.hpp | 2 +- storage/ndb/test/include/NdbTest.hpp | 2 +- storage/ndb/test/include/NdbTimer.hpp | 2 +- .../test/include/TestNdbEventOperation.hpp | 2 +- storage/ndb/test/include/UtilTransactions.hpp | 2 +- storage/ndb/test/include/getarg.h | 2 +- storage/ndb/test/ndbapi/InsertRecs.cpp | 2 +- storage/ndb/test/ndbapi/ScanFilter.hpp | 2 +- storage/ndb/test/ndbapi/ScanFunctions.hpp | 2 +- storage/ndb/test/ndbapi/ScanInterpretTest.hpp | 2 +- storage/ndb/test/ndbapi/TraceNdbApi.cpp | 2 +- storage/ndb/test/ndbapi/VerifyNdbApi.cpp | 2 +- storage/ndb/test/ndbapi/acid.cpp | 2 +- storage/ndb/test/ndbapi/acid2.cpp | 2 +- storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp | 2 +- storage/ndb/test/ndbapi/adoInsertRecs.cpp | 2 +- storage/ndb/test/ndbapi/asyncGenerator.cpp | 2 +- storage/ndb/test/ndbapi/bank/Bank.cpp | 2 +- storage/ndb/test/ndbapi/bank/Bank.hpp | 2 +- storage/ndb/test/ndbapi/bank/BankLoad.cpp | 2 +- storage/ndb/test/ndbapi/bank/bankCreator.cpp | 2 +- storage/ndb/test/ndbapi/bank/bankMakeGL.cpp | 2 +- .../ndb/test/ndbapi/bank/bankSumAccounts.cpp | 2 +- storage/ndb/test/ndbapi/bank/bankTimer.cpp | 2 +- .../test/ndbapi/bank/bankTransactionMaker.cpp | 2 +- .../test/ndbapi/bank/bankValidateAllGLs.cpp | 2 +- storage/ndb/test/ndbapi/bank/testBank.cpp | 2 +- .../ndb/test/ndbapi/bench/asyncGenerator.cpp | 2 +- storage/ndb/test/ndbapi/bench/dbGenerator.h | 2 +- storage/ndb/test/ndbapi/bench/dbPopulate.cpp | 2 +- storage/ndb/test/ndbapi/bench/dbPopulate.h | 2 +- storage/ndb/test/ndbapi/bench/macros.h | 2 +- .../test/ndbapi/bench/mainAsyncGenerator.cpp | 2 +- .../ndb/test/ndbapi/bench/mainPopulate.cpp | 2 +- storage/ndb/test/ndbapi/bench/ndb_async1.cpp | 2 +- storage/ndb/test/ndbapi/bench/ndb_async2.cpp | 2 +- storage/ndb/test/ndbapi/bench/ndb_error.hpp | 2 +- storage/ndb/test/ndbapi/bench/ndb_schema.hpp | 2 +- .../ndbapi/bench/ndb_user_transaction.cpp | 2 +- .../ndbapi/bench/ndb_user_transaction2.cpp | 2 +- .../ndbapi/bench/ndb_user_transaction3.cpp | 2 +- .../ndbapi/bench/ndb_user_transaction4.cpp | 2 +- .../ndbapi/bench/ndb_user_transaction5.cpp | 2 +- .../ndbapi/bench/ndb_user_transaction6.cpp | 2 +- storage/ndb/test/ndbapi/bench/testData.h | 2 +- .../ndb/test/ndbapi/bench/testDefinitions.h | 2 +- .../ndb/test/ndbapi/bench/userInterface.cpp | 2 +- storage/ndb/test/ndbapi/bench/userInterface.h | 2 +- storage/ndb/test/ndbapi/benchronja.cpp | 2 +- storage/ndb/test/ndbapi/bulk_copy.cpp | 2 +- storage/ndb/test/ndbapi/cdrserver.cpp | 2 +- storage/ndb/test/ndbapi/celloDb.cpp | 2 +- storage/ndb/test/ndbapi/create_all_tabs.cpp | 2 +- storage/ndb/test/ndbapi/create_tab.cpp | 2 +- storage/ndb/test/ndbapi/drop_all_tabs.cpp | 2 +- storage/ndb/test/ndbapi/flexAsynch.cpp | 2 +- storage/ndb/test/ndbapi/flexBench.cpp | 2 +- storage/ndb/test/ndbapi/flexHammer.cpp | 2 +- storage/ndb/test/ndbapi/flexScan.cpp | 2 +- storage/ndb/test/ndbapi/flexTT.cpp | 2 +- storage/ndb/test/ndbapi/flexTimedAsynch.cpp | 2 +- storage/ndb/test/ndbapi/flex_bench_mysql.cpp | 2 +- storage/ndb/test/ndbapi/index.cpp | 2 +- storage/ndb/test/ndbapi/index2.cpp | 2 +- storage/ndb/test/ndbapi/initronja.cpp | 2 +- storage/ndb/test/ndbapi/interpreterInTup.cpp | 2 +- .../ndb/test/ndbapi/mainAsyncGenerator.cpp | 2 +- storage/ndb/test/ndbapi/msa.cpp | 2 +- storage/ndb/test/ndbapi/ndb_async1.cpp | 2 +- storage/ndb/test/ndbapi/ndb_async2.cpp | 2 +- storage/ndb/test/ndbapi/ndb_user_populate.cpp | 2 +- .../ndb/test/ndbapi/ndb_user_transaction.cpp | 2 +- .../ndb/test/ndbapi/ndb_user_transaction2.cpp | 2 +- .../ndb/test/ndbapi/ndb_user_transaction3.cpp | 2 +- .../ndb/test/ndbapi/ndb_user_transaction4.cpp | 2 +- .../ndb/test/ndbapi/ndb_user_transaction5.cpp | 2 +- .../ndb/test/ndbapi/ndb_user_transaction6.cpp | 2 +- storage/ndb/test/ndbapi/restarter.cpp | 2 +- storage/ndb/test/ndbapi/restarter2.cpp | 2 +- storage/ndb/test/ndbapi/restarts.cpp | 2 +- storage/ndb/test/ndbapi/size.cpp | 2 +- storage/ndb/test/ndbapi/testBackup.cpp | 2 +- storage/ndb/test/ndbapi/testBasic.cpp | 2 +- storage/ndb/test/ndbapi/testBasicAsynch.cpp | 2 +- storage/ndb/test/ndbapi/testBlobs.cpp | 2 +- storage/ndb/test/ndbapi/testDataBuffers.cpp | 2 +- storage/ndb/test/ndbapi/testDeadlock.cpp | 2 +- storage/ndb/test/ndbapi/testDict.cpp | 2 +- storage/ndb/test/ndbapi/testGrepVerify.cpp | 2 +- storage/ndb/test/ndbapi/testIndex.cpp | 2 +- storage/ndb/test/ndbapi/testIndexStat.cpp | 2 +- storage/ndb/test/ndbapi/testInterpreter.cpp | 2 +- storage/ndb/test/ndbapi/testMgm.cpp | 2 +- storage/ndb/test/ndbapi/testNDBT.cpp | 2 +- storage/ndb/test/ndbapi/testNdbApi.cpp | 2 +- storage/ndb/test/ndbapi/testNodeRestart.cpp | 2 +- storage/ndb/test/ndbapi/testOIBasic.cpp | 2 +- storage/ndb/test/ndbapi/testOperations.cpp | 2 +- storage/ndb/test/ndbapi/testOrderedIndex.cpp | 2 +- storage/ndb/test/ndbapi/testPartitioning.cpp | 2 +- storage/ndb/test/ndbapi/testReadPerf.cpp | 2 +- storage/ndb/test/ndbapi/testRestartGci.cpp | 2 +- storage/ndb/test/ndbapi/testSRBank.cpp | 2 +- storage/ndb/test/ndbapi/testScan.cpp | 2 +- .../ndb/test/ndbapi/testScanInterpreter.cpp | 2 +- storage/ndb/test/ndbapi/testScanPerf.cpp | 2 +- storage/ndb/test/ndbapi/testSystemRestart.cpp | 2 +- storage/ndb/test/ndbapi/testTimeout.cpp | 2 +- storage/ndb/test/ndbapi/testTransactions.cpp | 2 +- storage/ndb/test/ndbapi/test_event.cpp | 2 +- storage/ndb/test/ndbapi/test_event_merge.cpp | 2 +- .../test/ndbapi/test_event_multi_table.cpp | 2 +- storage/ndb/test/ndbapi/userInterface.cpp | 2 +- storage/ndb/test/ndbnet/test.run | 2 +- storage/ndb/test/ndbnet/testError.run | 2 +- storage/ndb/test/ndbnet/testMNF.run | 2 +- storage/ndb/test/ndbnet/testNR.run | 2 +- storage/ndb/test/ndbnet/testNR1.run | 2 +- storage/ndb/test/ndbnet/testNR4.run | 2 +- storage/ndb/test/ndbnet/testSRhang.run | 2 +- storage/ndb/test/ndbnet/testTR295.run | 2 +- .../test/newtonapi/basic_test/basic/basic.cpp | 2 +- .../basic_test/bulk_read/br_test.cpp | 2 +- .../ndb/test/newtonapi/basic_test/common.cpp | 2 +- .../ndb/test/newtonapi/basic_test/common.hpp | 2 +- .../ptr_binding/ptr_binding_test.cpp | 2 +- .../test/newtonapi/basic_test/too_basic.cpp | 2 +- storage/ndb/test/newtonapi/perf_test/perf.cpp | 2 +- .../ndb/test/odbc/SQL99_test/SQL99_test.cpp | 2 +- storage/ndb/test/odbc/SQL99_test/SQL99_test.h | 2 +- .../ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp | 2 +- .../odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp | 2 +- .../ndb/test/odbc/client/NDBT_SQLConnect.cpp | 2 +- .../ndb/test/odbc/client/NDBT_SQLPrepare.cpp | 2 +- .../ndb/test/odbc/client/SQLAllocEnvTest.cpp | 2 +- .../test/odbc/client/SQLAllocHandleTest.cpp | 2 +- .../odbc/client/SQLAllocHandleTest_bf.cpp | 2 +- .../ndb/test/odbc/client/SQLBindColTest.cpp | 2 +- .../test/odbc/client/SQLBindParameterTest.cpp | 2 +- .../ndb/test/odbc/client/SQLCancelTest.cpp | 2 +- .../test/odbc/client/SQLCloseCursorTest.cpp | 2 +- .../test/odbc/client/SQLColAttributeTest.cpp | 2 +- .../test/odbc/client/SQLColAttributeTest1.cpp | 2 +- .../test/odbc/client/SQLColAttributeTest2.cpp | 2 +- .../test/odbc/client/SQLColAttributeTest3.cpp | 2 +- .../ndb/test/odbc/client/SQLConnectTest.cpp | 2 +- .../ndb/test/odbc/client/SQLCopyDescTest.cpp | 2 +- .../test/odbc/client/SQLDescribeColTest.cpp | 2 +- .../test/odbc/client/SQLDisconnectTest.cpp | 2 +- .../test/odbc/client/SQLDriverConnectTest.cpp | 2 +- .../ndb/test/odbc/client/SQLEndTranTest.cpp | 2 +- storage/ndb/test/odbc/client/SQLErrorTest.cpp | 2 +- .../test/odbc/client/SQLExecDirectTest.cpp | 2 +- .../ndb/test/odbc/client/SQLExecuteTest.cpp | 2 +- .../test/odbc/client/SQLFetchScrollTest.cpp | 2 +- storage/ndb/test/odbc/client/SQLFetchTest.cpp | 2 +- .../test/odbc/client/SQLFreeHandleTest.cpp | 2 +- .../ndb/test/odbc/client/SQLFreeStmtTest.cpp | 2 +- .../odbc/client/SQLGetConnectAttrTest.cpp | 2 +- .../test/odbc/client/SQLGetCursorNameTest.cpp | 2 +- .../ndb/test/odbc/client/SQLGetDataTest.cpp | 2 +- .../test/odbc/client/SQLGetDescFieldTest.cpp | 2 +- .../test/odbc/client/SQLGetDescRecTest.cpp | 2 +- .../test/odbc/client/SQLGetDiagFieldTest.cpp | 2 +- .../odbc/client/SQLGetDiagRecSimpleTest.cpp | 2 +- .../test/odbc/client/SQLGetDiagRecTest.cpp | 2 +- .../test/odbc/client/SQLGetEnvAttrTest.cpp | 2 +- .../test/odbc/client/SQLGetFunctionsTest.cpp | 2 +- .../ndb/test/odbc/client/SQLGetInfoTest.cpp | 2 +- .../test/odbc/client/SQLGetStmtAttrTest.cpp | 2 +- .../test/odbc/client/SQLGetTypeInfoTest.cpp | 2 +- .../test/odbc/client/SQLMoreResultsTest.cpp | 2 +- .../test/odbc/client/SQLNumResultColsTest.cpp | 2 +- .../ndb/test/odbc/client/SQLParamDataTest.cpp | 2 +- .../ndb/test/odbc/client/SQLPrepareTest.cpp | 2 +- .../ndb/test/odbc/client/SQLPutDataTest.cpp | 2 +- .../ndb/test/odbc/client/SQLRowCountTest.cpp | 2 +- .../odbc/client/SQLSetConnectAttrTest.cpp | 2 +- .../test/odbc/client/SQLSetCursorNameTest.cpp | 2 +- .../test/odbc/client/SQLSetDescFieldTest.cpp | 2 +- .../test/odbc/client/SQLSetDescRecTest.cpp | 2 +- .../test/odbc/client/SQLSetEnvAttrTest.cpp | 2 +- .../test/odbc/client/SQLSetStmtAttrTest.cpp | 2 +- .../ndb/test/odbc/client/SQLTablesTest.cpp | 2 +- .../ndb/test/odbc/client/SQLTransactTest.cpp | 2 +- storage/ndb/test/odbc/client/common.hpp | 2 +- storage/ndb/test/odbc/client/main.cpp | 2 +- .../ndb/test/odbc/driver/testOdbcDriver.cpp | 2 +- .../test/odbc/test_compiler/test_compiler.cpp | 2 +- .../ndb/test/run-test/atrt-analyze-result.sh | 2 +- .../ndb/test/run-test/atrt-clear-result.sh | 2 +- .../ndb/test/run-test/atrt-gather-result.sh | 2 +- storage/ndb/test/run-test/atrt-setup.sh | 2 +- storage/ndb/test/run-test/atrt-testBackup | 2 +- storage/ndb/test/run-test/atrt.hpp | 2 +- storage/ndb/test/run-test/main.cpp | 2 +- storage/ndb/test/run-test/make-index.sh | 2 +- storage/ndb/test/src/CpcClient.cpp | 2 +- storage/ndb/test/src/DbUtil.cpp | 2 +- .../ndb/test/src/HugoAsynchTransactions.cpp | 2 +- storage/ndb/test/src/HugoCalculator.cpp | 2 +- storage/ndb/test/src/HugoOperations.cpp | 2 +- storage/ndb/test/src/HugoTransactions.cpp | 2 +- storage/ndb/test/src/NDBT_Error.cpp | 2 +- storage/ndb/test/src/NDBT_Output.cpp | 2 +- storage/ndb/test/src/NDBT_ResultRow.cpp | 2 +- storage/ndb/test/src/NDBT_ReturnCodes.cpp | 2 +- storage/ndb/test/src/NDBT_Table.cpp | 2 +- storage/ndb/test/src/NDBT_Tables.cpp | 2 +- storage/ndb/test/src/NDBT_Test.cpp | 2 +- storage/ndb/test/src/NDBT_Thread.cpp | 2 +- storage/ndb/test/src/NdbBackup.cpp | 2 +- storage/ndb/test/src/NdbConfig.cpp | 2 +- storage/ndb/test/src/NdbGrep.cpp | 2 +- storage/ndb/test/src/NdbMixRestarter.cpp | 2 +- storage/ndb/test/src/NdbRestarter.cpp | 2 +- storage/ndb/test/src/NdbRestarts.cpp | 2 +- storage/ndb/test/src/NdbSchemaCon.cpp | 2 +- storage/ndb/test/src/NdbSchemaOp.cpp | 2 +- storage/ndb/test/src/UtilTransactions.cpp | 2 +- storage/ndb/test/tools/connect.cpp | 2 +- storage/ndb/test/tools/copy_tab.cpp | 2 +- storage/ndb/test/tools/cpcc.cpp | 2 +- storage/ndb/test/tools/create_index.cpp | 2 +- storage/ndb/test/tools/hugoCalculator.cpp | 2 +- storage/ndb/test/tools/hugoFill.cpp | 2 +- storage/ndb/test/tools/hugoLoad.cpp | 2 +- storage/ndb/test/tools/hugoLockRecords.cpp | 2 +- storage/ndb/test/tools/hugoPkDelete.cpp | 2 +- storage/ndb/test/tools/hugoPkRead.cpp | 2 +- storage/ndb/test/tools/hugoPkReadRecord.cpp | 2 +- storage/ndb/test/tools/hugoPkUpdate.cpp | 2 +- storage/ndb/test/tools/hugoScanRead.cpp | 2 +- storage/ndb/test/tools/hugoScanUpdate.cpp | 2 +- storage/ndb/test/tools/listen.cpp | 2 +- storage/ndb/test/tools/rep_latency.cpp | 2 +- storage/ndb/test/tools/restart.cpp | 2 +- storage/ndb/test/tools/transproxy.cpp | 2 +- storage/ndb/test/tools/verify_index.cpp | 2 +- storage/ndb/tools/clean-links.sh | 2 +- storage/ndb/tools/delete_all.cpp | 2 +- storage/ndb/tools/desc.cpp | 2 +- storage/ndb/tools/drop_index.cpp | 2 +- storage/ndb/tools/drop_tab.cpp | 2 +- storage/ndb/tools/listTables.cpp | 2 +- storage/ndb/tools/make-errors.pl | 2 +- storage/ndb/tools/make-links.sh | 2 +- storage/ndb/tools/ndb_config.cpp | 2 +- storage/ndb/tools/ndb_error_reporter | 2 +- storage/ndb/tools/ndb_test_platform.cpp | 2 +- storage/ndb/tools/ndbsql.cpp | 2 +- storage/ndb/tools/restore/Restore.cpp | 2 +- storage/ndb/tools/restore/Restore.hpp | 2 +- storage/ndb/tools/restore/consumer.cpp | 2 +- storage/ndb/tools/restore/consumer.hpp | 2 +- .../ndb/tools/restore/consumer_printer.cpp | 2 +- .../ndb/tools/restore/consumer_printer.hpp | 2 +- .../ndb/tools/restore/consumer_restore.cpp | 2 +- .../ndb/tools/restore/consumer_restore.hpp | 2 +- .../ndb/tools/restore/consumer_restorem.cpp | 2 +- storage/ndb/tools/restore/ndb_nodegroup_map.h | 2 +- storage/ndb/tools/restore/restore_main.cpp | 2 +- storage/ndb/tools/rgrep | 2 +- storage/ndb/tools/select_all.cpp | 2 +- storage/ndb/tools/select_count.cpp | 2 +- storage/ndb/tools/waiter.cpp | 2 +- storage/perfschema/pfs_check.cc | 3 +- storage/perfschema/pfs_events_waits.cc | 2 +- storage/sphinx/ha_sphinx.cc | 4 +- storage/tokudb/CMakeLists.txt | 5 +- strings/CMakeLists.txt | 2 +- strings/ctype-mb.c | 4 +- strings/ctype-simple.c | 5 +- strings/ctype-uca.c | 4 +- strings/ctype-ucs2.c | 6 +- strings/ctype-utf8.c | 268 ++- strings/ctype-win1250ch.c | 5 +- strings/ctype.c | 6 +- strings/t_ctype.h | 3 +- support-files/MySQL-shared-compat.spec.sh | 2 +- .../{mysql.5.5.35.spec => mysql.5.5.36.spec} | 4 +- support-files/mysql.server.sh | 125 +- support-files/rpm/server-postun.sh | 5 +- tests/connect_test.c | 3 +- tests/fork_big.pl | 5 +- tests/fork_big2.pl | 5 +- tests/insert_test.c | 3 +- tests/list_test.c | 3 +- tests/select_test.c | 3 +- tests/showdb_test.c | 3 +- tests/ssl_test.c | 3 +- vio/CMakeLists.txt | 2 +- vio/viossl.c | 2 +- vio/viosslfactories.c | 2 +- zlib/CMakeLists.txt | 2 +- 1432 files changed, 6035 insertions(+), 2193 deletions(-) create mode 100644 cmake/CPackRPM.cmake delete mode 100644 libmysql/libmysql.ver.in delete mode 100644 libmysql/libmysql_rpm_version.in create mode 100644 libmysql/libmysql_versions.ld.in delete mode 100644 libmysql/rpm_support.cc create mode 100644 mysql-test/r/udf_debug_sync.result create mode 100644 mysql-test/r/union_crash-714.result create mode 100644 mysql-test/suite/federated/federated_maybe_16324629.result create mode 100644 mysql-test/suite/federated/federated_maybe_16324629.test create mode 100644 mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result create mode 100644 mysql-test/suite/innodb/r/row_lock.result create mode 100644 mysql-test/suite/innodb/t/innodb-change-buffer-recovery-master.opt create mode 100644 mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test create mode 100644 mysql-test/suite/innodb/t/row_lock.test rename mysql-test/suite/{innodb => innodb_zip}/r/innodb-create-options.result (100%) rename mysql-test/suite/{innodb => innodb_zip}/r/innodb-zip.result (100%) rename mysql-test/suite/{innodb => innodb_zip}/r/innodb_bug36169.result (100%) rename mysql-test/suite/{innodb => innodb_zip}/r/innodb_bug36172.result (100%) rename mysql-test/suite/{innodb => innodb_zip}/r/innodb_bug52745.result (100%) rename mysql-test/suite/{innodb => innodb_zip}/r/innodb_bug53591.result (100%) rename mysql-test/suite/{innodb => innodb_zip}/r/innodb_bug56680.result (100%) rename mysql-test/suite/{innodb => innodb_zip}/r/innodb_cmp_drop_table.result (100%) rename mysql-test/suite/{innodb => innodb_zip}/r/innodb_index_large_prefix.result (100%) rename mysql-test/suite/{innodb => innodb_zip}/r/innodb_prefix_index_liftedlimit.result (100%) rename mysql-test/suite/{innodb => innodb_zip}/t/innodb-create-options.test (100%) rename mysql-test/suite/{innodb => innodb_zip}/t/innodb-zip.test (100%) rename mysql-test/suite/{innodb => innodb_zip}/t/innodb_bug36169.test (100%) rename mysql-test/suite/{innodb => innodb_zip}/t/innodb_bug36172.test (100%) rename mysql-test/suite/{innodb => innodb_zip}/t/innodb_bug52745.test (100%) rename mysql-test/suite/{innodb => innodb_zip}/t/innodb_bug53591.test (100%) rename mysql-test/suite/{innodb => innodb_zip}/t/innodb_bug56680.test (100%) rename mysql-test/suite/{innodb => innodb_zip}/t/innodb_cmp_drop_table-master.opt (100%) rename mysql-test/suite/{innodb => innodb_zip}/t/innodb_cmp_drop_table.test (100%) rename mysql-test/suite/{innodb => innodb_zip}/t/innodb_index_large_prefix.test (100%) rename mysql-test/suite/{innodb => innodb_zip}/t/innodb_prefix_index_liftedlimit.test (100%) create mode 100644 mysql-test/suite/sphinx/union-5539.result create mode 100644 mysql-test/suite/sphinx/union-5539.test create mode 100644 mysql-test/t/udf_debug_sync.test create mode 100644 mysql-test/t/union_crash-714.test create mode 100644 packaging/rpm-oel/CMakeLists.txt create mode 100644 packaging/rpm-oel/filter-provides.sh create mode 100644 packaging/rpm-oel/filter-requires.sh create mode 100644 packaging/rpm-oel/my.cnf create mode 100644 packaging/rpm-oel/my_config.h create mode 100644 packaging/rpm-oel/mysql-embedded-check.c create mode 100644 packaging/rpm-oel/mysql-systemd-start create mode 100644 packaging/rpm-oel/mysql.conf create mode 100644 packaging/rpm-oel/mysql.init create mode 100644 packaging/rpm-oel/mysql.spec.in create mode 100644 packaging/rpm-oel/mysql_config.sh create mode 100644 packaging/rpm-oel/mysqld.service rename support-files/{mysql.5.5.35.spec => mysql.5.5.36.spec} (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c24eeefe..f7035c54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -328,8 +328,15 @@ SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${INSTALL_PLUGINDIR}") IF(INSTALL_SYSCONFDIR) SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}") ENDIF() + +OPTION(TMPDIR +"PATH to MySQL TMP dir. If unspecified, defaults to P_tmpdir in " OFF) IF(TMPDIR) - SET(DEFAULT_TMPDIR "${TMPDIR}") + # Quote it, to make it a const char string. + SET(DEFAULT_TMPDIR "\"${TMPDIR}\"") +ELSE() + # Do not quote it, to refer to the P_tmpdir macro in . + SET(DEFAULT_TMPDIR "P_tmpdir") ENDIF() # Run platform tests @@ -407,6 +414,7 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(internal) ENDIF() ADD_SUBDIRECTORY(packaging/rpm-uln) + ADD_SUBDIRECTORY(packaging/rpm-oel) ENDIF() IF(UNIX) diff --git a/Docs/INFO_SRC b/Docs/INFO_SRC index ff8817d2..780d4af6 100644 --- a/Docs/INFO_SRC +++ b/Docs/INFO_SRC @@ -1,8 +1,8 @@ -revision-id: sergii@pisem.net-20140128095818-vsggmte8np40osk4 -date: 2014-01-28 10:58:18 +0100 -build-date: 2014-01-28 15:14:30 +0100 -revno: 4052 +revision-id: sergii@pisem.net-20140222215120-1thda2f7s8luzgaq +date: 2014-02-22 22:51:20 +0100 +build-date: 2014-02-24 00:50:31 +0100 +revno: 4095 branch-nick: 5.5 -MySQL source 5.5.35 +MySQL source 5.5.36 diff --git a/VERSION b/VERSION index 3a42bb0f..0bf067ee 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ MYSQL_VERSION_MAJOR=5 MYSQL_VERSION_MINOR=5 -MYSQL_VERSION_PATCH=35 +MYSQL_VERSION_PATCH=36 MYSQL_VERSION_EXTRA= diff --git a/client/mysql_plugin.c b/client/mysql_plugin.c index c3fa1a49..99da157f 100644 --- a/client/mysql_plugin.c +++ b/client/mysql_plugin.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -857,7 +857,7 @@ static int process_options(int argc, char *argv[], char *operation) strncat(buff, FN_DIRSEP, sizeof(buff) - strlen(buff) - 1); #endif buff[sizeof(buff) - 1]= 0; - my_delete(opt_basedir, MYF(0)); + my_free(opt_basedir); opt_basedir= my_strdup(buff, MYF(MY_FAE)); } } diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index b9053c3a..11a88c83 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2001, 2012, Oracle and/or its affiliates. + Copyright (c) 2001, 2011, Oracle and/or its affiliates. Copyright (c) 2010, 2011, Monty Program Ab. This program is free software; you can redistribute it and/or modify diff --git a/client/mysqldump.c b/client/mysqldump.c index 88aae2d4..b4c045c1 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -160,6 +160,8 @@ static void dynstr_set_checked(DYNAMIC_STRING *str, const char *init_str); static void dynstr_append_mem_checked(DYNAMIC_STRING *str, const char *append, uint length); static void dynstr_realloc_checked(DYNAMIC_STRING *str, ulong additional_size); + +static int do_start_slave_sql(MYSQL *mysql_con); /* Constant for detection of default value of default_charset. If default_charset is equal to mysql_universal_client_charset, then @@ -1494,6 +1496,8 @@ static void free_resources() static void maybe_exit(int error) { + if (opt_slave_data) + do_start_slave_sql(mysql); if (!first_error) first_error= error; if (ignore_errors) @@ -3642,7 +3646,8 @@ static void dump_table(char *table, char *db) field->type == MYSQL_TYPE_BLOB || field->type == MYSQL_TYPE_LONG_BLOB || field->type == MYSQL_TYPE_MEDIUM_BLOB || - field->type == MYSQL_TYPE_TINY_BLOB)) ? 1 : 0; + field->type == MYSQL_TYPE_TINY_BLOB || + field->type == MYSQL_TYPE_GEOMETRY)) ? 1 : 0; if (extended_insert && !opt_xml) { if (i == 0) @@ -5646,10 +5651,6 @@ int main(int argc, char **argv) dump_databases(argv); } - /* if --dump-slave , start the slave sql thread */ - if (opt_slave_data && do_start_slave_sql(mysql)) - goto err; - /* add 'START SLAVE' to end of dump */ if (opt_slave_apply && add_slave_statements()) goto err; @@ -5665,9 +5666,6 @@ int main(int argc, char **argv) if (opt_delete_master_logs && purge_bin_logs_to(mysql, bin_log_name)) goto err; -#ifdef HAVE_SMEM - my_free(shared_memory_base_name); -#endif /* No reason to explicitely COMMIT the transaction, neither to explicitely UNLOCK TABLES: these will be automatically be done by the server when we @@ -5675,6 +5673,14 @@ int main(int argc, char **argv) server. */ err: + /* if --dump-slave , start the slave sql thread */ + if (opt_slave_data && do_start_slave_sql(mysql)) + goto err; + +#ifdef HAVE_SMEM + my_free(shared_memory_base_name); +#endif + dbDisconnect(current_host); if (!path) write_footer(md_result_file); diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 68d220b2..7ceaed1a 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -521,6 +521,7 @@ struct st_command { char *query, *query_buf,*first_argument,*last_argument,*end; DYNAMIC_STRING content; + DYNAMIC_STRING eval_query; int first_word_len, query_len; my_bool abort_on_error, used_replace; struct st_expected_errors expected_errors; @@ -1392,6 +1393,8 @@ void free_used_memory() { struct st_command **q= dynamic_element(&q_lines, i, struct st_command**); my_free((*q)->query_buf); + if ((*q)->eval_query.str) + dynstr_free(&(*q)->eval_query); if ((*q)->content.str) dynstr_free(&(*q)->content); my_free((*q)); @@ -8315,7 +8318,6 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags) DYNAMIC_STRING ds_result; DYNAMIC_STRING ds_sorted; DYNAMIC_STRING ds_warnings; - DYNAMIC_STRING eval_query; char *query; int query_len; my_bool view_created= 0, sp_created= 0; @@ -8337,10 +8339,14 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags) */ if (command->type == Q_EVAL || command->type == Q_SEND_EVAL) { - init_dynamic_string(&eval_query, "", command->query_len+256, 1024); - do_eval(&eval_query, command->query, command->end, FALSE); - query = eval_query.str; - query_len = eval_query.length; + if (!command->eval_query.str) + init_dynamic_string(&command->eval_query, "", command->query_len + 256, + 1024); + else + dynstr_set(&command->eval_query, 0); + do_eval(&command->eval_query, command->query, command->end, FALSE); + query= command->eval_query.str; + query_len= command->eval_query.length; } else { @@ -8498,8 +8504,6 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags) dynstr_free(&ds_warnings); ds_warn= 0; - if (command->type == Q_EVAL || command->type == Q_SEND_EVAL) - dynstr_free(&eval_query); if (display_result_sorted) { diff --git a/cmake/CPackRPM.cmake b/cmake/CPackRPM.cmake new file mode 100644 index 00000000..1d22387d --- /dev/null +++ b/cmake/CPackRPM.cmake @@ -0,0 +1,16 @@ +# +# Wrapper for CPackRPM.cmake +# + +# load the original CPackRPM.cmake +set(orig_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}) +unset(CMAKE_MODULE_PATH) +include(CPackRPM) +set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH}) + +# per-component cleanup +foreach(_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLICTS AUTOPROV AUTOREQ AUTOREQPROV) + unset(TMP_RPM_${_RPM_SPEC_HEADER}) + unset(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP) +endforeach() + diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index a8439fca..03c6a03a 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -23,14 +23,14 @@ SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "shared") SET(CPACK_COMPONENT_COMMON_GROUP "common") SET(CPACK_COMPONENT_COMPAT_GROUP "compat") SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts - SupportFiles Development ManPagesDevelopment - ManPagesTest Readme ManPagesClient Test - Common Client SharedLibraries) + SupportFiles Development ManPagesDevelopment + ManPagesTest Readme ManPagesClient Test + Common Client SharedLibraries) SET(CPACK_RPM_PACKAGE_NAME "MariaDB") SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}") -SET(CPACK_RPM_PACKAGE_RELEASE 1) # FIX: add distribution name here +SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}") SET(CPACK_RPM_PACKAGE_LICENSE "GPL") SET(CPACK_RPM_PACKAGE_RELOCATABLE FALSE) SET(CPACK_RPM_PACKAGE_GROUP "Applications/Databases") @@ -94,55 +94,128 @@ SET(CPACK_RPM_compat_USER_FILELIST ${ignored}) SET(CPACK_RPM_devel_USER_FILELIST ${ignored}) SET(CPACK_RPM_test_USER_FILELIST ${ignored}) -SET(CPACK_RPM_client_PACKAGE_OBSOLETES "mysql-client MySQL-client MySQL-OurDelta-client") -SET(CPACK_RPM_client_PACKAGE_PROVIDES "MySQL-client mysql-client") +# "set/append array" - append a set of strings, separated by a space +MACRO(SETA var) + FOREACH(v ${ARGN}) + SET(${var} "${${var}} ${v}") + ENDFOREACH() +ENDMACRO(SETA) + +SETA(CPACK_RPM_client_PACKAGE_OBSOLETES + "mysql-client" + "MySQL-client" + "MySQL-OurDelta-client") +SETA(CPACK_RPM_client_PACKAGE_PROVIDES + "MySQL-client" + "mysql-client") + +SETA(CPACK_RPM_devel_PACKAGE_OBSOLETES + "MySQL-devel" + "MySQL-OurDelta-devel") +SETA(CPACK_RPM_devel_PACKAGE_PROVIDES + "MySQL-devel") + +SETA(CPACK_RPM_server_PACKAGE_OBSOLETES + "MariaDB" + "MySQL" + "mysql-server" + "MySQL-server" + "MySQL-OurDelta-server") +SETA(CPACK_RPM_server_PACKAGE_PROVIDES + "MariaDB" + "MySQL" + "MySQL-server" + "msqlormysql" + "mysql-server") + +SETA(CPACK_RPM_shared_PACKAGE_OBSOLETES + "mysql-shared" + "MySQL-shared-standard" + "MySQL-shared-pro" + "MySQL-shared-pro-cert" + "MySQL-shared-pro-gpl" + "MySQL-shared-pro-gpl-cert" + "MySQL-shared" + "MySQL-OurDelta-shared") +SETA(CPACK_RPM_shared_PACKAGE_PROVIDES + "MySQL-shared" + "mysql-shared") + +SETA(CPACK_RPM_test_PACKAGE_OBSOLETES + "MySQL-test" + "MySQL-OurDelta-test") +SETA(CPACK_RPM_test_PACKAGE_PROVIDES + "MySQL-test") -# this is a workaround for CPackRPM.cmake (as of 2.8.8) bug. -# If a package group does not specify OBSOLETES/REQUIRES the values of the -# previous (alphabetically) group will apply. -SET(CPACK_RPM_common_PACKAGE_OBSOLETES "MySQL-common") -SET(CPACK_RPM_common_PACKAGE_PROVIDES "MariaDB-common") - -SET(CPACK_RPM_devel_PACKAGE_OBSOLETES "mysql-devel MySQL-devel MySQL-OurDelta-devel") -SET(CPACK_RPM_devel_PACKAGE_PROVIDES "MySQL-devel mysql-devel") - -SET(CPACK_RPM_server_PACKAGE_OBSOLETES "MariaDB MySQL mysql-server MySQL-server MySQL-OurDelta-server") -SET(CPACK_RPM_server_PACKAGE_PROVIDES "MariaDB MySQL MySQL-server msqlormysql mysql-server") SET(CPACK_RPM_server_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-prein.sh) SET(CPACK_RPM_server_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-preun.sh) SET(CPACK_RPM_server_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-postin.sh) SET(CPACK_RPM_server_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-postun.sh) - -SET(CPACK_RPM_shared_PACKAGE_OBSOLETES "mysql-shared MySQL-shared-standard MySQL-shared-pro MySQL-shared-pro-cert MySQL-shared-pro-gpl MySQL-shared-pro-gpl-cert MySQL-shared MySQL-OurDelta-shared mysql-libs") -SET(CPACK_RPM_shared_PACKAGE_PROVIDES "MySQL-shared mysql-shared") - SET(CPACK_RPM_shared_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh) SET(CPACK_RPM_shared_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh) -SET(CPACK_RPM_test_PACKAGE_OBSOLETES "mysql-test MySQL-test MySQL-OurDelta-test") -SET(CPACK_RPM_test_PACKAGE_PROVIDES "MySQL-test mysql-test") - -# Argh! Different distributions call packages differently, to be a drop-in replacement -# we have to fake distribution-speficic dependencies MACRO(ALTERNATIVE_NAME real alt) + SET(ver "%{version}-%{release}") + IF (${epoch}) + SET(ver "${epoch}:${ver}") + ENDIF() + SET(p "CPACK_RPM_${real}_PACKAGE_PROVIDES") - SET(${p} "${${p}} ${alt} ${alt}(x86-32) ${alt}(x86-64) config(${alt})") + SET(${p} "${${p}} ${alt} = ${ver} ${alt}%{?_isa} = ${ver} config(${alt}) = ${ver}") SET(o "CPACK_RPM_${real}_PACKAGE_OBSOLETES") - SET(${o} "${${o}} ${alt}") + SET(${o} "${${o}} ${alt} ${alt}%{_isa}") ENDMACRO(ALTERNATIVE_NAME) +# Argh! Different distributions call packages differently, to be a drop-in +# replacement we have to fake distribution-speficic dependencies + +ALTERNATIVE_NAME("devel" "mysql-devel") +ALTERNATIVE_NAME("server" "mysql-server") +ALTERNATIVE_NAME("test" "mysql-test") + IF(RPM MATCHES "(rhel|centos)5") ALTERNATIVE_NAME("shared" "mysql") ELSEIF(RPM MATCHES "(rhel|centos)6") ALTERNATIVE_NAME("client" "mysql") ALTERNATIVE_NAME("shared" "mysql-libs") ELSEIF(RPM MATCHES "fedora") + SET(epoch 1) # this is fedora + ALTERNATIVE_NAME("client" "mariadb") ALTERNATIVE_NAME("client" "mysql") + ALTERNATIVE_NAME("devel" "mariadb-devel") + ALTERNATIVE_NAME("server" "mariadb-server") + ALTERNATIVE_NAME("shared" "mariadb-libs") ALTERNATIVE_NAME("shared" "mysql-libs") + ALTERNATIVE_NAME("test" "mariadb-test") + SET(CPACK_RPM_common_PACKAGE_CONFLICTS "mariadb-libs < 1:%{version}-%{release}") ENDIF() # workaround for lots of perl dependencies added by rpmbuild -SET(CPACK_RPM_test_PACKAGE_PROVIDES "${CPACK_RPM_test_PACKAGE_PROVIDES} perl(lib::mtr_gcov.pl) perl(lib::mtr_gprof.pl) perl(lib::mtr_io.pl) perl(lib::mtr_misc.pl) perl(lib::mtr_process.pl) perl(lib::v1/mtr_cases.pl) perl(lib::v1/mtr_gcov.pl) perl(lib::v1/mtr_gprof.pl) perl(lib::v1/mtr_im.pl) perl(lib::v1/mtr_io.pl) perl(lib::v1/mtr_match.pl) perl(lib::v1/mtr_misc.pl) perl(lib::v1/mtr_process.pl) perl(lib::v1/mtr_report.pl) perl(lib::v1/mtr_stress.pl) perl(lib::v1/mtr_timer.pl) perl(lib::v1/mtr_unique.pl) perl(mtr_cases) perl(mtr_io.pl) perl(mtr_match) perl(mtr_misc.pl) perl(mtr_report) perl(mtr_results) perl(mtr_unique)") +SETA(CPACK_RPM_test_PACKAGE_PROVIDES + "perl(lib::mtr_gcov.pl)" + "perl(lib::mtr_gprof.pl)" + "perl(lib::mtr_io.pl)" + "perl(lib::mtr_misc.pl)" + "perl(lib::mtr_process.pl)" + "perl(lib::v1/mtr_cases.pl)" + "perl(lib::v1/mtr_gcov.pl)" + "perl(lib::v1/mtr_gprof.pl)" + "perl(lib::v1/mtr_im.pl)" + "perl(lib::v1/mtr_io.pl)" + "perl(lib::v1/mtr_match.pl)" + "perl(lib::v1/mtr_misc.pl)" + "perl(lib::v1/mtr_process.pl)" + "perl(lib::v1/mtr_report.pl)" + "perl(lib::v1/mtr_stress.pl)" + "perl(lib::v1/mtr_timer.pl)" + "perl(lib::v1/mtr_unique.pl)" + "perl(mtr_cases)" + "perl(mtr_io.pl)" + "perl(mtr_match)" + "perl(mtr_misc.pl)" + "perl(mtr_report)" + "perl(mtr_results)" + "perl(mtr_unique)") # If we want to build build MariaDB-shared-compat, # extract compat libraries from MariaDB-shared-5.3 rpm @@ -170,7 +243,6 @@ IF (compat_rpm) ENDIF() ENDIF(compat_rpm) -SET(CPACK_RPM_compat_PACKAGE_REQUIRES "/bin/sh") # to mask CPACK_RPM_PACKAGE_REQUIRES SET(CPACK_RPM_compat_PACKAGE_PROVIDES "mysql-libs = 5.3.5") # exact version doesn't matter as long as it greater than 5.1 SET(CPACK_RPM_compat_PACKAGE_OBSOLETES "mysql-libs < 5.3.5") diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index b1af0bbd..7feba109 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -397,6 +397,7 @@ FUNCTION(INSTALL_MYSQL_TEST from to) PATTERN "*.vcxproj.filters" EXCLUDE PATTERN "*.vcxproj.user" EXCLUDE PATTERN "CTest" EXCLUDE + PATTERN "*~" EXCLUDE ) ENDIF() ENDFUNCTION() diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake index 83597357..c70d0e29 100644 --- a/cmake/zlib.cmake +++ b/cmake/zlib.cmake @@ -1,5 +1,4 @@ -# Copyright (c) 2009 Sun Microsystems, Inc. -# Use is subject to license terms. +# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/config.h.cmake b/config.h.cmake index 277d232c..3b5501ff 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -619,7 +619,7 @@ #cmakedefine DEFAULT_CHARSET_HOME "@DEFAULT_CHARSET_HOME@" #cmakedefine PLUGINDIR "@PLUGINDIR@" #cmakedefine DEFAULT_SYSCONFDIR "@DEFAULT_SYSCONFDIR@" -#cmakedefine DEFAULT_TMPDIR "@DEFAULT_TMPDIR@" +#cmakedefine DEFAULT_TMPDIR @DEFAULT_TMPDIR@ #cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@" diff --git a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt index 94a336c5..a5d5898e 100644 --- a/extra/yassl/CMakeLists.txt +++ b/extra/yassl/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/extra/yassl/include/yassl_error.hpp b/extra/yassl/include/yassl_error.hpp index a4b29ae2..beba7b0b 100644 --- a/extra/yassl/include/yassl_error.hpp +++ b/extra/yassl/include/yassl_error.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/extra/yassl/include/yassl_types.hpp b/extra/yassl/include/yassl_types.hpp index 6a8c3f6c..129661c5 100644 --- a/extra/yassl/include/yassl_types.hpp +++ b/extra/yassl/include/yassl_types.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/extra/yassl/src/handshake.cpp b/extra/yassl/src/handshake.cpp index d0f6827e..d99adf88 100644 --- a/extra/yassl/src/handshake.cpp +++ b/extra/yassl/src/handshake.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/extra/yassl/src/yassl_error.cpp b/extra/yassl/src/yassl_error.cpp index 2d42e82a..36e286a7 100644 --- a/extra/yassl/src/yassl_error.cpp +++ b/extra/yassl/src/yassl_error.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005, 2012, Oracle and/or its affiliates + Copyright (c) 2005, 2013, Oracle and/or its affiliates This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/extra/yassl/src/yassl_imp.cpp b/extra/yassl/src/yassl_imp.cpp index d9437751..b927a552 100644 --- a/extra/yassl/src/yassl_imp.cpp +++ b/extra/yassl/src/yassl_imp.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2005, 2012, Oracle and/or its affiliates + Copyright (c) 2005, 2013, Oracle and/or its affiliates This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/extra/yassl/taocrypt/CMakeLists.txt b/extra/yassl/taocrypt/CMakeLists.txt index 9f1f2a10..749193f1 100644 --- a/extra/yassl/taocrypt/CMakeLists.txt +++ b/extra/yassl/taocrypt/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/include/my_getopt.h b/include/my_getopt.h index 0f5898a0..e3318661 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2002, 2012, Oracle and/or its affiliates. + Copyright (c) 2002, 2013, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/include/my_global.h b/include/my_global.h index 000e5ff7..e5d46a08 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1514,11 +1514,4 @@ static inline double rint(double x) #endif /* EMBEDDED_LIBRARY */ -/* - Define default tmpdir if not already set. -*/ -#if !defined(DEFAULT_TMPDIR) -#define DEFAULT_TMPDIR P_tmpdir -#endif - #endif /* my_global_h */ diff --git a/include/my_net.h b/include/my_net.h index 78e01d4a..f8c4f99b 100644 --- a/include/my_net.h +++ b/include/my_net.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/include/my_pthread.h b/include/my_pthread.h index 869ad1ee..3a3f304d 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc, - 2010-2011 Oracle and/or its affiliates, 2009-2010 Monty Program Ab. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. + Copyright (c) 2009, 2013, Monty Program Ab. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -96,7 +96,7 @@ int pthread_create(pthread_t *, const pthread_attr_t *, pthread_handler, void *) int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr); int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex); int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, - struct timespec *abstime); + const struct timespec *abstime); int pthread_cond_signal(pthread_cond_t *cond); int pthread_cond_broadcast(pthread_cond_t *cond); int pthread_cond_destroy(pthread_cond_t *cond); diff --git a/include/my_valgrind.h b/include/my_valgrind.h index 31651f6c..4bd4cf99 100644 --- a/include/my_valgrind.h +++ b/include/my_valgrind.h @@ -13,10 +13,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -/* Some defines to make it easier to use valgrind */ -#include /* bfill */ - #ifdef HAVE_valgrind #define IF_VALGRIND(A,B) A #else @@ -37,7 +33,7 @@ #endif /* HAVE_VALGRIND */ #ifndef DBUG_OFF -#define TRASH_FILL(A,B,C) do { bfill(A, B, C); MEM_UNDEFINED(A, B); } while (0) +#define TRASH_FILL(A,B,C) do { memset(A, C, B); MEM_UNDEFINED(A, B); } while (0) #else #define TRASH_FILL(A,B,C) do{ MEM_CHECK_ADDRESSABLE(A,B);MEM_UNDEFINED(A,B);} while (0) #endif diff --git a/include/myisam.h b/include/myisam.h index cbb5229d..4ea40210 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2012, Oracle and/or its affiliates. + Copyright (c) 2000, 2013, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 74b37c5f..6b2dba46 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2005, 2011, Oracle and/or its affiliates - Copyright (C) 2009, 2011, Monty Program Ab +/* Copyright (c) 2005, 2013, Oracle and/or its affiliates + Copyright (C) 2009, 2013, Monty Program Ab This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/include/mysql/plugin_audit.h b/include/mysql/plugin_audit.h index 99f5744c..31589f07 100644 --- a/include/mysql/plugin_audit.h +++ b/include/mysql/plugin_audit.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/include/mysql/psi/mysql_thread.h b/include/mysql/psi/mysql_thread.h index 7615985e..f421f95c 100644 --- a/include/mysql/psi/mysql_thread.h +++ b/include/mysql/psi/mysql_thread.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -995,7 +995,7 @@ static inline int inline_mysql_cond_wait( static inline int inline_mysql_cond_timedwait( mysql_cond_t *that, mysql_mutex_t *mutex, - struct timespec *abstime + const struct timespec *abstime #if defined(HAVE_PSI_INTERFACE) || defined(SAFE_MUTEX) , const char *src_file, uint src_line #endif diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index 302f623e..875770ed 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. +/* Copyright (c) 2011, 2014, Oracle and/or its affiliates. Copyright (c) 2011, 2012, Monty Program Ab This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ #ifndef _welcome_copyright_notice_h_ #define _welcome_copyright_notice_h_ -#define COPYRIGHT_NOTICE_CURRENT_YEAR "2013" +#define COPYRIGHT_NOTICE_CURRENT_YEAR "2014" /* This define specifies copyright notice which is displayed by every MySQL diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 980f9288..13ccd5d7 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -1,4 +1,5 @@ -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. +# Copyright (c) 2009, 2013, SkySQL Ab. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,8 +26,6 @@ ADD_DEFINITIONS(${SSL_DEFINES}) SET(CLIENT_API_FUNCTIONS_5_1 get_tty_password -handle_options -load_defaults mysql_thread_end mysql_thread_init myodbc_remove_escape @@ -130,6 +129,12 @@ mysql_server_init mysql_server_end mysql_set_character_set mysql_get_character_set_info +# These are documented in Paul DuBois' MySQL book, +# so we treat them as part of the de-facto API. +handle_options +load_defaults +free_defaults +my_print_help ) SET(CLIENT_API_FUNCTIONS_5_5 @@ -152,6 +157,8 @@ mysql_close_cont mysql_close_start mysql_commit_cont mysql_commit_start +mysql_dump_debug_info_cont +mysql_dump_debug_info_start mysql_fetch_row_cont mysql_fetch_row_start mysql_free_result_cont @@ -238,73 +245,76 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux") # for compatibility with distribution packages, so client shared library can # painlessly replace the one supplied by the distribution. - # Also list of exported symbols in distributions may differ from what is considered - # official API. Define CLIENT_API_EXTRA for the set of symbols, that required to - # be exported on different platforms. + # Also list of exported symbols in distributions may differ from what is + # considered official API. Define CLIENT_API_5_1_EXTRA for the set of + # symbols, that required to be exported on different platforms. - IF(RPM) - # Fedora & Co declared following functions as part of API - SET(CLIENT_API_EXTRA - mysql_default_charset_info - mysql_get_charset - mysql_get_charset_by_csname - mysql_net_realloc - mysql_client_errors + # Fedora & Co declared following functions as part of API + SET(CLIENT_API_5_1_EXTRA + # why does Fedora export these? + _fini + _init + my_init - # Also export the non-renamed variants - # (in case someone wants to rebuild mysqli-php or something similar) - # See MDEV-4127 - default_charset_info - get_charset - get_charset_by_csname - net_realloc - client_errors - THR_KEY_mysys - ) - - # Add special script to fix symbols renames by Fedora - SET(CLIENT_SOURCES_EXTRA rpm_support.cc) - SET(VERSION_SCRIPT_TEMPLATE - ${CMAKE_CURRENT_SOURCE_DIR}/libmysql_rpm_version.in) - ELSEIF(DEB) - # libmyodbc on Ubuntu is using functions below - # If we don't export them, linker would just remove - # them (they are not used inside libmysqlclient) - SET(CLIENT_API_EXTRA - strfill - init_dynamic_string - ) - # MySQL supplied with Ubuntu does not have versioning, bug Debian does. - IF(DEB MATCHES "debian") - SET(VERSION_SCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/libmysql.ver.in) - ENDIF() - ENDIF() + # mysql-connector-odbc requires these + mysql_default_charset_info + mysql_get_charset + mysql_get_charset_by_csname + mysql_net_realloc - IF(VERSION_SCRIPT_TEMPLATE) - # Generate version script. - # Create semicolon separated lists of functions to export from - # Since RPM packages use separate versioning for 5.1 API - # and 5.5 API (libmysqlclient_16 vs libmysqlclient_18), - # we need 2 lists. - SET (CLIENT_API_5_1_LIST) - FOREACH (f ${CLIENT_API_FUNCTIONS_5_1}) - SET(CLIENT_API_5_1_LIST "${CLIENT_API_5_1_LIST}\n${f};") - ENDFOREACH() - - SET (CLIENT_API_5_5_LIST) - FOREACH (f ${CLIENT_API_FUNCTIONS_5_5}) - SET(CLIENT_API_5_5_LIST "${CLIENT_API_5_5_LIST}\n${f};") - ENDFOREACH() + # PHP's mysqli.so requires this (via the ER() macro) + mysql_client_errors + + # Also export the non-renamed variants + # (in case someone wants to rebuild mysqli-php or something similar) + # See MDEV-4127 + default_charset_info + get_charset + get_charset_by_csname + net_realloc + client_errors + + # pure-ftpd requires this + my_make_scrambled_password + + # hydra requires this + scramble + + # ODB requires this: https://bugzilla.redhat.com/show_bug.cgi?id=846602 + THR_KEY_mysys + + # DBD::mysql requires this + is_prefix + ) + + # Linker script to version symbols in Fedora- and Debian- compatible way, MDEV-5529 + SET(VERSION_SCRIPT_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/libmysql_versions.ld.in) + + # Generate version script. + # Create semicolon separated lists of functions to export from + # Since RPM packages use separate versioning for 5.1 API + # and 5.5 API (libmysqlclient_16 vs libmysqlclient_18), + # we need 2 lists. + SET (CLIENT_API_5_1_LIST) + SET (CLIENT_API_5_1_ALIASES) + FOREACH (f ${CLIENT_API_FUNCTIONS_5_1} ${CLIENT_API_5_1_EXTRA}) + SET(CLIENT_API_5_1_LIST "${CLIENT_API_5_1_LIST}\t${f};\n") + SET(CLIENT_API_5_1_ALIASES "${CLIENT_API_5_1_ALIASES}\"${f}@libmysqlclient_16\" = ${f};\n") + ENDFOREACH() + + SET (CLIENT_API_5_5_LIST) + FOREACH (f ${CLIENT_API_FUNCTIONS_5_5}) + SET(CLIENT_API_5_5_LIST "${CLIENT_API_5_5_LIST}\t${f};\n") + ENDFOREACH() + + CONFIGURE_FILE( + ${VERSION_SCRIPT_TEMPLATE} + ${CMAKE_CURRENT_BINARY_DIR}/libmysql_versions.ld + @ONLY@ + ) + SET(VERSION_SCRIPT_LINK_FLAGS + "-Wl,${CMAKE_CURRENT_BINARY_DIR}/libmysql_versions.ld") - CONFIGURE_FILE( - ${VERSION_SCRIPT_TEMPLATE} - ${CMAKE_CURRENT_BINARY_DIR}/libmysql.version - @ONLY@ - ) - SET(VERSION_SCRIPT_LINK_FLAGS - "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/libmysql.version") - ENDIF() - ENDIF() @@ -354,7 +364,7 @@ IF(UNIX) ENDIF() IF(NOT DISABLE_SHARED) - MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries) + MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} COMPONENT SharedLibraries) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) @@ -371,9 +381,6 @@ IF(NOT DISABLE_SHARED) SOVERSION "${SHARED_LIB_MAJOR_VERSION}") IF(LINK_FLAG_NO_UNDEFINED OR VERSION_SCRIPT_LINK_FLAGS) GET_TARGET_PROPERTY(libmysql_link_flags libmysql LINK_FLAGS) - IF(NOT libmysql_link_flag) - SET(libmysql_link_flags) - ENDIF() SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED} ${VERSION_SCRIPT_LINK_FLAGS}") ENDIF() diff --git a/libmysql/conf_to_src.c b/libmysql/conf_to_src.c index 04a6a727..a5a7d23d 100644 --- a/libmysql/conf_to_src.c +++ b/libmysql/conf_to_src.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2004 MySQL AB +/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 242144ab..e66a7574 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2012, Oracle and/or its affiliates - Copyright (c) 2009, 2012, Monty Program Ab +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates + Copyright (c) 2009, 2013, Monty Program Ab This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/libmysql/libmysql.ver.in b/libmysql/libmysql.ver.in deleted file mode 100644 index 20eb0fd4..00000000 --- a/libmysql/libmysql.ver.in +++ /dev/null @@ -1 +0,0 @@ -libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; }; diff --git a/libmysql/libmysql_rpm_version.in b/libmysql/libmysql_rpm_version.in deleted file mode 100644 index ff0707cd..00000000 --- a/libmysql/libmysql_rpm_version.in +++ /dev/null @@ -1,62 +0,0 @@ -# This version script is heavily inspired by Fedora's and Mageia's version scripts for -# MySQL client shared library. It is used in MariaDB for building RPMs. - -libmysqlclient_16 { - global: -@CLIENT_API_5_1_LIST@ - -# some stuff from Mageia, I have no idea why it is there -# But too afraid to throw anything away - _fini; - _init; - my_init; - my_progname; - myodbc_remove_escape; - -# These are documented in Paul DuBois' MySQL book, so we treat them as part -# of the de-facto API. - free_defaults; - handle_options; - load_defaults; - my_print_help; -# pure-ftpd requires this - my_make_scrambled_password; -# fedora18 export - THR_KEY_mysys; -# hydra requires this - scramble; -# DBD::mysql requires this - is_prefix; - local: - *; -}; - -libmysqlclient_18 { - global: - @CLIENT_API_5_5_LIST@ -# -# Ideally the following symbols wouldn't be exported, but various applications -# require them. Fedora limits the namespace damage by prefixing mysql_ -# (see mysql-dubious-exports.patch), which means the symbols are not present -# in libmysqlclient_16. -# -# MariaDB does not do the Fedora-style function renaming via #define in headers, -# however it exports mysql_ prefixed symbols in addition to the "normal" ones. -# -# To ensure successful recompilation of affected projects, as well as drop-in replacement -# for MySQL libraries, provided by distribution, both original symbols and their mysql_ -# prefixed counterparts have to be exported. - -# mysql-connector-odbc requires these - mysql_default_charset_info; - mysql_get_charset; - mysql_get_charset_by_csname; - mysql_net_realloc; - default_charset_info; - get_charset; - get_charset_by_csname; - net_realloc; -# PHP's mysqli.so requires this (via the ER() macro) - mysql_client_errors; - client_errors; -}; diff --git a/libmysql/libmysql_versions.ld.in b/libmysql/libmysql_versions.ld.in new file mode 100644 index 00000000..8d97da5b --- /dev/null +++ b/libmysql/libmysql_versions.ld.in @@ -0,0 +1,45 @@ +/* + This version script is heavily inspired by Fedora's and Mageia's version + scripts for MySQL client shared library. + But it was modified to support Debian-compatible versioning too. + + In RedHat universe, symbols from old libmysqlclient.so.16 + keep their libmysqlclient_16 version. New symbols added in + libmysqlclient.so.18 get the new libmysqlclient_18 version. + + In Debian all symbols in libmysqlclient.so.18 have libmysqlclient_18 version, + including symbols that existed in libmysqlclient.so.16 + + We solve this by putting all symbols into libmysqlclient_18 version node, + but creating aliases for old symbols in the libmysqlclient_16 version node. +*/ + +@CLIENT_API_5_1_ALIASES@ + +/* + On Fedora the following symbols are exported, but renamed into a mysql_ + namespace. We export them as aliases, but keep original symbols too. See + MDEV-4127. +*/ +mysql_default_charset_info = default_charset_info; +mysql_get_charset = get_charset; +mysql_get_charset_by_csname = get_charset_by_csname; +mysql_net_realloc = net_realloc; +mysql_client_errors = client_errors; + +VERSION { + +libmysqlclient_18 { + global: +@CLIENT_API_5_1_LIST@ +@CLIENT_API_5_5_LIST@ + + local: + *; +}; + +libmysqlclient_16 { + /* empty here. aliases are added above */ +}; + +} diff --git a/libmysql/rpm_support.cc b/libmysql/rpm_support.cc deleted file mode 100644 index 8c9a1e86..00000000 --- a/libmysql/rpm_support.cc +++ /dev/null @@ -1,41 +0,0 @@ -/* - Provide aliases for several symbols, to support drop-in replacement for - MariaDB on Fedora and several derives distributions. - - These distributions redefine several symbols (in a way that is no compatible - with either MySQL or MariaDB) and export it from the client library ( as seen - e.g from this patch) -http://lists.fedoraproject.org/pipermail/scm-commits/2010-December/537257.html - - MariaDB handles compatibility distribution by providing the same symbols from - the client library if it is built with -DRPM - -*/ -#include -#include -#include -extern "C" { - -CHARSET_INFO *mysql_default_charset_info = default_charset_info; - -CHARSET_INFO *mysql_get_charset(uint cs_number, myf flags) -{ - return get_charset(cs_number, flags); -} - -CHARSET_INFO *mysql_get_charset_by_csname(const char *cs_name, - uint cs_flags, myf my_flags) -{ - return get_charset_by_csname(cs_name, cs_flags, my_flags); -} - - -my_bool mysql_net_realloc(NET *net, size_t length) -{ - return net_realloc(net,length); -} - -const char **mysql_client_errors = client_errors; - -} /*extern "C" */ - diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 1b632213..8d694a4a 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -561,7 +561,7 @@ int init_embedded_server(int argc, char **argv, char **groups) opt_mysql_tmpdir=getenv("TMP"); #endif if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0]) - opt_mysql_tmpdir=(char*) DEFAULT_TMPDIR; /* purecov: inspected */ + opt_mysql_tmpdir= const_cast(DEFAULT_TMPDIR); /* purecov: inspected*/ init_ssl(); umask(((~my_umask) & 0666)); diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt index 227e4903..2948fb88 100644 --- a/mysql-test/CMakeLists.txt +++ b/mysql-test/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/mysql-test/collections/default.weekly b/mysql-test/collections/default.weekly index 40f0548f..a03e2593 100755 --- a/mysql-test/collections/default.weekly +++ b/mysql-test/collections/default.weekly @@ -5,3 +5,6 @@ perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --skip-test-list=collections/disabled-weekly.list perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-row-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=row --skip-test-list=collections/disabled-weekly.list perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-mixed-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-weekly.list + +# Run innodb compression tests +perl mysql-test-run.pl --force --debug-server --comment=innodb_compression --vardir=var-innodb-zip --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --suite=innodb_zip diff --git a/mysql-test/extra/rpl_tests/rpl_ddl.test b/mysql-test/extra/rpl_tests/rpl_ddl.test index 3b0348cc..32fc1047 100644 --- a/mysql-test/extra/rpl_tests/rpl_ddl.test +++ b/mysql-test/extra/rpl_tests/rpl_ddl.test @@ -608,6 +608,7 @@ use test; --echo --echo -------- switch to master ------- connection master; +DROP TEMPORARY TABLE mysqltest1.t22; DROP DATABASE mysqltest1; # mysqltest2 was alreday DROPPED some tests before. DROP DATABASE mysqltest3; diff --git a/mysql-test/include/ctype_filesort2.inc b/mysql-test/include/ctype_filesort2.inc index 7b09eb48..7b576034 100644 --- a/mysql-test/include/ctype_filesort2.inc +++ b/mysql-test/include/ctype_filesort2.inc @@ -14,3 +14,12 @@ SELECT HEX(a), HEX(CONVERT(a USING utf8mb4)) FROM t1 ORDER BY a; ALTER TABLE t1 ADD KEY(a); SELECT HEX(a), HEX(CONVERT(a USING utf8mb4)) FROM t1 ORDER BY a; DROP TABLE IF EXISTS t1; +--echo # +--echo # BUG#16691598 - ORDER BY LOWER(COLUMN) PRODUCES +--echo # OUT-OF-ORDER RESULTS +--echo # +CREATE TABLE t1 SELECT ('a a') as n; +INSERT INTO t1 VALUES('a b'); +SELECT * FROM t1 ORDER BY LOWER(n) ASC; +SELECT * FROM t1 ORDER BY LOWER(n) DESC; +DROP TABLE t1; diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql index e0d4f407..7f990431 100644 --- a/mysql-test/include/mtr_check.sql +++ b/mysql-test/include/mtr_check.sql @@ -1,4 +1,5 @@ --- Copyright (c) 2008, 2011, Oracle and/or its affiliates +-- Copyright (c) 2008, 2013, Oracle and/or its affiliates +-- Copyright (c) 2009, 2013, SkySQL Ab -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -55,6 +56,16 @@ BEGIN WHERE table_schema='mysql' AND table_name != 'ndb_apply_status' ORDER BY columns_in_mysql; + -- Dump all events, there should be none + SELECT * FROM INFORMATION_SCHEMA.EVENTS; + -- Dump all triggers except mtr internals, there should be none + SELECT * FROM INFORMATION_SCHEMA.TRIGGERS + WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert'); + -- Dump all created procedures, there should be none + SELECT * FROM INFORMATION_SCHEMA.ROUTINES; + + SHOW STATUS LIKE 'slave_open_temp_tables'; + -- Checksum system tables to make sure they have been properly -- restored after test checksum table @@ -81,7 +92,5 @@ BEGIN select * from information_schema.session_variables where variable_name = 'debug_sync'; - show status like 'slave_open_temp_tables'; - END|| diff --git a/mysql-test/lib/My/SafeProcess/safe_process.cc b/mysql-test/lib/My/SafeProcess/safe_process.cc index 007acf77..f19ca622 100644 --- a/mysql-test/lib/My/SafeProcess/safe_process.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2011, Oracle and/or its affiliates +/* Copyright (c) 2008, 2012, Oracle and/or its affiliates This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysql-test/lib/My/SysInfo.pm b/mysql-test/lib/My/SysInfo.pm index 36c50ab9..4cca1166 100644 --- a/mysql-test/lib/My/SysInfo.pm +++ b/mysql-test/lib/My/SysInfo.pm @@ -1,6 +1,5 @@ # -*- cperl -*- -# Copyright (c) 2013 MySQL AB, 2008 Sun Microsystems, Inc. -# Use is subject to license terms. +# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d909391f..2e0ad39e 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -173,6 +173,7 @@ my @DEFAULT_SUITES= qw( handler- heap- innodb- + innodb_zip- maria- optimizer_unfixed_bugs- oqgraph- diff --git a/mysql-test/r/comments.result b/mysql-test/r/comments.result index 8aebe95c..3a752221 100644 --- a/mysql-test/r/comments.result +++ b/mysql-test/r/comments.result @@ -38,11 +38,14 @@ select 1 /*M!50300 +1 */; select 2 /*M!99999 +1 */; 2 2 +select 2 /*M!100000 +1 */; +2 +2 select 2 /*M!0000 +1 */; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '0000 +1 */' at line 1 select 1/*!2*/; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '2*/' at line 1 -select 1/*!000002*/; +select 1/*!0000002*/; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '2*/' at line 1 select 1/*!999992*/; 1 diff --git a/mysql-test/r/ctype_utf16.result b/mysql-test/r/ctype_utf16.result index a1bd49d1..5d70764f 100644 --- a/mysql-test/r/ctype_utf16.result +++ b/mysql-test/r/ctype_utf16.result @@ -671,6 +671,21 @@ FF9D EFBE9D D800DF84 F0908E84 DBC0DC00 F4808080 DROP TABLE IF EXISTS t1; +# +# BUG#16691598 - ORDER BY LOWER(COLUMN) PRODUCES +# OUT-OF-ORDER RESULTS +# +CREATE TABLE t1 SELECT ('a a') as n; +INSERT INTO t1 VALUES('a b'); +SELECT * FROM t1 ORDER BY LOWER(n) ASC; +n +a a +a b +SELECT * FROM t1 ORDER BY LOWER(n) DESC; +n +a b +a a +DROP TABLE t1; select @@collation_connection; @@collation_connection utf16_bin diff --git a/mysql-test/r/ctype_utf32.result b/mysql-test/r/ctype_utf32.result index a46bcb33..92327821 100644 --- a/mysql-test/r/ctype_utf32.result +++ b/mysql-test/r/ctype_utf32.result @@ -670,6 +670,21 @@ HEX(a) HEX(CONVERT(a USING utf8mb4)) 00010384 F0908E84 00100000 F4808080 DROP TABLE IF EXISTS t1; +# +# BUG#16691598 - ORDER BY LOWER(COLUMN) PRODUCES +# OUT-OF-ORDER RESULTS +# +CREATE TABLE t1 SELECT ('a a') as n; +INSERT INTO t1 VALUES('a b'); +SELECT * FROM t1 ORDER BY LOWER(n) ASC; +n +a a +a b +SELECT * FROM t1 ORDER BY LOWER(n) DESC; +n +a b +a a +DROP TABLE t1; select @@collation_connection; @@collation_connection utf32_bin diff --git a/mysql-test/r/ctype_utf8mb4.result b/mysql-test/r/ctype_utf8mb4.result index f1da956c..64556308 100644 --- a/mysql-test/r/ctype_utf8mb4.result +++ b/mysql-test/r/ctype_utf8mb4.result @@ -1046,6 +1046,21 @@ EFBE9D EFBE9D F0908E84 F0908E84 F4808080 F4808080 DROP TABLE IF EXISTS t1; +# +# BUG#16691598 - ORDER BY LOWER(COLUMN) PRODUCES +# OUT-OF-ORDER RESULTS +# +CREATE TABLE t1 SELECT ('a a') as n; +INSERT INTO t1 VALUES('a b'); +SELECT * FROM t1 ORDER BY LOWER(n) ASC; +n +a a +a b +SELECT * FROM t1 ORDER BY LOWER(n) DESC; +n +a b +a a +DROP TABLE t1; select @@collation_connection; @@collation_connection utf8mb4_bin diff --git a/mysql-test/r/derived_view.result b/mysql-test/r/derived_view.result index 9a70bfff..9cd86fbe 100644 --- a/mysql-test/r/derived_view.result +++ b/mysql-test/r/derived_view.result @@ -2253,7 +2253,7 @@ EXPLAIN EXTENDED SELECT a FROM v1 WHERE a > 100 ORDER BY b; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables Warnings: -Note 1003 select 4 AS `a` from dual where (4 > 100) order by 1 +Note 1003 select 4 AS `a` from dual where 0 order by 1 DROP VIEW v1; DROP TABLE t1; CREATE TABLE IF NOT EXISTS `galleries` ( diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result index 1ba078c1..a91e9604 100644 --- a/mysql-test/r/distinct.result +++ b/mysql-test/r/distinct.result @@ -999,4 +999,44 @@ c 11112222 33334444 DROP TABLE t1; +# +# Bug#16539979 BASIC SELECT COUNT(DISTINCT ID) IS BROKEN. +# Bug#17867117 ERROR RESULT WHEN "COUNT + DISTINCT + CASE WHEN" NEED MERGE_WALK +# +SET @tmp_table_size_save= @@tmp_table_size; +SET @@tmp_table_size= 1024; +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8); +INSERT INTO t1 SELECT a+8 FROM t1; +INSERT INTO t1 SELECT a+16 FROM t1; +INSERT INTO t1 SELECT a+32 FROM t1; +INSERT INTO t1 SELECT a+64 FROM t1; +INSERT INTO t1 VALUE(NULL); +SELECT COUNT(DISTINCT a) FROM t1; +COUNT(DISTINCT a) +128 +SELECT COUNT(DISTINCT (a+0)) FROM t1; +COUNT(DISTINCT (a+0)) +128 +DROP TABLE t1; +create table tb( +id int auto_increment primary key, +v varchar(32)) +engine=myisam charset=gbk; +insert into tb(v) values("aaa"); +insert into tb(v) (select v from tb); +insert into tb(v) (select v from tb); +insert into tb(v) (select v from tb); +insert into tb(v) (select v from tb); +insert into tb(v) (select v from tb); +insert into tb(v) (select v from tb); +update tb set v=concat(v, id); +select count(distinct case when id<=64 then id end) from tb; +count(distinct case when id<=64 then id end) +64 +select count(distinct case when id<=63 then id end) from tb; +count(distinct case when id<=63 then id end) +63 +drop table tb; +SET @@tmp_table_size= @tmp_table_size_save; End of 5.5 tests diff --git a/mysql-test/r/error_simulation.result b/mysql-test/r/error_simulation.result index d2f5a24e..8c16ebf4 100644 --- a/mysql-test/r/error_simulation.result +++ b/mysql-test/r/error_simulation.result @@ -94,7 +94,7 @@ INSERT INTO t1 VALUES (1),(2); INSERT INTO t2 VALUES (1),(2); SET SESSION debug_dbug="+d,bug11747970_raise_error"; INSERT IGNORE INTO t2 SELECT f1 FROM t1 a WHERE NOT EXISTS (SELECT 1 FROM t2 b WHERE a.f1 = b.f1); -ERROR HY000: Unknown error +ERROR 70100: Query execution was interrupted SET SESSION debug_dbug = DEFAULT; DROP TABLE t1,t2; # diff --git a/mysql-test/r/events_trans.result b/mysql-test/r/events_trans.result index 37951c30..08458707 100644 --- a/mysql-test/r/events_trans.result +++ b/mysql-test/r/events_trans.result @@ -135,3 +135,4 @@ SELECT * FROM t2; a ROLLBACK WORK TO SAVEPOINT A; DROP TABLE t1, t2; +DROP EVENT e1; diff --git a/mysql-test/r/func_compress.result b/mysql-test/r/func_compress.result index c2f1e5bf..011dec4d 100644 --- a/mysql-test/r/func_compress.result +++ b/mysql-test/r/func_compress.result @@ -102,7 +102,6 @@ a foo Warnings: Warning 1259 ZLIB: Input data corrupted -Warning 1259 ZLIB: Input data corrupted explain select *, uncompress(a) from t1; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 system NULL NULL NULL NULL 1 diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result index 8e50c045..8e2bdeae 100644 --- a/mysql-test/r/func_group.result +++ b/mysql-test/r/func_group.result @@ -1458,6 +1458,8 @@ DROP TABLE derived1; DROP TABLE D; CREATE TABLE t1 (a INT, b INT); INSERT INTO t1 VALUES (1,1), (1,2), (1,3); +CREATE TABLE t2 (b INT); +INSERT INTO t2 VALUES (3),(4); SET SQL_MODE='ONLY_FULL_GROUP_BY'; SELECT COUNT(*) FROM t1; COUNT(*) @@ -1473,12 +1475,19 @@ COUNT(*) SELECT COUNT(*), (SELECT count(*) FROM t1 inr WHERE inr.a = outr.a) FROM t1 outr; ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause +SELECT COUNT(*) FROM t1 outr, (SELECT b, count(*) FROM t2) as t3; +ERROR 42000: Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause +SELECT COUNT(*) FROM t1 outr where (1,1) in (SELECT a, count(*) FROM t2); +COUNT(*) +0 SELECT COUNT(*) FROM t1 a JOIN t1 outr ON a.a= (SELECT count(*) FROM t1 inr WHERE inr.a = outr.a); COUNT(*) 0 +SELECT * FROM (SELECT a FROM t1 GROUP BY a) sq JOIN t2 ON a = b; +a b SET SQL_MODE=default; -DROP TABLE t1; +DROP TABLE t1,t2; End of 5.0 tests # # BUG#47280 - strange results from count(*) with order by multiple diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index 55b0f9d3..34bab225 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -264,6 +264,13 @@ INET_NTOA(0) SELECT '1' IN ('1', INET_NTOA(0)); '1' IN ('1', INET_NTOA(0)) 1 +SELECT NAME_CONST('a', -(1 OR 2)) OR 1; +ERROR HY000: Incorrect arguments to NAME_CONST +SELECT NAME_CONST('a', -(1 AND 2)) AND 1; +ERROR HY000: Incorrect arguments to NAME_CONST +SELECT NAME_CONST('a', -(1)) OR 1; +NAME_CONST('a', -(1)) OR 1 +1 # # Bug #52165: Assertion failed: file .\dtoa.c, line 465 # @@ -340,6 +347,3 @@ drop table t1,tv; # # End of 5.5 tests # -# -# End of tests -# diff --git a/mysql-test/r/func_regexp.result b/mysql-test/r/func_regexp.result index 78b8e5d9..f405a229 100644 --- a/mysql-test/r/func_regexp.result +++ b/mysql-test/r/func_regexp.result @@ -52,7 +52,7 @@ explain extended select * from t1 where xxx regexp('is a test of some long text id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 system NULL NULL NULL NULL 1 100.00 Warnings: -Note 1003 select 'this is a test of some long text to see what happens' AS `xxx` from dual where ('this is a test of some long text to see what happens' regexp 'is a test of some long text to') +Note 1003 select 'this is a test of some long text to see what happens' AS `xxx` from dual where 1 select * from t1 where xxx regexp('is a test of some long text to '); xxx this is a test of some long text to see what happens diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index a588d89b..b1750df3 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -1153,7 +1153,6 @@ str num notnumber 0 Warnings: Warning 1292 Truncated incorrect DOUBLE value: 'notnumber' -Warning 1292 Truncated incorrect DOUBLE value: 'notnumber' SELECT * FROM t1, t2 WHERE num=substring(str from 1 for 6); str num notnumber 0 diff --git a/mysql-test/r/gis-precise.result b/mysql-test/r/gis-precise.result index 3b07be39..71eed65b 100644 --- a/mysql-test/r/gis-precise.result +++ b/mysql-test/r/gis-precise.result @@ -452,3 +452,6 @@ ST_NUMPOINTS(ST_EXTERIORRING(ST_BUFFER( POLYGONFROMTEXT( 'POLYGON( ( 0.0 -3.0, 0.0 -3.0 ))' ), 136 +select astext(buffer(st_linestringfromwkb(linestring(point(-1,1), point(-1,-2))),-1)); +astext(buffer(st_linestringfromwkb(linestring(point(-1,1), point(-1,-2))),-1)) +GEOMETRYCOLLECTION EMPTY diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index eb9f1a57..c00f07e7 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -1574,6 +1574,27 @@ SELECT 1 FROM g1 WHERE a >= ANY 1 DROP TABLE g1; # +# Bug#16451878 GEOMETRY QUERY CRASHES SERVER +# +# should not crash +SELECT ASTEXT(0x0100000000030000000100000000000010); +ASTEXT(0x0100000000030000000100000000000010) +NULL +#should not crash +SELECT ENVELOPE(0x0100000000030000000100000000000010); +ENVELOPE(0x0100000000030000000100000000000010) +NULL +#should not crash +SELECT +GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffff0000, 1); +GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffff0000, 1) +NULL +#should not crash +SELECT +GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1); +GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1) +NULL +# # MDEV-3819 missing constraints for spatial column types # create table t1 (pt point); diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result index 4a806e08..e303c288 100644 --- a/mysql-test/r/join_outer.result +++ b/mysql-test/r/join_outer.result @@ -1311,7 +1311,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 system NULL NULL NULL NULL 1 100.00 1 SIMPLE t2 system NULL NULL NULL NULL 1 100.00 Warnings: -Note 1003 select 1 AS `f1`,NULL AS `f2`,3 AS `f3`,NULL AS `f1`,NULL AS `f2` from `test`.`t2` where ((coalesce(1,NULL),3) in ((1,3),(2,2))) +Note 1003 select 1 AS `f1`,NULL AS `f2`,3 AS `f3`,NULL AS `f1`,NULL AS `f2` from `test`.`t2` where 1 SELECT * FROM t1 LEFT JOIN t2 ON t1.f2 = t2.f2 WHERE (COALESCE(t1.f1, t2.f1), f3) IN ((1, 3), (2, 2)); f1 f2 f3 f1 f2 diff --git a/mysql-test/r/join_outer_jcl6.result b/mysql-test/r/join_outer_jcl6.result index 6a543f92..88f2fd7c 100644 --- a/mysql-test/r/join_outer_jcl6.result +++ b/mysql-test/r/join_outer_jcl6.result @@ -1322,7 +1322,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 system NULL NULL NULL NULL 1 100.00 1 SIMPLE t2 system NULL NULL NULL NULL 1 100.00 Warnings: -Note 1003 select 1 AS `f1`,NULL AS `f2`,3 AS `f3`,NULL AS `f1`,NULL AS `f2` from `test`.`t2` where ((coalesce(1,NULL),3) in ((1,3),(2,2))) +Note 1003 select 1 AS `f1`,NULL AS `f2`,3 AS `f3`,NULL AS `f1`,NULL AS `f2` from `test`.`t2` where 1 SELECT * FROM t1 LEFT JOIN t2 ON t1.f2 = t2.f2 WHERE (COALESCE(t1.f1, t2.f1), f3) IN ((1, 3), (2, 2)); f1 f2 f3 f1 f2 diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 16da8eae..10e297ba 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -1029,7 +1029,7 @@ port 3306 port-open-timeout 0 preload-buffer-size 32768 profiling-history-size 15 -progress-report-time 56 +progress-report-time 5 query-alloc-block-size 8192 query-cache-limit 1048576 query-cache-min-res-unit 4096 diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 3a9cff4e..af1fe4a0 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -5264,6 +5264,20 @@ slow_log CREATE TABLE `slow_log` ( SET @@global.log_output= @old_log_output_state; SET @@global.slow_query_log= @old_slow_query_log_state; SET @@global.general_log= @old_general_log_state; +# MDEV-5481 mysqldump fails to dump geometry types properly +create table t1 (g GEOMETRY) CHARSET koi8r; +create table t2 (g GEOMETRY) CHARSET koi8r; +insert into t1 values (point(1,1)), (point(2,2)); +################################################## +\0\0\0\0\0\0\0\0\0\0\0\0\0ð?\0\0\0\0\0\0ð? +\0\0\0\0\0\0\0\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@ +################################################## +LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET koi8r; +select astext(g) from t2; +astext(g) +POINT(1 1) +POINT(2 2) +drop table t1, t2; # # End of 5.1 tests # diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index c1cbbffd..521d31ae 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -2493,3 +2493,70 @@ i 3 4 DROP TABLE t1; +# +# MDEV-5177: ha_partition and innodb index intersection produce fewer rows (MySQL Bug#70703) +# +create table t1 ( +a int not null, +b int not null, +pk int not null, +primary key (pk), +key(a), +key(b) +) partition by hash(pk) partitions 10; +insert into t1 values (1,2,4); +insert into t1 values (1,0,17); +insert into t1 values (1,2,25); +insert into t1 values (10,20,122); +insert into t1 values (10,20,123); +create table t2 (a int); +insert into t2 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); +insert into t1 select 1,2, 200 + A.a + 10*B.a + 100*C.a from t2 A, t2 B, t2 C; +insert into t1 select 10+A.a + 10*B.a + 100*C.a + 1000*D.a, +10+A.a + 10*B.a + 100*C.a + 1000*D.a, +2000 + A.a + 10*B.a + 100*C.a + 1000*D.a +from t2 A, t2 B, t2 C ,t2 D; +explain select * from t1 where a=1 and b=2 and pk between 1 and 999999 ; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ref PRIMARY,a,b b 4 const 982 Using where +create temporary table t3 as +select * from t1 where a=1 and b=2 and pk between 1 and 999 ; +select count(*) from t3; +count(*) +802 +drop table t3; +create temporary table t3 as +select * from t1 ignore index(a,b) where a=1 and b=2 and pk between 1 and 999 ; +select count(*) from t3; +count(*) +802 +drop table t3; +drop table t1,t2; +# +# MDEV-5555: Incorrect index_merge on BTREE indices +# +CREATE TABLE t1 ( +id bigint(20) unsigned NOT NULL, +id2 bigint(20) unsigned NOT NULL, +dob date DEFAULT NULL, +address char(100) DEFAULT NULL, +city char(35) DEFAULT NULL, +hours_worked_per_week smallint(5) unsigned DEFAULT NULL, +weeks_worked_last_year tinyint(3) unsigned DEFAULT NULL, +KEY dob (dob), +KEY address (address), +KEY city (city), +KEY hours_worked_per_week (hours_worked_per_week), +KEY weeks_worked_last_year (weeks_worked_last_year) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +PARTITION BY KEY (id) PARTITIONS 5; +# Insert some rows +select * from t1 where hours_worked_per_week = 40 and weeks_worked_last_year = 52 and dob < '1949-11-21'; +id id2 dob address city hours_worked_per_week weeks_worked_last_year +16 16 1949-11-07 address16 city16 40 52 +50 50 1923-09-08 address50 city50 40 52 +select * from t1 IGNORE INDEX(dob, weeks_worked_last_year, hours_worked_per_week) where hours_worked_per_week = 40 and weeks_worked_last_year = 52 and dob < '1949-11-21'; +id id2 dob address city hours_worked_per_week weeks_worked_last_year +16 16 1949-11-07 address16 city16 40 52 +50 50 1923-09-08 address50 city50 40 52 +drop table t1; diff --git a/mysql-test/r/partition_order.result b/mysql-test/r/partition_order.result index 78ff7cd3..06c1b63a 100644 --- a/mysql-test/r/partition_order.result +++ b/mysql-test/r/partition_order.result @@ -752,8 +752,8 @@ select * from t1 force index (b) where b < 10 ORDER BY b DESC; a b 6 6 4 5 -2 4 30 4 +2 4 3 3 35 2 7 1 diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index cc348e84..1438595a 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -4019,4 +4019,36 @@ c1 NULL 2 DROP TABLE t1,t2; +# +# MDEV-5369: Wrong result (0 instead of NULL) on 2nd execution of +# PS with LEFT JOIN, TEMPTABLE view +# +CREATE TABLE t1 (a INT) ENGINE=MyISAM; +INSERT INTO t1 VALUES (0),(8); +CREATE TABLE t2 (pk INT PRIMARY KEY) ENGINE=MyISAM; +CREATE ALGORITHM=TEMPTABLE VIEW v2 AS SELECT * FROM t2; +SELECT SUM(pk) FROM t1 LEFT JOIN v2 ON a = pk; +SUM(pk) +NULL +PREPARE stmt FROM "SELECT SUM(pk) FROM t1 LEFT JOIN v2 ON a = pk"; +EXECUTE stmt; +SUM(pk) +NULL +EXECUTE stmt; +SUM(pk) +NULL +DEALLOCATE PREPARE stmt; +DROP VIEW v2; +DROP TABLE t1, t2; +# End of 5.3 tests +# +# MDEV-5505: Assertion `! is_set()' fails on PREPARE SELECT +# with out of range in GROUP BY +# +CREATE TABLE t1 (a INT); +PREPARE stmt FROM "SELECT 1 FROM t1 GROUP BY 0 OR 18446744073709551615+1"; +ERROR 22003: BIGINT UNSIGNED value is out of range in '(18446744073709551615 + 1)' +SELECT 1 FROM t1 GROUP BY 0 OR 18446744073709551615+1; +ERROR 22003: BIGINT UNSIGNED value is out of range in '(18446744073709551615 + 1)' +drop table t1; # End of 5.3 tests diff --git a/mysql-test/r/rpl_mysqldump_slave.result b/mysql-test/r/rpl_mysqldump_slave.result index 1b13ebb7..6ff7ca23 100644 --- a/mysql-test/r/rpl_mysqldump_slave.result +++ b/mysql-test/r/rpl_mysqldump_slave.result @@ -11,4 +11,11 @@ START SLAVE; STOP SLAVE; CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_MYPORT, MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START; START SLAVE; +slave start; +Warnings: +Note 1254 Slave is already running +CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START; +slave start; +Warnings: +Note 1254 Slave is already running include/rpl_end.inc diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index f465f5f2..cff5caf7 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -5315,7 +5315,7 @@ SELECT * FROM t1 WHERE (1=2 OR t1.pk=2) AND t1.a <> 0; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables Warnings: -Note 1003 select 2 AS `pk`,0 AS `a` from `test`.`t1` where (0 <> 0) +Note 1003 select 2 AS `pk`,0 AS `a` from `test`.`t1` where 0 DROP TABLE t1; SELECT * FROM mysql.time_zone WHERE ( NOT (Use_leap_seconds <= Use_leap_seconds AND Time_zone_id != 1) @@ -5338,7 +5338,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 system idx NULL NULL NULL 1 100.00 1 SIMPLE t2 ref idx idx 5 const 1 100.00 Using index Warnings: -Note 1003 select 8 AS `a`,8 AS `b`,`test`.`t2`.`c` AS `c` from `test`.`t2` where ((`test`.`t2`.`c` = 8) and 1) +Note 1003 select 8 AS `a`,8 AS `b`,`test`.`t2`.`c` AS `c` from `test`.`t2` where (`test`.`t2`.`c` = 8) SELECT * FROM t1 INNER JOIN t2 ON ( c = a ) WHERE 1 IS NULL OR b < 33 AND b = c; a b c @@ -5462,7 +5462,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t2 system PRIMARY NULL NULL NULL 1 100.00 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`pk1` AS `pk1`,`test`.`t1`.`a1` AS `a1`,`test`.`t1`.`b1` AS `b1`,1 AS `pk2`,1 AS `a2` from `test`.`t1` where ((`test`.`t1`.`a1` = 1) and ((`test`.`t1`.`b1` = 6) or 0)) +Note 1003 select `test`.`t1`.`pk1` AS `pk1`,`test`.`t1`.`a1` AS `a1`,`test`.`t1`.`b1` AS `b1`,1 AS `pk2`,1 AS `a2` from `test`.`t1` where ((`test`.`t1`.`a1` = 1) and (`test`.`t1`.`b1` = 6)) INSERT INTO t1 VALUES (3,1,6); SELECT * FROM t1, t2 WHERE a1 = pk2 AND ( ( b1 = 6 OR a2 > 4 ) AND pk2 = a2 OR pk1 IS NULL ); diff --git a/mysql-test/r/select_jcl6.result b/mysql-test/r/select_jcl6.result index a51f2030..2c87b11d 100644 --- a/mysql-test/r/select_jcl6.result +++ b/mysql-test/r/select_jcl6.result @@ -5326,7 +5326,7 @@ SELECT * FROM t1 WHERE (1=2 OR t1.pk=2) AND t1.a <> 0; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables Warnings: -Note 1003 select 2 AS `pk`,0 AS `a` from `test`.`t1` where (0 <> 0) +Note 1003 select 2 AS `pk`,0 AS `a` from `test`.`t1` where 0 DROP TABLE t1; SELECT * FROM mysql.time_zone WHERE ( NOT (Use_leap_seconds <= Use_leap_seconds AND Time_zone_id != 1) @@ -5349,7 +5349,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 system idx NULL NULL NULL 1 100.00 1 SIMPLE t2 ref idx idx 5 const 1 100.00 Using index Warnings: -Note 1003 select 8 AS `a`,8 AS `b`,`test`.`t2`.`c` AS `c` from `test`.`t2` where ((`test`.`t2`.`c` = 8) and 1) +Note 1003 select 8 AS `a`,8 AS `b`,`test`.`t2`.`c` AS `c` from `test`.`t2` where (`test`.`t2`.`c` = 8) SELECT * FROM t1 INNER JOIN t2 ON ( c = a ) WHERE 1 IS NULL OR b < 33 AND b = c; a b c @@ -5473,7 +5473,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t2 system PRIMARY NULL NULL NULL 1 100.00 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`pk1` AS `pk1`,`test`.`t1`.`a1` AS `a1`,`test`.`t1`.`b1` AS `b1`,1 AS `pk2`,1 AS `a2` from `test`.`t1` where ((`test`.`t1`.`a1` = 1) and ((`test`.`t1`.`b1` = 6) or 0)) +Note 1003 select `test`.`t1`.`pk1` AS `pk1`,`test`.`t1`.`a1` AS `a1`,`test`.`t1`.`b1` AS `b1`,1 AS `pk2`,1 AS `a2` from `test`.`t1` where ((`test`.`t1`.`a1` = 1) and (`test`.`t1`.`b1` = 6)) INSERT INTO t1 VALUES (3,1,6); SELECT * FROM t1, t2 WHERE a1 = pk2 AND ( ( b1 = 6 OR a2 > 4 ) AND pk2 = a2 OR pk1 IS NULL ); diff --git a/mysql-test/r/select_pkeycache.result b/mysql-test/r/select_pkeycache.result index f465f5f2..cff5caf7 100644 --- a/mysql-test/r/select_pkeycache.result +++ b/mysql-test/r/select_pkeycache.result @@ -5315,7 +5315,7 @@ SELECT * FROM t1 WHERE (1=2 OR t1.pk=2) AND t1.a <> 0; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables Warnings: -Note 1003 select 2 AS `pk`,0 AS `a` from `test`.`t1` where (0 <> 0) +Note 1003 select 2 AS `pk`,0 AS `a` from `test`.`t1` where 0 DROP TABLE t1; SELECT * FROM mysql.time_zone WHERE ( NOT (Use_leap_seconds <= Use_leap_seconds AND Time_zone_id != 1) @@ -5338,7 +5338,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 system idx NULL NULL NULL 1 100.00 1 SIMPLE t2 ref idx idx 5 const 1 100.00 Using index Warnings: -Note 1003 select 8 AS `a`,8 AS `b`,`test`.`t2`.`c` AS `c` from `test`.`t2` where ((`test`.`t2`.`c` = 8) and 1) +Note 1003 select 8 AS `a`,8 AS `b`,`test`.`t2`.`c` AS `c` from `test`.`t2` where (`test`.`t2`.`c` = 8) SELECT * FROM t1 INNER JOIN t2 ON ( c = a ) WHERE 1 IS NULL OR b < 33 AND b = c; a b c @@ -5462,7 +5462,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t2 system PRIMARY NULL NULL NULL 1 100.00 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`pk1` AS `pk1`,`test`.`t1`.`a1` AS `a1`,`test`.`t1`.`b1` AS `b1`,1 AS `pk2`,1 AS `a2` from `test`.`t1` where ((`test`.`t1`.`a1` = 1) and ((`test`.`t1`.`b1` = 6) or 0)) +Note 1003 select `test`.`t1`.`pk1` AS `pk1`,`test`.`t1`.`a1` AS `a1`,`test`.`t1`.`b1` AS `b1`,1 AS `pk2`,1 AS `a2` from `test`.`t1` where ((`test`.`t1`.`a1` = 1) and (`test`.`t1`.`b1` = 6)) INSERT INTO t1 VALUES (3,1,6); SELECT * FROM t1, t2 WHERE a1 = pk2 AND ( ( b1 = 6 OR a2 > 4 ) AND pk2 = a2 OR pk1 IS NULL ); diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 9d13c29f..eacc254a 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -561,7 +561,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY t1 const PRIMARY,numreponse PRIMARY 7 const,const 1 100.00 Using index 2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Select tables optimized away Warnings: -Note 1003 select 3 AS `numreponse` from `test`.`t1` where (1 = '1') +Note 1003 select 3 AS `numreponse` from `test`.`t1` where 1 drop table t1; CREATE TABLE t1 (a int(1)); INSERT INTO t1 VALUES (1); @@ -6098,7 +6098,7 @@ FROM t1 AS sq4_alias1 WHERE (sq4_alias1.col_varchar_key + NULL) IS NULL OR sq4_alias1.col_varchar_key = @var3; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables +1 SIMPLE sq4_alias1 system NULL NULL NULL NULL 0 const row not found SELECT @var3:=12, sq4_alias1.* FROM t1 AS sq4_alias1 WHERE (sq4_alias1.col_varchar_key + NULL) IS NULL OR diff --git a/mysql-test/r/subselect4.result b/mysql-test/r/subselect4.result index 00ee59ec..582b4e97 100644 --- a/mysql-test/r/subselect4.result +++ b/mysql-test/r/subselect4.result @@ -2317,6 +2317,33 @@ WHERE a='r' AND (c,b) NOT IN (SELECT c,b FROM t2 WHERE (c,b)=(t.c,t.b)); a b c d DROP TABLE t1, t2; # +# MDEV-5468: assertion failure with a simplified condition in subselect +# +CREATE TABLE t1 (a int, b int) ENGINE=MyISAM; +INSERT INTO t1 VALUES (1,1); +CREATE TABLE t2 ( pk int PRIMARY KEY, c INT) ENGINE=MyISAM; +INSERT INTO t2 VALUES (1,4), (2,6); +SELECT ( SELECT MAX(b) FROM t1, t2 WHERE pk = a AND b < from_sq.c ) AS select_sq, +COUNT( DISTINCT from_sq.c ) +FROM ( SELECT DISTINCT t2_1.* FROM t2 AS t2_1, t2 AS t2_2 ) AS from_sq +GROUP BY select_sq ; +select_sq COUNT( DISTINCT from_sq.c ) +1 2 +DROP TABLE t1,t2; +CREATE TABLE t1 (id int, a2 char(2), a3 char(3)) ENGINE=MyISAM; +INSERT INTO t1 VALUES (1,'BE','BEL'); +CREATE TABLE t2 (id int, a2 char(2), a3 char(3)) ENGINE=MyISAM; +INSERT INTO t2 VALUES (1,'BE','BEL'), (2,'MX','MEX'); +CREATE VIEW v2 AS SELECT DISTINCT * FROM t2; +SELECT * FROM t1 AS outer_t1, v2 +WHERE v2.a3 = outer_t1.a3 +AND EXISTS ( SELECT * FROM t1 WHERE a2 < v2.a2 AND id = outer_t1.id ) +AND outer_t1.a3 < 'J' +ORDER BY v2.id; +id a2 a3 id a2 a3 +DROP VIEW v2; +DROP TABLE t1,t2; +# # MDEV-3899 Valgrind warnings (blocks are definitely lost) in filesort on IN subquery with SUM and DISTINCT # CREATE TABLE t1 (a INT) ENGINE=MyISAM; diff --git a/mysql-test/r/subselect_extra.result b/mysql-test/r/subselect_extra.result index 5849ccda..47cb8bca 100644 --- a/mysql-test/r/subselect_extra.result +++ b/mysql-test/r/subselect_extra.result @@ -46,7 +46,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables Warnings: Note 1276 Field or reference 'test.t1.cur_date' of SELECT #2 was resolved in SELECT #1 -Note 1003 select 1 AS `id`,'2007-04-25 18:30:22' AS `cur_date` from (dual) where ('2007-04-25 18:30:22' = 0) +Note 1003 select 1 AS `id`,'2007-04-25 18:30:22' AS `cur_date` from (dual) where 0 select * from t1 where id in (select id from t1 as x1 where (t1.cur_date is null)); id cur_date @@ -57,7 +57,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables Warnings: Note 1276 Field or reference 'test.t2.cur_date' of SELECT #2 was resolved in SELECT #1 -Note 1003 select 1 AS `id`,'2007-04-25' AS `cur_date` from (dual) where ('2007-04-25' = 0) +Note 1003 select 1 AS `id`,'2007-04-25' AS `cur_date` from (dual) where 0 select * from t2 where id in (select id from t2 as x1 where (t2.cur_date is null)); id cur_date diff --git a/mysql-test/r/subselect_no_mat.result b/mysql-test/r/subselect_no_mat.result index e84d1141..56474bc8 100644 --- a/mysql-test/r/subselect_no_mat.result +++ b/mysql-test/r/subselect_no_mat.result @@ -568,7 +568,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY t1 const PRIMARY,numreponse PRIMARY 7 const,const 1 100.00 Using index 2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Select tables optimized away Warnings: -Note 1003 select 3 AS `numreponse` from `test`.`t1` where (1 = '1') +Note 1003 select 3 AS `numreponse` from `test`.`t1` where 1 drop table t1; CREATE TABLE t1 (a int(1)); INSERT INTO t1 VALUES (1); @@ -6097,7 +6097,7 @@ FROM t1 AS sq4_alias1 WHERE (sq4_alias1.col_varchar_key + NULL) IS NULL OR sq4_alias1.col_varchar_key = @var3; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables +1 SIMPLE sq4_alias1 system NULL NULL NULL NULL 0 const row not found SELECT @var3:=12, sq4_alias1.* FROM t1 AS sq4_alias1 WHERE (sq4_alias1.col_varchar_key + NULL) IS NULL OR diff --git a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result index e524505d..3e1b0024 100644 --- a/mysql-test/r/subselect_no_opts.result +++ b/mysql-test/r/subselect_no_opts.result @@ -564,7 +564,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY t1 const PRIMARY,numreponse PRIMARY 7 const,const 1 100.00 Using index 2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Select tables optimized away Warnings: -Note 1003 select 3 AS `numreponse` from `test`.`t1` where (1 = '1') +Note 1003 select 3 AS `numreponse` from `test`.`t1` where 1 drop table t1; CREATE TABLE t1 (a int(1)); INSERT INTO t1 VALUES (1); @@ -6093,7 +6093,7 @@ FROM t1 AS sq4_alias1 WHERE (sq4_alias1.col_varchar_key + NULL) IS NULL OR sq4_alias1.col_varchar_key = @var3; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables +1 SIMPLE sq4_alias1 system NULL NULL NULL NULL 0 const row not found SELECT @var3:=12, sq4_alias1.* FROM t1 AS sq4_alias1 WHERE (sq4_alias1.col_varchar_key + NULL) IS NULL OR diff --git a/mysql-test/r/subselect_no_scache.result b/mysql-test/r/subselect_no_scache.result index 61c8e5fd..8d628ef2 100644 --- a/mysql-test/r/subselect_no_scache.result +++ b/mysql-test/r/subselect_no_scache.result @@ -567,7 +567,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY t1 const PRIMARY,numreponse PRIMARY 7 const,const 1 100.00 Using index 2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Select tables optimized away Warnings: -Note 1003 select 3 AS `numreponse` from `test`.`t1` where (1 = '1') +Note 1003 select 3 AS `numreponse` from `test`.`t1` where 1 drop table t1; CREATE TABLE t1 (a int(1)); INSERT INTO t1 VALUES (1); @@ -6104,7 +6104,7 @@ FROM t1 AS sq4_alias1 WHERE (sq4_alias1.col_varchar_key + NULL) IS NULL OR sq4_alias1.col_varchar_key = @var3; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables +1 SIMPLE sq4_alias1 system NULL NULL NULL NULL 0 const row not found SELECT @var3:=12, sq4_alias1.* FROM t1 AS sq4_alias1 WHERE (sq4_alias1.col_varchar_key + NULL) IS NULL OR diff --git a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result index afc17235..d0e9ae22 100644 --- a/mysql-test/r/subselect_no_semijoin.result +++ b/mysql-test/r/subselect_no_semijoin.result @@ -564,7 +564,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY t1 const PRIMARY,numreponse PRIMARY 7 const,const 1 100.00 Using index 2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Select tables optimized away Warnings: -Note 1003 select 3 AS `numreponse` from `test`.`t1` where (1 = '1') +Note 1003 select 3 AS `numreponse` from `test`.`t1` where 1 drop table t1; CREATE TABLE t1 (a int(1)); INSERT INTO t1 VALUES (1); @@ -6093,7 +6093,7 @@ FROM t1 AS sq4_alias1 WHERE (sq4_alias1.col_varchar_key + NULL) IS NULL OR sq4_alias1.col_varchar_key = @var3; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables +1 SIMPLE sq4_alias1 system NULL NULL NULL NULL 0 const row not found SELECT @var3:=12, sq4_alias1.* FROM t1 AS sq4_alias1 WHERE (sq4_alias1.col_varchar_key + NULL) IS NULL OR diff --git a/mysql-test/r/subselect_sj.result b/mysql-test/r/subselect_sj.result index 0e028cc7..98905f10 100644 --- a/mysql-test/r/subselect_sj.result +++ b/mysql-test/r/subselect_sj.result @@ -2793,6 +2793,22 @@ mysql information_schema DROP TABLE t1; # +# MDEV-5581: Server crashes in in JOIN::prepare on 2nd execution of PS with materialization+semijoin +# +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (2),(3); +CREATE TABLE t2 (b INT); +INSERT INTO t2 VALUES (8),(9); +CREATE TABLE t3 (c INT, INDEX(c)); +INSERT INTO t2 VALUES (5),(6); +PREPARE stmt FROM +"SELECT * FROM t1 WHERE ( 9, 5 ) IN ( SELECT b, COUNT(*) FROM t2 WHERE 1 IN ( SELECT MIN(c) FROM t3 ) )"; +EXECUTE stmt; +a +EXECUTE stmt; +a +DROP TABLE t1,t2,t3; +# # MySQL Bug#13340270: assertion table->sort.record_pointers == __null # CREATE TABLE t1 ( diff --git a/mysql-test/r/subselect_sj2.result b/mysql-test/r/subselect_sj2.result index d8751492..2975176c 100644 --- a/mysql-test/r/subselect_sj2.result +++ b/mysql-test/r/subselect_sj2.result @@ -1109,6 +1109,23 @@ t3 AS t3a INNER JOIN t3 AS t3b ON ( t3a.i3 = t3b.i3 ) ); i1 DROP TABLE t1,t2,t3; +# +# MDEV-5582: Plugin 'MEMORY' has ref_count=1 after shutdown with materialization+semijoin +# +CREATE TABLE t1 (a INT) engine=innodb; +INSERT INTO t1 VALUES (8),(9); +CREATE TABLE t2 (b INT) engine=innodb; +INSERT INTO t2 VALUES (2),(3); +CREATE TABLE t3 (c INT, INDEX(c)) engine=innodb; +INSERT INTO t2 VALUES (4),(5); +explain +SELECT * FROM t1 WHERE 9 IN ( SELECT b FROM t2 WHERE 1 IN ( SELECT MIN(c) FROM t3 ) ); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE +3 MATERIALIZED NULL NULL NULL NULL NULL NULL NULL No matching min/max row +SELECT * FROM t1 WHERE 9 IN ( SELECT b FROM t2 WHERE 1 IN ( SELECT MIN(c) FROM t3 ) ); +a +DROP TABLE t1,t2,t3; DROP TABLE IF EXISTS t1,t2,t3,t4; # # MDEV-4782: Valgrind warnings (Conditional jump or move depends on uninitialised value) with InnoDB, semijoin diff --git a/mysql-test/r/subselect_sj2_jcl6.result b/mysql-test/r/subselect_sj2_jcl6.result index 00e39363..ff97882c 100644 --- a/mysql-test/r/subselect_sj2_jcl6.result +++ b/mysql-test/r/subselect_sj2_jcl6.result @@ -1124,6 +1124,23 @@ t3 AS t3a INNER JOIN t3 AS t3b ON ( t3a.i3 = t3b.i3 ) ); i1 DROP TABLE t1,t2,t3; +# +# MDEV-5582: Plugin 'MEMORY' has ref_count=1 after shutdown with materialization+semijoin +# +CREATE TABLE t1 (a INT) engine=innodb; +INSERT INTO t1 VALUES (8),(9); +CREATE TABLE t2 (b INT) engine=innodb; +INSERT INTO t2 VALUES (2),(3); +CREATE TABLE t3 (c INT, INDEX(c)) engine=innodb; +INSERT INTO t2 VALUES (4),(5); +explain +SELECT * FROM t1 WHERE 9 IN ( SELECT b FROM t2 WHERE 1 IN ( SELECT MIN(c) FROM t3 ) ); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE +3 MATERIALIZED NULL NULL NULL NULL NULL NULL NULL No matching min/max row +SELECT * FROM t1 WHERE 9 IN ( SELECT b FROM t2 WHERE 1 IN ( SELECT MIN(c) FROM t3 ) ); +a +DROP TABLE t1,t2,t3; DROP TABLE IF EXISTS t1,t2,t3,t4; # # MDEV-4782: Valgrind warnings (Conditional jump or move depends on uninitialised value) with InnoDB, semijoin diff --git a/mysql-test/r/subselect_sj2_mat.result b/mysql-test/r/subselect_sj2_mat.result index 2306f196..f4d7d986 100644 --- a/mysql-test/r/subselect_sj2_mat.result +++ b/mysql-test/r/subselect_sj2_mat.result @@ -1111,6 +1111,23 @@ t3 AS t3a INNER JOIN t3 AS t3b ON ( t3a.i3 = t3b.i3 ) ); i1 DROP TABLE t1,t2,t3; +# +# MDEV-5582: Plugin 'MEMORY' has ref_count=1 after shutdown with materialization+semijoin +# +CREATE TABLE t1 (a INT) engine=innodb; +INSERT INTO t1 VALUES (8),(9); +CREATE TABLE t2 (b INT) engine=innodb; +INSERT INTO t2 VALUES (2),(3); +CREATE TABLE t3 (c INT, INDEX(c)) engine=innodb; +INSERT INTO t2 VALUES (4),(5); +explain +SELECT * FROM t1 WHERE 9 IN ( SELECT b FROM t2 WHERE 1 IN ( SELECT MIN(c) FROM t3 ) ); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE +3 MATERIALIZED NULL NULL NULL NULL NULL NULL NULL No matching min/max row +SELECT * FROM t1 WHERE 9 IN ( SELECT b FROM t2 WHERE 1 IN ( SELECT MIN(c) FROM t3 ) ); +a +DROP TABLE t1,t2,t3; DROP TABLE IF EXISTS t1,t2,t3,t4; # # MDEV-4782: Valgrind warnings (Conditional jump or move depends on uninitialised value) with InnoDB, semijoin diff --git a/mysql-test/r/subselect_sj_jcl6.result b/mysql-test/r/subselect_sj_jcl6.result index af91cc3e..f4d874aa 100644 --- a/mysql-test/r/subselect_sj_jcl6.result +++ b/mysql-test/r/subselect_sj_jcl6.result @@ -2807,6 +2807,22 @@ information_schema mysql DROP TABLE t1; # +# MDEV-5581: Server crashes in in JOIN::prepare on 2nd execution of PS with materialization+semijoin +# +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (2),(3); +CREATE TABLE t2 (b INT); +INSERT INTO t2 VALUES (8),(9); +CREATE TABLE t3 (c INT, INDEX(c)); +INSERT INTO t2 VALUES (5),(6); +PREPARE stmt FROM +"SELECT * FROM t1 WHERE ( 9, 5 ) IN ( SELECT b, COUNT(*) FROM t2 WHERE 1 IN ( SELECT MIN(c) FROM t3 ) )"; +EXECUTE stmt; +a +EXECUTE stmt; +a +DROP TABLE t1,t2,t3; +# # MySQL Bug#13340270: assertion table->sort.record_pointers == __null # CREATE TABLE t1 ( diff --git a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result index 61845c7b..51966147 100644 --- a/mysql-test/r/type_datetime.result +++ b/mysql-test/r/type_datetime.result @@ -519,7 +519,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables Warnings: Note 1276 Field or reference 'test.t1.cur_date' of SELECT #2 was resolved in SELECT #1 -Note 1003 select 1 AS `id`,'2007-04-25 18:30:22' AS `cur_date` from (dual) where ('2007-04-25 18:30:22' = 0) +Note 1003 select 1 AS `id`,'2007-04-25 18:30:22' AS `cur_date` from (dual) where 0 select * from t1 where id in (select id from t1 as x1 where (t1.cur_date is null)); id cur_date @@ -530,7 +530,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables Warnings: Note 1276 Field or reference 'test.t2.cur_date' of SELECT #2 was resolved in SELECT #1 -Note 1003 select 1 AS `id`,'2007-04-25' AS `cur_date` from (dual) where ('2007-04-25' = 0) +Note 1003 select 1 AS `id`,'2007-04-25' AS `cur_date` from (dual) where 0 select * from t2 where id in (select id from t2 as x1 where (t2.cur_date is null)); id cur_date diff --git a/mysql-test/r/udf_debug_sync.result b/mysql-test/r/udf_debug_sync.result new file mode 100644 index 00000000..2db75f9a --- /dev/null +++ b/mysql-test/r/udf_debug_sync.result @@ -0,0 +1,20 @@ +CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB"; +CREATE VIEW v1 AS SELECT myfunc_int(1); +SET debug_sync='mysql_create_function_after_lock SIGNAL locked WAIT_FOR go'; +CREATE FUNCTION myfunc_double RETURNS REAL SONAME "UDF_EXAMPLE_LIB"; +SET debug_sync='now WAIT_FOR locked'; +SET debug_sync='find_udf_before_lock SIGNAL go'; +SELECT * FROM v1; +myfunc_int(1) +1 +FLUSH TABLES; +SET debug_sync='mysql_drop_function_after_lock SIGNAL locked WAIT_FOR go'; +DROP FUNCTION myfunc_double; +SET debug_sync='now WAIT_FOR locked'; +SET debug_sync='find_udf_before_lock SIGNAL go'; +SELECT * FROM v1; +myfunc_int(1) +1 +SET debug_sync='RESET'; +DROP VIEW v1; +DROP FUNCTION myfunc_int; diff --git a/mysql-test/r/union_crash-714.result b/mysql-test/r/union_crash-714.result new file mode 100644 index 00000000..4a51f88b --- /dev/null +++ b/mysql-test/r/union_crash-714.result @@ -0,0 +1,5 @@ +create table t1 (i tinyint); +set debug_dbug='+d,bug11747970_raise_error'; +insert into t1 (i) select i from t1 union select i from t1; +ERROR 70100: Query execution was interrupted +drop table t1; diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index ee43b3a3..33355db0 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -4417,7 +4417,7 @@ WHERE f1<>0 OR f2<>0 AND f4='v' AND (f2<>0 OR f3<>0 AND f5<>0 OR f4 LIKE '%b%'); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 system NULL NULL NULL NULL 1 100.00 Warnings: -Note 1003 select 'r' AS `f4` from dual where (20 <> 0) +Note 1003 select 'r' AS `f4` from dual where 1 DROP VIEW v1; DROP TABLE t1; # diff --git a/mysql-test/r/xml.result b/mysql-test/r/xml.result index 999178a0..6c78e9ea 100644 --- a/mysql-test/r/xml.result +++ b/mysql-test/r/xml.result @@ -1161,6 +1161,9 @@ UPDATEXML('x','(a)//a','') SELECT ExtractValue('aabb','(a)/a|(a)/b'); ExtractValue('aabb','(a)/a|(a)/b') aa bb +SELECT ExtractValue('abc21','substring(/a/b,..)'); +ExtractValue('abc21','substring(/a/b,..)') + # # End of 5.5 tests # diff --git a/mysql-test/std_data/cacert.pem b/mysql-test/std_data/cacert.pem index e4434138..f5ba4fec 100644 --- a/mysql-test/std_data/cacert.pem +++ b/mysql-test/std_data/cacert.pem @@ -1,17 +1,22 @@ -----BEGIN CERTIFICATE----- -MIICrTCCAhagAwIBAgIJAMI7xZKjhrDbMA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV +MIIDsjCCApqgAwIBAgIJAL5YrUwfPSWVMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD -VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkxMTQ3MTBaFw0xNTAxMjgxMTQ3MTBaMEQx +VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkwNTU5NTNaFw0xNTAxMjgwNTU5NTNaMEQx CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh -MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA -wQYsOEfrN4ESP3FjsI8cghE+tZVuyK2gck61lwieVxjgFMtBd65mI5a1y9pmlOI1 -yM4SB2Ppqcuw7/e1CdV1y7lvHrGNt5yqEHbN4QX1gvsN8TQauP/2WILturk4R4Hq -rKg0ZySu7f1Xhl0ed9a48LpaEHD17IcxWEGMMJwAxF0CAwEAAaOBpjCBozAMBgNV -HRMEBTADAQH/MB0GA1UdDgQWBBSvktYQ0ahLnyxyVKqty+WpBbBrDTB0BgNVHSME -bTBrgBSvktYQ0ahLnyxyVKqty+WpBbBrDaFIpEYwRDELMAkGA1UEBhMCU0UxEDAO -BgNVBAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FM -IEFCggkAwjvFkqOGsNswDQYJKoZIhvcNAQEEBQADgYEAdKN1PjwMHAKG2Ww1145g -JQGBnKxSFOUaoSvkBi/4ntTM+ysnViWh7WvxyWjR9zU9arfr7aqsDeQxm0XDOqzj -AQ/cQIla2/Li8tXyfc06bisH/IHRaSc2zWqioTKbEwMdVOdrvq4a8V8ic3xYyIWn -7F4WeS07J8LKardSvM0+hOA= +MREwDwYDVQQKEwhNeVNRTCBBQjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAL6kNN4peX7uhK9rb06W/QbPEpVuejmdWdl2PqMshP/eSuXXw7kwVgfpxx9R +vC000CKQQSG9MCoZjtqPnFRsetmWLZgApRpEalGXTXJqq9sEbCfoFizg94U8G7d2 +u5XJjLVmcG34ru36KoBgVx1zeH1puBAf8dOzrE4L7Y+ZQBFzFohjh8C2LqWC4nM5 +qsLmOkDWMipGqYU5DvkKjIbTbwTyRNRgZHWSPfVDDPUIUOsY4BGUp2DpgeGY9aEv +lIs57Ev9JqlIUCV65lOhhDkG+xwmkHKHA+ECEU9cALI8+uXbh48MB9XpMOuk408X +/lX89aZwD0/G9kmObVGnE2G+H5UCAwEAAaOBpjCBozAdBgNVHQ4EFgQUsft+d7VA +jWgRftkR5cPG2k2sUbAwdAYDVR0jBG0wa4AUsft+d7VAjWgRftkR5cPG2k2sUbCh +SKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdV +cHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAL5YrUwfPSWVMAwGA1UdEwQFMAMB +Af8wDQYJKoZIhvcNAQEFBQADggEBALRUOAmdL8R8sl1y8kiEiFgDatdXK5RDqWai +8yZChfmwTIToHhmQsOEshJe2e8hky3huUj+33VyXjINoMbebIwMuXPwEkbJal8RZ +nSJmF0jN1Qz7J/jFffwK9xmejWZJx49Kt2+Qwrwp6kDeq9TLFqQOoVczgyJPYsTL +NAOib5WqTud3XWvCwxrhqmWu7JZq6sp1fomP/uunprb8y2miWfLESZN2mKAhm44Q +Lws867LT8v2lskEjq2dT1LutD5+R66XcdjgSr0uDziDs64jZwCD6ea94hVFM7ej0 +ZOXYeSEZJ56FjUxu632e9fY8NyMh30yKjjmQf1mM9PuGJvdvsWU= -----END CERTIFICATE----- diff --git a/mysql-test/std_data/client-cert.pem b/mysql-test/std_data/client-cert.pem index ee7f2ab2..b83ae7c6 100644 --- a/mysql-test/std_data/client-cert.pem +++ b/mysql-test/std_data/client-cert.pem @@ -1,46 +1,69 @@ Certificate: Data: - Version: 1 (0x0) - Serial Number: 1048577 (0x100001) - Signature Algorithm: md5WithRSAEncryption + Version: 3 (0x2) + Serial Number: 6 (0x6) + Signature Algorithm: sha1WithRSAEncryption Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB Validity - Not Before: Jan 29 11:50:22 2010 GMT - Not After : Jan 28 11:50:22 2015 GMT + Not Before: Feb 20 03:03:26 2010 GMT + Not After : Sep 3 03:03:26 2030 GMT Subject: C=SE, ST=Uppsala, O=MySQL AB Subject Public Key Info: Public Key Algorithm: rsaEncryption - Public-Key: (1024 bit) - Modulus: - 00:cc:9a:37:49:13:66:dc:cf:e3:0b:13:a1:23:ed: - 78:db:4e:bd:11:f6:8c:0d:76:f9:a3:32:56:9a:f8: - a1:21:6a:55:4e:4d:3f:e6:67:9d:26:99:b2:cd:a4: - 9a:d2:2b:59:5c:d7:8a:d3:60:68:f8:18:bd:c5:be: - 15:e1:2a:3c:a3:d4:61:cb:f5:11:94:17:81:81:f7: - 87:8c:f6:6a:d2:ee:d8:e6:77:f6:62:66:4d:2e:16: - 8d:08:81:4a:c9:c6:4b:31:e5:b9:c7:8a:84:96:48: - a7:47:8c:0d:26:90:56:4e:e6:a5:6e:8c:b3:f2:9f: - fc:3d:78:9b:49:6e:86:83:77 + RSA Public Key: (1024 bit) + Modulus (1024 bit): + 00:c2:e7:20:cf:89:59:2f:67:cb:4c:9f:e8:11:f2: + 23:e5:f1:b1:ee:3f:66:5f:c3:f5:fd:1e:31:ee:8f: + 4c:2a:bd:c0:4a:a5:9f:c8:44:d5:77:8f:15:1b:4d: + 78:6e:b2:a2:48:a5:24:33:05:40:02:b3:c1:87:8d: + 59:3c:1a:07:aa:86:f0:04:e1:9c:20:4b:22:32:c4: + 51:9e:40:e4:31:c3:57:f5:98:bf:2e:b1:fd:2c:56: + bf:49:d9:9b:e7:17:cc:95:5f:b5:08:19:5e:9d:df: + 65:22:39:2c:48:fb:69:96:31:7a:35:4d:de:60:b4: + c1:60:19:5f:96:56:7e:55:19 Exponent: 65537 (0x10001) - Signature Algorithm: md5WithRSAEncryption - 5e:1f:a3:53:5f:24:13:1c:f8:28:32:b0:7f:69:69:f3:0e:c0: - 34:87:10:03:7d:da:15:8b:bd:19:b8:1a:56:31:e7:85:49:81: - c9:7f:45:20:74:3e:89:c0:e0:26:84:51:cc:04:16:ce:69:99: - 01:e1:26:99:b3:e3:f5:bd:ec:5f:a0:84:e4:38:da:75:78:7b: - 89:9c:d2:cd:60:95:20:ba:8e:e3:7c:e6:df:76:3a:7c:89:77: - 02:94:86:11:3a:c4:61:7d:6f:71:83:21:8a:17:fb:17:e2:ee: - 02:6b:61:c1:b4:52:63:d7:d8:46:b2:c5:9c:6f:38:91:8a:35: - 32:0b + X509v3 extensions: + X509v3 Basic Constraints: + CA:FALSE + X509v3 Subject Key Identifier: + 8D:10:67:91:33:76:9C:02:E5:78:5D:D8:C5:EF:25:96:B2:D7:FA:1F + X509v3 Authority Key Identifier: + keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0 + DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB + serial:BE:58:AD:4C:1F:3D:25:95 + + Signature Algorithm: sha1WithRSAEncryption + a9:88:10:3e:5d:2a:47:29:c8:03:27:7a:31:5a:8e:10:03:bc: + b5:4e:37:1d:12:7b:eb:5f:50:71:70:b1:a3:8e:93:0e:77:17: + 6c:47:b6:c9:a4:4d:2a:c4:38:f0:61:55:b2:7f:28:ba:06:79: + ee:67:11:7d:d4:c9:7f:0a:18:c8:c1:cb:d0:2c:f9:63:0f:bb: + 45:ca:de:ea:bb:ac:00:01:52:48:36:2b:07:2b:c8:46:c7:b1: + 21:81:bd:77:39:e7:4c:39:aa:bd:ac:60:d8:a7:bf:cf:14:98: + 4a:0b:a1:40:55:06:8d:6f:35:a9:39:a0:71:a9:97:ba:7c:73: + 3c:41:ba:c5:1c:11:4b:2b:43:1d:2d:ba:7b:5f:14:b5:3d:64: + 62:15:36:b4:16:bd:78:c8:43:8d:f9:1c:a5:d2:ac:a1:58:74: + e1:99:de:ad:04:19:43:a8:bd:0a:fd:19:9b:50:44:46:6d:18: + 55:4d:bf:b4:5b:a4:93:62:c7:64:91:6c:54:34:d1:f8:f3:ff: + 12:6d:5f:85:e7:35:9e:5c:42:81:5e:fb:c8:bb:44:51:98:b2: + ef:1b:9f:5a:22:77:28:7d:da:fb:08:c2:94:9a:0f:42:08:93: + 54:10:1e:ad:f2:4f:fc:62:98:51:e9:9b:b9:3a:93:d9:e4:1f: + 1d:c4:76:d0 -----BEGIN CERTIFICATE----- -MIIB5zCCAVACAxAAATANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G -A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg -QUIwHhcNMTAwMTI5MTE1MDIyWhcNMTUwMTI4MTE1MDIyWjAyMQswCQYDVQQGEwJT -RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJKoZI -hvcNAQEBBQADgY0AMIGJAoGBAMyaN0kTZtzP4wsToSPteNtOvRH2jA12+aMyVpr4 -oSFqVU5NP+ZnnSaZss2kmtIrWVzXitNgaPgYvcW+FeEqPKPUYcv1EZQXgYH3h4z2 -atLu2OZ39mJmTS4WjQiBSsnGSzHluceKhJZIp0eMDSaQVk7mpW6Ms/Kf/D14m0lu -hoN3AgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAXh+jU18kExz4KDKwf2lp8w7ANIcQ -A33aFYu9GbgaVjHnhUmByX9FIHQ+icDgJoRRzAQWzmmZAeEmmbPj9b3sX6CE5Dja -dXh7iZzSzWCVILqO43zm33Y6fIl3ApSGETrEYX1vcYMhihf7F+LuAmthwbRSY9fY -RrLFnG84kYo1Mgs= +MIIDETCCAfmgAwIBAgIBBjANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ +MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT +UUwgQUIwHhcNMTAwMjIwMDMwMzI2WhcNMzAwOTAzMDMwMzI2WjAyMQswCQYDVQQG +EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJ +KoZIhvcNAQEBBQADgY0AMIGJAoGBAMLnIM+JWS9ny0yf6BHyI+Xxse4/Zl/D9f0e +Me6PTCq9wEqln8hE1XePFRtNeG6yokilJDMFQAKzwYeNWTwaB6qG8AThnCBLIjLE +UZ5A5DHDV/WYvy6x/SxWv0nZm+cXzJVftQgZXp3fZSI5LEj7aZYxejVN3mC0wWAZ +X5ZWflUZAgMBAAGjgaMwgaAwCQYDVR0TBAIwADAdBgNVHQ4EFgQUjRBnkTN2nALl +eF3Yxe8llrLX+h8wdAYDVR0jBG0wa4AUsft+d7VAjWgRftkR5cPG2k2sUbChSKRG +MEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBz +YWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAL5YrUwfPSWVMA0GCSqGSIb3DQEBBQUA +A4IBAQCpiBA+XSpHKcgDJ3oxWo4QA7y1TjcdEnvrX1BxcLGjjpMOdxdsR7bJpE0q +xDjwYVWyfyi6BnnuZxF91Ml/ChjIwcvQLPljD7tFyt7qu6wAAVJINisHK8hGx7Eh +gb13OedMOaq9rGDYp7/PFJhKC6FAVQaNbzWpOaBxqZe6fHM8QbrFHBFLK0MdLbp7 +XxS1PWRiFTa0Fr14yEON+Ryl0qyhWHThmd6tBBlDqL0K/RmbUERGbRhVTb+0W6ST +YsdkkWxUNNH48/8SbV+F5zWeXEKBXvvIu0RRmLLvG59aIncofdr7CMKUmg9CCJNU +EB6t8k/8YphR6Zu5OpPZ5B8dxHbQ -----END CERTIFICATE----- diff --git a/mysql-test/std_data/client-key.pem b/mysql-test/std_data/client-key.pem index 205b5f31..2fc1754e 100644 --- a/mysql-test/std_data/client-key.pem +++ b/mysql-test/std_data/client-key.pem @@ -1,15 +1,15 @@ -----BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDMmjdJE2bcz+MLE6Ej7XjbTr0R9owNdvmjMlaa+KEhalVOTT/m -Z50mmbLNpJrSK1lc14rTYGj4GL3FvhXhKjyj1GHL9RGUF4GB94eM9mrS7tjmd/Zi -Zk0uFo0IgUrJxksx5bnHioSWSKdHjA0mkFZO5qVujLPyn/w9eJtJboaDdwIDAQAB -AoGASqk/4We2En+93y3jkIO4pXafIe3w/3zZ7caRue1ehx4RUQh5d+95djuB9u7J -HEZ7TpjM7QNyao5EueL6gvbxt0LXFvqAMni7yM9tt/HUYtHHPqYiRtUny9bKYFTm -l8szCCMal/wD9GZU9ByHDNHm7tHUMyMhARNTYSgx+SERFmECQQD/6jJocC4SXf6f -T3LqimWR02lbJ7qCoDgRglsUXh0zjrG+IIiAyE+QOCCx1GMe3Uw6bsIuYwdHT6as -WcdPs04xAkEAzKulvEvLVvN5zfa/DTYRTV7jh6aDleOxjsD5oN/oJXoACnPzVuUL -qQQMNtuAXm6Q1QItrRxpQsSKbY0UQka6JwJBAOSgoNoG5lIIYTKIMvzwGV+XBLeo -HYsXgh+6Wo4uql3mLErUG78ZtWL9kc/tE4R+ZdyKGLaCR/1gXmH5bwN4B/ECQEBb -uUH8k3REG4kojesZlVc+/00ojzgS4UKCa/yqa9VdB6ZBz8MDQydinnShkTwgiGpy -xOoqhO753o2UT0qH8wECQQC99IEJWUnwvExVMkLaZH5NjAFJkb22sjkmuT11tAgU -RQgOMoDOm6driojnOnDWOkx1r1Gy9NgMLooduja4v6cx +MIICWwIBAAKBgQDC5yDPiVkvZ8tMn+gR8iPl8bHuP2Zfw/X9HjHuj0wqvcBKpZ/I +RNV3jxUbTXhusqJIpSQzBUACs8GHjVk8GgeqhvAE4ZwgSyIyxFGeQOQxw1f1mL8u +sf0sVr9J2ZvnF8yVX7UIGV6d32UiOSxI+2mWMXo1Td5gtMFgGV+WVn5VGQIDAQAB +AoGARXcXLKDpVooJ3W+IyQyiWsw//IhANpWjUOm4JiyQmxMyO+i4ACr4Yjpu7WI5 +MEseqAGj20NdwxjKO0PXsCIe5LmrGZ+SI8+CSERFOWXWRtCWz7y7SG30i1k6suvM +mwqWom0tJLwn93uA1lm/WSwKQwUrJRahRQd3EaZqrl7DP5kCQQD/8gbuYAT5pxQe +ULLGM0RvEsXxDYbEDxNbY5wrBazfklBwpumxZpFl6jEAT++7Kh2Ns3A7kB1oUNlA +FPYr+dYPAkEAwvHEwRtoyUr8jqoqVVJWI76CDmBjEOzVeMKW97ztqbs2LxZW8dYI +iOh/myFGpdoUwgu0U8w9MmXcj3ZeZCYKVwJALyQ+AJPw9qa+fuLwOq9gsHCtwrty +EhSQxSlwrz/pWniRll439vPkXfgntF4E0t1r+hiN2Hqv3/HcQgBaYzkuIwJAG023 +bACFxaOuCeFFepvEms8E8jSHy4gQQhCnCl24v8wLw76SQN7kZSCDNtwLRBFuVNtE +z3PMonFn2eQPRmGZkwJAP1c1BHprMQx/ruafdscROILv3JrH40C1bR6KVVBKt1dK +Qpnpgi7hK5rUQjDF8k3bn9ugTt06jyeHe/QhAml0kg== -----END RSA PRIVATE KEY----- diff --git a/mysql-test/std_data/server-cert.pem b/mysql-test/std_data/server-cert.pem index 5922fe7d..d77bae80 100644 --- a/mysql-test/std_data/server-cert.pem +++ b/mysql-test/std_data/server-cert.pem @@ -1,41 +1,69 @@ Certificate: Data: - Version: 1 (0x0) - Serial Number: 1048578 (0x100002) - Signature Algorithm: md5WithRSAEncryption + Version: 3 (0x2) + Serial Number: 4 (0x4) + Signature Algorithm: sha1WithRSAEncryption Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB Validity - Not Before: Jan 29 11:56:49 2010 GMT - Not After : Jan 28 11:56:49 2015 GMT + Not Before: Feb 20 02:55:06 2010 GMT + Not After : Sep 3 02:55:06 2030 GMT Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost Subject Public Key Info: Public Key Algorithm: rsaEncryption - Public-Key: (512 bit) - Modulus: - 00:cd:e4:87:51:9d:72:11:a0:d1:fa:f3:92:8b:13: - 1c:eb:f7:e2:9a:2f:72:a8:d6:65:48:d1:69:af:1b: - c0:4c:13:e5:60:60:51:41:e9:ab:a6:bc:13:bb:0c: - 5e:32:7c:d9:6c:9e:cd:05:24:84:78:db:80:91:2e: - d8:88:2b:c2:ed + RSA Public Key: (1024 bit) + Modulus (1024 bit): + 00:e3:7d:4f:c2:23:77:a9:3a:2c:d2:69:59:a0:2f: + 4e:d1:51:4c:ae:8d:f5:17:cc:ce:58:9c:83:4f:0b: + a3:bb:29:a2:b8:1d:3e:1b:04:f9:a9:3e:e2:61:d0: + e6:7b:b9:7c:12:d8:1f:86:c9:53:b5:04:dd:df:26: + e9:c0:2b:de:4a:96:2e:f3:23:6f:79:6d:a9:d2:4e: + 17:af:2f:de:8b:68:44:ae:de:a3:e2:c4:37:1c:04: + ad:73:4b:85:f9:83:ac:fe:b7:c1:54:47:2e:96:d4: + 31:96:85:94:69:d6:5a:63:24:04:99:89:19:1d:56: + 8a:d1:77:aa:87:fb:38:cd:b7 Exponent: 65537 (0x10001) - Signature Algorithm: md5WithRSAEncryption - 73:ce:9c:6e:39:46:b4:14:be:da:3f:f3:1b:ba:90:bc:23:43: - d7:82:2a:70:4e:a6:d9:5a:65:5c:b7:df:71:df:75:77:c5:80: - a4:af:fa:d2:59:e2:fd:c9:9c:f0:98:95:8e:69:a9:8c:7c:d8: - 6f:48:d2:e3:36:e0:cd:ff:3f:d1:a5:e6:ab:75:09:c4:50:10: - c4:96:dd:bf:3b:de:32:46:da:ca:4a:f1:d6:52:8a:33:2f:ab: - f5:2e:70:3f:d4:9c:be:00:c8:03:f9:39:8a:df:5b:70:3c:40: - ef:03:be:7c:3d:1d:32:32:f3:51:81:e2:83:30:6e:3d:38:9b: - fb:3c + X509v3 extensions: + X509v3 Basic Constraints: + CA:FALSE + X509v3 Subject Key Identifier: + CC:8C:71:40:D0:0F:BF:D1:99:79:3F:1B:E9:10:76:19:67:36:0F:A3 + X509v3 Authority Key Identifier: + keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0 + DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB + serial:BE:58:AD:4C:1F:3D:25:95 + + Signature Algorithm: sha1WithRSAEncryption + 6f:ad:5e:59:fa:84:3a:be:e2:72:b1:e8:66:2a:4e:f8:73:19: + 11:06:11:92:78:56:3e:d6:e8:68:29:90:8b:59:d2:fe:aa:ae: + 25:59:c7:e9:99:bb:4a:06:43:dd:40:bd:cb:f4:ae:79:95:7d: + 8e:90:ef:58:d2:a8:fc:bf:07:f3:37:b2:9b:bd:da:e6:8c:56: + dd:5e:c6:4a:70:7c:3e:3d:a1:e8:35:06:b8:a7:7b:ac:26:85: + 54:5d:09:a2:7b:77:b4:17:7f:72:31:cb:ff:cc:67:6d:e6:3e: + c6:dc:96:eb:4a:0a:ae:e9:48:ae:8a:e0:d6:73:57:6e:32:4c: + 00:dc:28:da:55:b3:9f:9f:d8:98:cc:d9:f1:b6:b3:14:67:2e: + a1:47:1e:51:11:cf:70:9f:31:8f:ba:59:29:f2:d0:88:0b:e2: + 51:6b:f8:31:ed:6d:ac:00:5e:d3:78:4c:95:97:02:cc:74:2b: + 3b:c6:28:e6:2a:c3:30:99:35:b4:4d:31:46:d4:90:f2:47:ed: + 64:85:1a:75:2a:72:0a:2f:c6:3a:2f:d2:ac:6b:31:cc:e5:a8: + 07:c2:d6:22:f3:c6:0f:bf:67:d9:d6:b2:79:cd:48:b5:c3:e0: + e3:18:7f:b5:74:c9:43:19:fb:c4:93:29:ca:cc:90:2b:1b:6f: + 45:f6:25:f9 -----BEGIN CERTIFICATE----- -MIIBtzCCASACAxAAAjANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G -A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg -QUIwHhcNMTAwMTI5MTE1NjQ5WhcNMTUwMTI4MTE1NjQ5WjBGMQswCQYDVQQGEwJT -RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNVBAMT -CWxvY2FsaG9zdDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDN5IdRnXIRoNH685KL -Exzr9+KaL3Ko1mVI0WmvG8BME+VgYFFB6aumvBO7DF4yfNlsns0FJIR424CRLtiI -K8LtAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAc86cbjlGtBS+2j/zG7qQvCND14Iq -cE6m2VplXLffcd91d8WApK/60lni/cmc8JiVjmmpjHzYb0jS4zbgzf8/0aXmq3UJ -xFAQxJbdvzveMkbaykrx1lKKMy+r9S5wP9ScvgDIA/k5it9bcDxA7wO+fD0dMjLz -UYHigzBuPTib+zw= +MIIDJTCCAg2gAwIBAgIBBDANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ +MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT +UUwgQUIwHhcNMTAwMjIwMDI1NTA2WhcNMzAwOTAzMDI1NTA2WjBGMQswCQYDVQQG +EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNV +BAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA431PwiN3 +qTos0mlZoC9O0VFMro31F8zOWJyDTwujuymiuB0+GwT5qT7iYdDme7l8EtgfhslT +tQTd3ybpwCveSpYu8yNveW2p0k4Xry/ei2hErt6j4sQ3HAStc0uF+YOs/rfBVEcu +ltQxloWUadZaYyQEmYkZHVaK0Xeqh/s4zbcCAwEAAaOBozCBoDAJBgNVHRMEAjAA +MB0GA1UdDgQWBBTMjHFA0A+/0Zl5PxvpEHYZZzYPozB0BgNVHSMEbTBrgBSx+353 +tUCNaBF+2RHlw8baTaxRsKFIpEYwRDELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1Vw +cHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCggkAvlit +TB89JZUwDQYJKoZIhvcNAQEFBQADggEBAG+tXln6hDq+4nKx6GYqTvhzGREGEZJ4 +Vj7W6GgpkItZ0v6qriVZx+mZu0oGQ91Avcv0rnmVfY6Q71jSqPy/B/M3spu92uaM +Vt1exkpwfD49oeg1Brine6wmhVRdCaJ7d7QXf3Ixy//MZ23mPsbclutKCq7pSK6K +4NZzV24yTADcKNpVs5+f2JjM2fG2sxRnLqFHHlERz3CfMY+6WSny0IgL4lFr+DHt +bawAXtN4TJWXAsx0KzvGKOYqwzCZNbRNMUbUkPJH7WSFGnUqcgovxjov0qxrMczl +qAfC1iLzxg+/Z9nWsnnNSLXD4OMYf7V0yUMZ+8STKcrMkCsbb0X2Jfk= -----END CERTIFICATE----- diff --git a/mysql-test/std_data/server-key.pem b/mysql-test/std_data/server-key.pem index 1083495c..bf0ae205 100644 --- a/mysql-test/std_data/server-key.pem +++ b/mysql-test/std_data/server-key.pem @@ -1,9 +1,15 @@ -----BEGIN RSA PRIVATE KEY----- -MIIBOwIBAAJBAM3kh1GdchGg0frzkosTHOv34povcqjWZUjRaa8bwEwT5WBgUUHp -q6a8E7sMXjJ82WyezQUkhHjbgJEu2Igrwu0CAwEAAQJBAJuwhFbF3NzRpBbEmnqJ -4GPa1UJMQMLFJF+04tqj/HxJcAIVhOJhGmmtYNw1yjz/ZsPnfJCMz4eFOtdjvGtf -peECIQDmFFg2WLvYo+2m9w9V7z4ZIkg7ixYkI/ObUUctfZkPOQIhAOUWnrvjFrAX -bIvYT/YR50+3ZDLEc51XxNgJnWqWYl1VAiEAnTOFWgyivFC1DgF8PvDp8u5TgCt2 -A1d1GMgd490O+TECIC/WMl0/hTxOF9930vKqOGf//o9PUGkZq8QE9fcM4gtlAiAE -iOcFpnLjtWj57jrhuw214ucnB5rklkQQe+AtcARNkg== +MIICXgIBAAKBgQDjfU/CI3epOizSaVmgL07RUUyujfUXzM5YnINPC6O7KaK4HT4b +BPmpPuJh0OZ7uXwS2B+GyVO1BN3fJunAK95Kli7zI295banSThevL96LaESu3qPi +xDccBK1zS4X5g6z+t8FURy6W1DGWhZRp1lpjJASZiRkdVorRd6qH+zjNtwIDAQAB +AoGAUb0o91y/FjMs/72S0pes/lDz+JRRSGfyjKxQEgrgndNsADOhqRu0iTdrKDJj +XnlbN3ooecnFJfnFrvTQcJhSmlS30j6VrBw6LXpCBK3dvjYgJ9LOne7WK+dF1+vS +FMQtsP04C56Sxy6HJDpMyWJ6oS3Bu169ygG2AxKo+Fk+E6ECQQD38w/MzmrARz2Z +AGeEPDUnVZPYgtmXkmks95S0/2jSoLhmgpvJimzxwpYwVG/BG8dSDVuTDu5kp05D +3bZIp3EzAkEA6uAwJsCZPtHXlWU3wYZJsA697rUNjPaCQOIaZ/lnh5RUHTmUiw1h +Oj/VORqKB0kXqcDfawwLjZEvh1Xli+H5bQJBANTmhw2TvEPnp/OFTl1UGUvyBmXl +TRMB639qAu07VfVtfYi/4ya1zn/0VmOfTOoigQ5qW9Q1AOu6YNCTQl62L9MCQQDc +YfEsW2kvNYxYJHoVfuBjbuGuOnn1e1Oqd70ZND59S6NFLMMBWlORaVWzWACNZ3rp +kAzSj6HDeqgjD2jsQONdAkEAt7S1YHUn8F760bRn4AnAto2TVOYdArtTP/wYjd4o +9rJREO/d8AYkYJ96APLvF0SZ4n3t1pLwQRsKKN8ZGTmzLA== -----END RSA PRIVATE KEY----- diff --git a/mysql-test/std_data/server8k-cert.pem b/mysql-test/std_data/server8k-cert.pem index e71ba572..c4c4c3a6 100644 --- a/mysql-test/std_data/server8k-cert.pem +++ b/mysql-test/std_data/server8k-cert.pem @@ -1,51 +1,69 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 5 (0x5) + Signature Algorithm: sha1WithRSAEncryption + Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB + Validity + Not Before: Feb 20 03:00:54 2010 GMT + Not After : Sep 3 03:00:54 2030 GMT + Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=server + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public Key: (1024 bit) + Modulus (1024 bit): + 00:c5:da:44:95:06:77:16:21:af:a0:c4:3c:e9:f8: + 1d:2d:95:f9:63:90:8c:3f:86:ba:77:76:4a:52:4b: + 6b:af:29:f5:1c:aa:d4:3f:3e:42:9f:6d:46:ba:86: + 90:b1:2d:cc:db:c6:33:15:a3:f4:af:53:33:4f:a1: + 56:d1:aa:3b:26:10:f7:64:b5:f9:bf:1b:b1:47:8e: + cc:a6:d6:0d:aa:4a:77:e3:a3:63:9d:2a:dc:65:f4: + 7f:91:17:38:2d:d6:cd:4e:8d:53:52:97:6e:87:fc: + 64:60:a6:a1:00:ac:96:6c:e4:42:94:75:17:46:6f: + 91:b5:dd:06:47:ed:05:e3:db + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: + CA:FALSE + X509v3 Subject Key Identifier: + 6E:60:3F:29:13:60:99:ED:0C:F7:15:B5:DB:7B:1C:FB:6F:60:19:ED + X509v3 Authority Key Identifier: + keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0 + DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB + serial:BE:58:AD:4C:1F:3D:25:95 + + Signature Algorithm: sha1WithRSAEncryption + 63:2e:0f:07:14:06:cf:74:90:3d:37:42:f2:48:70:60:21:bc: + 34:52:31:f1:87:70:d2:b2:fb:ff:13:38:dc:f0:5e:43:d7:ee: + a7:c7:1f:ac:aa:d2:8c:4f:fa:3c:4c:73:f6:b6:c2:0c:a0:ea: + a2:c9:e2:73:61:c3:2e:78:40:0f:2a:d3:63:50:9b:b8:f9:89: + 40:ed:98:08:97:c3:07:24:17:34:b5:78:89:0a:bb:83:4c:e2: + 5c:2e:13:d6:21:30:ad:30:48:b5:70:12:ff:4a:6f:42:f0:f8: + 9f:b1:4b:bd:89:2b:f0:9d:e2:49:2b:35:69:18:1f:76:40:b4: + 76:bd:cb:dd:27:2f:c0:c1:e2:33:3e:6e:df:68:54:19:92:8a: + bb:13:9c:cf:d6:17:56:da:bf:0d:64:70:3a:45:b7:aa:5f:e3: + f5:96:ae:34:f2:17:37:27:d0:4b:e8:30:4a:c0:02:42:e2:d2: + 30:eb:eb:c7:d7:ec:d8:df:5c:43:58:e2:6f:b7:58:54:0d:c4: + 01:71:2d:59:8f:44:c7:a1:6c:0b:41:28:fa:b7:63:a7:68:d3: + 4f:c3:0f:17:9e:b2:32:50:e6:0b:87:3d:e2:39:47:c0:d8:0a: + 3b:f6:af:50:68:0f:9d:ef:6e:34:0d:3a:07:94:f8:a4:d7:24: + 86:32:d3:b4 -----BEGIN CERTIFICATE----- -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 -/w8pMRr8gEuRqpL2WdJiKGG6lhMHLVFo +MIIDIjCCAgqgAwIBAgIBBTANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ +MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT +UUwgQUIwHhcNMTAwMjIwMDMwMDU0WhcNMzAwOTAzMDMwMDU0WjBDMQswCQYDVQQG +EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxDzANBgNV +BAMTBnNlcnZlcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxdpElQZ3FiGv +oMQ86fgdLZX5Y5CMP4a6d3ZKUktrryn1HKrUPz5Cn21GuoaQsS3M28YzFaP0r1Mz +T6FW0ao7JhD3ZLX5vxuxR47MptYNqkp346NjnSrcZfR/kRc4LdbNTo1TUpduh/xk +YKahAKyWbORClHUXRm+Rtd0GR+0F49sCAwEAAaOBozCBoDAJBgNVHRMEAjAAMB0G +A1UdDgQWBBRuYD8pE2CZ7Qz3FbXbexz7b2AZ7TB0BgNVHSMEbTBrgBSx+353tUCN +aBF+2RHlw8baTaxRsKFIpEYwRDELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcHNh +bGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCggkAvlitTB89 +JZUwDQYJKoZIhvcNAQEFBQADggEBAGMuDwcUBs90kD03QvJIcGAhvDRSMfGHcNKy ++/8TONzwXkPX7qfHH6yq0oxP+jxMc/a2wgyg6qLJ4nNhwy54QA8q02NQm7j5iUDt +mAiXwwckFzS1eIkKu4NM4lwuE9YhMK0wSLVwEv9Kb0Lw+J+xS72JK/Cd4kkrNWkY +H3ZAtHa9y90nL8DB4jM+bt9oVBmSirsTnM/WF1bavw1kcDpFt6pf4/WWrjTyFzcn +0EvoMErAAkLi0jDr68fX7NjfXENY4m+3WFQNxAFxLVmPRMehbAtBKPq3Y6do00/D +DxeesjJQ5guHPeI5R8DYCjv2r1BoD53vbjQNOgeU+KTXJIYy07Q= -----END CERTIFICATE----- diff --git a/mysql-test/std_data/server8k-key.pem b/mysql-test/std_data/server8k-key.pem index 99e74177..d3c3ec5b 100644 --- a/mysql-test/std_data/server8k-key.pem +++ b/mysql-test/std_data/server8k-key.pem @@ -1,99 +1,15 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 1c2f5566..ef0325bd 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -30,10 +30,14 @@ sub skip_combinations { unless $::mysqld_variables{'innodb'} eq "ON"; # disable tests that use ipv6, if unsupported - use Socket; - $skip{'include/check_ipv6.inc'} = 'No IPv6' - unless socket SOCK, PF_INET6, SOCK_STREAM, getprotobyname('tcp'); - close SOCK; + sub ipv6_ok() { + use Socket; + return 0 unless socket my $sock, PF_INET6, SOCK_STREAM, getprotobyname('tcp'); + # eval{}, if there's no Socket::sockaddr_in6 at all, old Perl installation + eval { connect $sock, sockaddr_in6(7, Socket::IN6ADDR_LOOPBACK) }; + return $! != 101; + } + $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok(); %skip; } diff --git a/mysql-test/suite/federated/federated_maybe_16324629.result b/mysql-test/suite/federated/federated_maybe_16324629.result new file mode 100644 index 00000000..b1dd8097 --- /dev/null +++ b/mysql-test/suite/federated/federated_maybe_16324629.result @@ -0,0 +1,16 @@ +CREATE DATABASE federated; +CREATE DATABASE federated; +create table federated.t1 (a int, b int, unique key (a), key (b)); +create table t1 (a int, b int, unique key (a), key (b)) +engine=federated CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1'; +insert into t1 values (3, 3), (7, 7); +delete t1 from t1 where a = 3; +select * from t1; +a b +3 3 +7 7 +drop table t1; +DROP TABLE IF EXISTS federated.t1; +DROP DATABASE IF EXISTS federated; +DROP TABLE IF EXISTS federated.t1; +DROP DATABASE IF EXISTS federated; diff --git a/mysql-test/suite/federated/federated_maybe_16324629.test b/mysql-test/suite/federated/federated_maybe_16324629.test new file mode 100644 index 00000000..53d79e70 --- /dev/null +++ b/mysql-test/suite/federated/federated_maybe_16324629.test @@ -0,0 +1,23 @@ +# +# Inspired by a bug fix for internal Oracle MySQL bug#16324629 +# +source include/federated.inc; + +connection slave; +create table federated.t1 (a int, b int, unique key (a), key (b)); + +connection master; + +--replace_result $SLAVE_MYPORT SLAVE_PORT +eval create table t1 (a int, b int, unique key (a), key (b)) + engine=federated CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1'; + +insert into t1 values (3, 3), (7, 7); +delete t1 from t1 where a = 3; +select * from t1; +drop table t1; + +connection slave; +connection default; +source include/federated_cleanup.inc; + diff --git a/mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result b/mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result new file mode 100644 index 00000000..cc2a0373 --- /dev/null +++ b/mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result @@ -0,0 +1,39 @@ +# +# Bug#69122 - INNODB DOESN'T REDO-LOG INSERT BUFFER MERGE +# OPERATION IF IT IS DONE IN-PLACE +# +SET GLOBAL innodb_change_buffering_debug = 1; +CREATE TABLE t1( +a INT AUTO_INCREMENT PRIMARY KEY, +b CHAR(1), +c INT, +INDEX(b)) +ENGINE=InnoDB; +INSERT INTO t1 VALUES(0,'x',1); +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +BEGIN; +SELECT b FROM t1 LIMIT 3; +b +x +x +x +BEGIN; +DELETE FROM t1 WHERE a=1; +INSERT INTO t1 VALUES(1,'X',1); +SET DEBUG_DBUG='+d,crash_after_log_ibuf_upd_inplace'; +SELECT b FROM t1 LIMIT 3; +ERROR HY000: Lost connection to MySQL server during query +CHECK TABLE t1; +Table Op Msg_type Msg_text +test.t1 check status OK +DROP TABLE t1; diff --git a/mysql-test/suite/innodb/r/row_lock.result b/mysql-test/suite/innodb/r/row_lock.result new file mode 100644 index 00000000..c2fb7b90 --- /dev/null +++ b/mysql-test/suite/innodb/r/row_lock.result @@ -0,0 +1,16 @@ +CREATE TABLE t1 (a INT, b INT) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1,1),(2,2); +CREATE TABLE t2 (c INT, d INT) ENGINE=InnoDB; +INSERT INTO t2 VALUES (1,1), (2,2); +CREATE TABLE t3 (e INT) ENGINE=InnoDB; +CREATE TABLE t4 ENGINE=InnoDB AS SELECT * FROM t2; +BEGIN; +UPDATE t1 SET a = 0 WHERE a = ( SELECT e FROM t3 ); +SET DEBUG_SYNC='srv_suspend_mysql_thread_enter SIGNAL waiting'; +UPDATE t4 SET d = 1 WHERE d in ( SELECT a FROM t1 ) ORDER BY c LIMIT 6; +SET DEBUG_SYNC='now WAIT_FOR waiting'; +SET DEBUG_SYNC='RESET'; +UPDATE t4 SET d = 9; +ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +commit; +drop table t1,t2,t3,t4; diff --git a/mysql-test/suite/innodb/t/innodb-change-buffer-recovery-master.opt b/mysql-test/suite/innodb/t/innodb-change-buffer-recovery-master.opt new file mode 100644 index 00000000..33e2b863 --- /dev/null +++ b/mysql-test/suite/innodb/t/innodb-change-buffer-recovery-master.opt @@ -0,0 +1 @@ +--log-error=$MYSQLTEST_VARDIR/tmp/my_restart.err diff --git a/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test b/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test new file mode 100644 index 00000000..f54189a5 --- /dev/null +++ b/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test @@ -0,0 +1,70 @@ +--echo # +--echo # Bug#69122 - INNODB DOESN'T REDO-LOG INSERT BUFFER MERGE +--echo # OPERATION IF IT IS DONE IN-PLACE +--echo # +--source include/have_innodb.inc +# innodb_change_buffering_debug option is debug only +--source include/have_debug.inc +# Embedded server does not support crashing +--source include/not_embedded.inc +# DBUG_SUICIDE() hangs under valgrind +--source include/not_valgrind.inc + +# The flag innodb_change_buffering_debug is only available in debug builds. +# It instructs InnoDB to try to evict pages from the buffer pool when +# change buffering is possible, so that the change buffer will be used +# whenever possible. +SET GLOBAL innodb_change_buffering_debug = 1; +let SEARCH_FILE = $MYSQLTEST_VARDIR/tmp/my_restart.err; + +CREATE TABLE t1( + a INT AUTO_INCREMENT PRIMARY KEY, + b CHAR(1), + c INT, + INDEX(b)) +ENGINE=InnoDB; + +# Create enough rows for the table, so that the change buffer will be +# used for modifying the secondary index page. There must be multiple +# index pages, because changes to the root page are never buffered. +INSERT INTO t1 VALUES(0,'x',1); +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; +INSERT INTO t1 SELECT 0,b,c FROM t1; + +BEGIN; +SELECT b FROM t1 LIMIT 3; + +connect (con1,localhost,root,,); +connection con1; +BEGIN; +DELETE FROM t1 WHERE a=1; +# This should be buffered, if innodb_change_buffering_debug = 1 is in effect. +INSERT INTO t1 VALUES(1,'X',1); + +SET DEBUG_DBUG='+d,crash_after_log_ibuf_upd_inplace'; +--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +--error 2013 +# This should force a change buffer merge +SELECT b FROM t1 LIMIT 3; + +let SEARCH_PATTERN=Wrote log record for ibuf update in place operation; +--source include/search_pattern_in_file.inc + +# Write file to make mysql-test-run.pl start up the server again +--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +--enable_reconnect +--source include/wait_until_connected_again.inc + +CHECK TABLE t1; + +# Cleanup +DROP TABLE t1; diff --git a/mysql-test/suite/innodb/t/row_lock.test b/mysql-test/suite/innodb/t/row_lock.test new file mode 100644 index 00000000..76ac4fec --- /dev/null +++ b/mysql-test/suite/innodb/t/row_lock.test @@ -0,0 +1,48 @@ +# +# Test of wrong call to unlock_row +# MDEV-5629 Failing assertion: state == TRX_STATE_NOT_STARTED on +# concurrent CREATE OR REPLACE and transactional UPDATE +# + +--source include/have_innodb.inc +--source include/have_debug_sync.inc + +CREATE TABLE t1 (a INT, b INT) ENGINE=InnoDB; +INSERT INTO t1 VALUES (1,1),(2,2); + +CREATE TABLE t2 (c INT, d INT) ENGINE=InnoDB; +INSERT INTO t2 VALUES (1,1), (2,2); + +CREATE TABLE t3 (e INT) ENGINE=InnoDB; +CREATE TABLE t4 ENGINE=InnoDB AS SELECT * FROM t2; + +--connect (con11,localhost,root,,test) + +BEGIN; +UPDATE t1 SET a = 0 WHERE a = ( SELECT e FROM t3 ); + +--connect (con12,localhost,root,,test) + +SET DEBUG_SYNC='srv_suspend_mysql_thread_enter SIGNAL waiting'; + +--send +UPDATE t4 SET d = 1 WHERE d in ( SELECT a FROM t1 ) ORDER BY c LIMIT 6; + +--connection con11 + +# Wait for con12 to start waiting for con11 + +SET DEBUG_SYNC='now WAIT_FOR waiting'; +SET DEBUG_SYNC='RESET'; + +UPDATE t4 SET d = 9; + +--connection con12 +--error ER_LOCK_DEADLOCK +--reap +--connection con11 +commit; +--connection default +--disconnect con12 +--disconnect con11 +drop table t1,t2,t3,t4; diff --git a/mysql-test/suite/innodb/r/innodb-create-options.result b/mysql-test/suite/innodb_zip/r/innodb-create-options.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb-create-options.result rename to mysql-test/suite/innodb_zip/r/innodb-create-options.result diff --git a/mysql-test/suite/innodb/r/innodb-zip.result b/mysql-test/suite/innodb_zip/r/innodb-zip.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb-zip.result rename to mysql-test/suite/innodb_zip/r/innodb-zip.result diff --git a/mysql-test/suite/innodb/r/innodb_bug36169.result b/mysql-test/suite/innodb_zip/r/innodb_bug36169.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_bug36169.result rename to mysql-test/suite/innodb_zip/r/innodb_bug36169.result diff --git a/mysql-test/suite/innodb/r/innodb_bug36172.result b/mysql-test/suite/innodb_zip/r/innodb_bug36172.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_bug36172.result rename to mysql-test/suite/innodb_zip/r/innodb_bug36172.result diff --git a/mysql-test/suite/innodb/r/innodb_bug52745.result b/mysql-test/suite/innodb_zip/r/innodb_bug52745.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_bug52745.result rename to mysql-test/suite/innodb_zip/r/innodb_bug52745.result diff --git a/mysql-test/suite/innodb/r/innodb_bug53591.result b/mysql-test/suite/innodb_zip/r/innodb_bug53591.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_bug53591.result rename to mysql-test/suite/innodb_zip/r/innodb_bug53591.result diff --git a/mysql-test/suite/innodb/r/innodb_bug56680.result b/mysql-test/suite/innodb_zip/r/innodb_bug56680.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_bug56680.result rename to mysql-test/suite/innodb_zip/r/innodb_bug56680.result diff --git a/mysql-test/suite/innodb/r/innodb_cmp_drop_table.result b/mysql-test/suite/innodb_zip/r/innodb_cmp_drop_table.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_cmp_drop_table.result rename to mysql-test/suite/innodb_zip/r/innodb_cmp_drop_table.result diff --git a/mysql-test/suite/innodb/r/innodb_index_large_prefix.result b/mysql-test/suite/innodb_zip/r/innodb_index_large_prefix.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_index_large_prefix.result rename to mysql-test/suite/innodb_zip/r/innodb_index_large_prefix.result diff --git a/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result b/mysql-test/suite/innodb_zip/r/innodb_prefix_index_liftedlimit.result similarity index 100% rename from mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result rename to mysql-test/suite/innodb_zip/r/innodb_prefix_index_liftedlimit.result diff --git a/mysql-test/suite/innodb/t/innodb-create-options.test b/mysql-test/suite/innodb_zip/t/innodb-create-options.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb-create-options.test rename to mysql-test/suite/innodb_zip/t/innodb-create-options.test diff --git a/mysql-test/suite/innodb/t/innodb-zip.test b/mysql-test/suite/innodb_zip/t/innodb-zip.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb-zip.test rename to mysql-test/suite/innodb_zip/t/innodb-zip.test diff --git a/mysql-test/suite/innodb/t/innodb_bug36169.test b/mysql-test/suite/innodb_zip/t/innodb_bug36169.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_bug36169.test rename to mysql-test/suite/innodb_zip/t/innodb_bug36169.test diff --git a/mysql-test/suite/innodb/t/innodb_bug36172.test b/mysql-test/suite/innodb_zip/t/innodb_bug36172.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_bug36172.test rename to mysql-test/suite/innodb_zip/t/innodb_bug36172.test diff --git a/mysql-test/suite/innodb/t/innodb_bug52745.test b/mysql-test/suite/innodb_zip/t/innodb_bug52745.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_bug52745.test rename to mysql-test/suite/innodb_zip/t/innodb_bug52745.test diff --git a/mysql-test/suite/innodb/t/innodb_bug53591.test b/mysql-test/suite/innodb_zip/t/innodb_bug53591.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_bug53591.test rename to mysql-test/suite/innodb_zip/t/innodb_bug53591.test diff --git a/mysql-test/suite/innodb/t/innodb_bug56680.test b/mysql-test/suite/innodb_zip/t/innodb_bug56680.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_bug56680.test rename to mysql-test/suite/innodb_zip/t/innodb_bug56680.test diff --git a/mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt b/mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table-master.opt similarity index 100% rename from mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt rename to mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table-master.opt diff --git a/mysql-test/suite/innodb/t/innodb_cmp_drop_table.test b/mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_cmp_drop_table.test rename to mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table.test diff --git a/mysql-test/suite/innodb/t/innodb_index_large_prefix.test b/mysql-test/suite/innodb_zip/t/innodb_index_large_prefix.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_index_large_prefix.test rename to mysql-test/suite/innodb_zip/t/innodb_index_large_prefix.test diff --git a/mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test b/mysql-test/suite/innodb_zip/t/innodb_prefix_index_liftedlimit.test similarity index 100% rename from mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test rename to mysql-test/suite/innodb_zip/t/innodb_prefix_index_liftedlimit.test diff --git a/mysql-test/suite/perfschema/r/all_instances.result b/mysql-test/suite/perfschema/r/all_instances.result index caf4f490..6e4206b2 100644 --- a/mysql-test/suite/perfschema/r/all_instances.result +++ b/mysql-test/suite/perfschema/r/all_instances.result @@ -149,6 +149,7 @@ wait/io/file/mysys/charset wait/io/file/sql/casetest wait/io/file/sql/dbopt wait/io/file/sql/ERRMSG +wait/io/file/sql/file_parser wait/io/file/sql/FRM wait/io/file/sql/pid wait/io/file/sql/query_log diff --git a/mysql-test/suite/plugins/t/unix_socket.test b/mysql-test/suite/plugins/t/unix_socket.test index 72106fab..5869e271 100644 --- a/mysql-test/suite/plugins/t/unix_socket.test +++ b/mysql-test/suite/plugins/t/unix_socket.test @@ -3,10 +3,23 @@ # get .result differences from CURRENT_USER(). --source include/not_as_root.inc +# The previous check verifies that the user does not have root permissions. +# However in some cases tests are run under a user named 'root', +# even although this user does not have real root permissions. +# This test should be skipped in this case, since it does not expect +# that there are records in mysql.user where user= +if ($USER=="root") { + skip Cannot be run by user named 'root' even if it does not have all privileges; +} + if (!$AUTH_SOCKET_SO) { skip No auth_socket plugin; } +if (!$USER) { + skip USER variable is undefined; +} + let $plugindir=`SELECT @@global.plugin_dir`; eval install plugin unix_socket soname '$AUTH_SOCKET_SO'; diff --git a/mysql-test/suite/rpl/r/rpl_ddl.result b/mysql-test/suite/rpl/r/rpl_ddl.result index 246ae379..0173bf1e 100644 --- a/mysql-test/suite/rpl/r/rpl_ddl.result +++ b/mysql-test/suite/rpl/r/rpl_ddl.result @@ -1617,6 +1617,7 @@ user use test; -------- switch to master ------- +DROP TEMPORARY TABLE mysqltest1.t22; DROP DATABASE mysqltest1; DROP DATABASE mysqltest3; include/rpl_end.inc diff --git a/mysql-test/suite/sphinx/sphinx.result b/mysql-test/suite/sphinx/sphinx.result index 82c76335..7248dbc6 100644 --- a/mysql-test/suite/sphinx/sphinx.result +++ b/mysql-test/suite/sphinx/sphinx.result @@ -48,7 +48,7 @@ SET optimizer_switch=@save_optimizer_switch; drop table ts; show status like "sphinx_error%"; Variable_name Value -Sphinx_error OFF +Sphinx_error show status like "sphinx_total%"; Variable_name Value Sphinx_total 2 diff --git a/mysql-test/suite/sphinx/suite.pm b/mysql-test/suite/sphinx/suite.pm index f9787d80..91795803 100644 --- a/mysql-test/suite/sphinx/suite.pm +++ b/mysql-test/suite/sphinx/suite.pm @@ -60,6 +60,7 @@ sub searchd_start { my ($sphinx, $test) = @_; # My::Config::Group, My::Test return unless $exe_sphinx_indexer and $exe_sphinx_searchd; + return if $sphinx->{proc}; # Already started # First we must run the indexer to create the data. my $sphinx_data_dir= "$::opt_vardir/" . $sphinx->name(); diff --git a/mysql-test/suite/sphinx/union-5539.result b/mysql-test/suite/sphinx/union-5539.result new file mode 100644 index 00000000..414bcce3 --- /dev/null +++ b/mysql-test/suite/sphinx/union-5539.result @@ -0,0 +1,10 @@ +create table ts (id bigint unsigned not null, w int not null, query varchar(255) not null, index(query)) engine=sphinx connection="sphinx://127.0.0.1:PORT/*"; +SELECT a.* FROM (SELECT * FROM ts si WHERE si.query=';mode=extended2;limit=1000000;maxmatches=500') AS a UNION SELECT b.* FROM (SELECT * FROM ts si WHERE si.query='@* 123nothingtofind123;mode=extended2;limit=1000000;maxmatches=500') AS b; +id w query +SELECT a.* FROM (SELECT * FROM ts si WHERE si.query='@* 123nothingtofind123;mode=extended2;limit=1000000;maxmatches=500') AS a UNION SELECT b.* FROM (SELECT * FROM ts si WHERE si.query=';mode=extended2;limit=1000000;maxmatches=500') AS b; +id w query +1 1 ;mode=extended2;limit=1000000;maxmatches=500 +2 1 ;mode=extended2;limit=1000000;maxmatches=500 +3 1 ;mode=extended2;limit=1000000;maxmatches=500 +4 1 ;mode=extended2;limit=1000000;maxmatches=500 +drop table ts; diff --git a/mysql-test/suite/sphinx/union-5539.test b/mysql-test/suite/sphinx/union-5539.test new file mode 100644 index 00000000..ec73be1a --- /dev/null +++ b/mysql-test/suite/sphinx/union-5539.test @@ -0,0 +1,16 @@ +# +# MDEV-5539 Empty results in UNION with Sphinx engine +# +--replace_result $SPHINXSEARCH_PORT PORT +eval create table ts (id bigint unsigned not null, w int not null, query varchar(255) not null, index(query)) engine=sphinx connection="sphinx://127.0.0.1:$SPHINXSEARCH_PORT/*"; +let $q1=SELECT * FROM ts si WHERE si.query=';mode=extended2;limit=1000000;maxmatches=500'; +let $q2=SELECT * FROM ts si WHERE si.query='@* 123nothingtofind123;mode=extended2;limit=1000000;maxmatches=500'; +######################## +# BUG BUG BUG !!! +# Note, the result below is incorrect! It should be updated when +# MDEV-5539 is fixed upstream!!! +######################## +eval SELECT a.* FROM ($q1) AS a UNION SELECT b.* FROM ($q2) AS b; +eval SELECT a.* FROM ($q2) AS a UNION SELECT b.* FROM ($q1) AS b; +drop table ts; + diff --git a/mysql-test/suite/sys_vars/r/progress_report_time_basic.result b/mysql-test/suite/sys_vars/r/progress_report_time_basic.result index 7aab917b..b8e8c39f 100644 --- a/mysql-test/suite/sys_vars/r/progress_report_time_basic.result +++ b/mysql-test/suite/sys_vars/r/progress_report_time_basic.result @@ -1,22 +1,22 @@ SET @start_global_value = @@global.progress_report_time; select @@global.progress_report_time; @@global.progress_report_time -56 +5 select @@session.progress_report_time; @@session.progress_report_time -56 +5 show global variables like 'progress_report_time'; Variable_name Value -progress_report_time 56 +progress_report_time 5 show session variables like 'progress_report_time'; Variable_name Value -progress_report_time 56 +progress_report_time 5 select * from information_schema.global_variables where variable_name='progress_report_time'; VARIABLE_NAME VARIABLE_VALUE -PROGRESS_REPORT_TIME 56 +PROGRESS_REPORT_TIME 5 select * from information_schema.session_variables where variable_name='progress_report_time'; VARIABLE_NAME VARIABLE_VALUE -PROGRESS_REPORT_TIME 56 +PROGRESS_REPORT_TIME 5 set global progress_report_time=10; select @@global.progress_report_time; @@global.progress_report_time diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index 4514928e..8631789f 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -316,4 +316,9 @@ ERROR HY000: The value specified for computed column 'd' in table 't1' ignored INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a'); ERROR HY000: The value specified for computed column 'd' in table 't1' ignored drop table t1; +# +# MDEV-5611: self-referencing virtual column +# +create table t1 (a int, b int as (b is null) virtual); +ERROR HY000: A computed column cannot be based on a computed column # end of 5.3 tests diff --git a/mysql-test/suite/vcol/t/vcol_misc.test b/mysql-test/suite/vcol/t/vcol_misc.test index 9c844321..a4c1fc06 100644 --- a/mysql-test/suite/vcol/t/vcol_misc.test +++ b/mysql-test/suite/vcol/t/vcol_misc.test @@ -275,4 +275,11 @@ UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND `d`='a INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a'); drop table t1; +--echo # +--echo # MDEV-5611: self-referencing virtual column +--echo # + +--error ER_VCOL_BASED_ON_VCOL +create table t1 (a int, b int as (b is null) virtual); + --echo # end of 5.3 tests diff --git a/mysql-test/t/comments.test b/mysql-test/t/comments.test index 08c74c99..4d476746 100644 --- a/mysql-test/t/comments.test +++ b/mysql-test/t/comments.test @@ -28,6 +28,7 @@ select 1 /*M! +1 */; select 1 /*M!50000 +1 */; select 1 /*M!50300 +1 */; select 2 /*M!99999 +1 */; +select 2 /*M!100000 +1 */; --error ER_PARSE_ERROR select 2 /*M!0000 +1 */; @@ -39,7 +40,7 @@ select 2 /*M!0000 +1 */; select 1/*!2*/; --error ER_PARSE_ERROR -select 1/*!000002*/; +select 1/*!0000002*/; select 1/*!999992*/; diff --git a/mysql-test/t/distinct.test b/mysql-test/t/distinct.test index 71643a25..952609be 100644 --- a/mysql-test/t/distinct.test +++ b/mysql-test/t/distinct.test @@ -750,4 +750,42 @@ INSERT INTO t1 VALUES (1111, 2222), (3333, 4444); SELECT DISTINCT CONCAT(a,b) AS c FROM t1 ORDER BY 1; DROP TABLE t1; +--echo # +--echo # Bug#16539979 BASIC SELECT COUNT(DISTINCT ID) IS BROKEN. +--echo # Bug#17867117 ERROR RESULT WHEN "COUNT + DISTINCT + CASE WHEN" NEED MERGE_WALK +--echo # + +SET @tmp_table_size_save= @@tmp_table_size; +SET @@tmp_table_size= 1024; + +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8); +INSERT INTO t1 SELECT a+8 FROM t1; +INSERT INTO t1 SELECT a+16 FROM t1; +INSERT INTO t1 SELECT a+32 FROM t1; +INSERT INTO t1 SELECT a+64 FROM t1; +INSERT INTO t1 VALUE(NULL); +SELECT COUNT(DISTINCT a) FROM t1; +SELECT COUNT(DISTINCT (a+0)) FROM t1; +DROP TABLE t1; + +create table tb( +id int auto_increment primary key, +v varchar(32)) +engine=myisam charset=gbk; +insert into tb(v) values("aaa"); +insert into tb(v) (select v from tb); +insert into tb(v) (select v from tb); +insert into tb(v) (select v from tb); +insert into tb(v) (select v from tb); +insert into tb(v) (select v from tb); +insert into tb(v) (select v from tb); + +update tb set v=concat(v, id); +select count(distinct case when id<=64 then id end) from tb; +select count(distinct case when id<=63 then id end) from tb; +drop table tb; + +SET @@tmp_table_size= @tmp_table_size_save; + --echo End of 5.5 tests diff --git a/mysql-test/t/error_simulation.test b/mysql-test/t/error_simulation.test index ea7dd12f..58ead1e3 100644 --- a/mysql-test/t/error_simulation.test +++ b/mysql-test/t/error_simulation.test @@ -103,7 +103,7 @@ CREATE TABLE t2(f1 INT); INSERT INTO t1 VALUES (1),(2); INSERT INTO t2 VALUES (1),(2); SET SESSION debug_dbug="+d,bug11747970_raise_error"; ---error 1105 +--error ER_QUERY_INTERRUPTED INSERT IGNORE INTO t2 SELECT f1 FROM t1 a WHERE NOT EXISTS (SELECT 1 FROM t2 b WHERE a.f1 = b.f1); SET SESSION debug_dbug = DEFAULT; DROP TABLE t1,t2; diff --git a/mysql-test/t/events_trans.test b/mysql-test/t/events_trans.test index 4cf2583a..6d829379 100644 --- a/mysql-test/t/events_trans.test +++ b/mysql-test/t/events_trans.test @@ -146,3 +146,4 @@ SELECT * FROM t2; ROLLBACK WORK TO SAVEPOINT A; DROP TABLE t1, t2; +DROP EVENT e1; diff --git a/mysql-test/t/func_group.test b/mysql-test/t/func_group.test index cf5f00c3..363f089e 100644 --- a/mysql-test/t/func_group.test +++ b/mysql-test/t/func_group.test @@ -981,10 +981,13 @@ DROP TABLE D; # # Bug #39656: Behaviour different for agg functions with & without where - # ONLY_FULL_GROUP_BY +# MDEV-5617 mysqld crashes when running a query with ONLY_FULL_GROUP_BY # CREATE TABLE t1 (a INT, b INT); INSERT INTO t1 VALUES (1,1), (1,2), (1,3); +CREATE TABLE t2 (b INT); +INSERT INTO t2 VALUES (3),(4); SET SQL_MODE='ONLY_FULL_GROUP_BY'; @@ -1000,11 +1003,18 @@ SELECT COUNT(*) FROM t1 a JOIN t1 b ON a.a= b.a; SELECT COUNT(*), (SELECT count(*) FROM t1 inr WHERE inr.a = outr.a) FROM t1 outr; +--error ER_MIX_OF_GROUP_FUNC_AND_FIELDS +SELECT COUNT(*) FROM t1 outr, (SELECT b, count(*) FROM t2) as t3; + +SELECT COUNT(*) FROM t1 outr where (1,1) in (SELECT a, count(*) FROM t2); + SELECT COUNT(*) FROM t1 a JOIN t1 outr ON a.a= (SELECT count(*) FROM t1 inr WHERE inr.a = outr.a); +SELECT * FROM (SELECT a FROM t1 GROUP BY a) sq JOIN t2 ON a = b; + SET SQL_MODE=default; -DROP TABLE t1; +DROP TABLE t1,t2; ### diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test index 292db69a..424722a8 100644 --- a/mysql-test/t/func_misc.test +++ b/mysql-test/t/func_misc.test @@ -298,6 +298,14 @@ DROP TABLE t1; SELECT INET_NTOA(0); SELECT '1' IN ('1', INET_NTOA(0)); +# +# MDEV-5655 Server crashes on NAME_CONST containing AND/OR expressions +# +--error ER_WRONG_ARGUMENTS +SELECT NAME_CONST('a', -(1 OR 2)) OR 1; +--error ER_WRONG_ARGUMENTS +SELECT NAME_CONST('a', -(1 AND 2)) AND 1; +SELECT NAME_CONST('a', -(1)) OR 1; --echo # --echo # Bug #52165: Assertion failed: file .\dtoa.c, line 465 @@ -372,6 +380,3 @@ drop table t1,tv; --echo # End of 5.5 tests --echo # ---echo # ---echo # End of tests ---echo # diff --git a/mysql-test/t/gis-precise.test b/mysql-test/t/gis-precise.test index d021bb0b..0c6410b5 100644 --- a/mysql-test/t/gis-precise.test +++ b/mysql-test/t/gis-precise.test @@ -325,3 +325,6 @@ SELECT ST_NUMPOINTS(ST_EXTERIORRING(ST_BUFFER( POLYGONFROMTEXT( 'POLYGON( ( 0.0 0.0 -3.0 ))' ), 3 ))); +# MDEV-5615 crash in Gcalc_function::add_operation +select astext(buffer(st_linestringfromwkb(linestring(point(-1,1), point(-1,-2))),-1)); + diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index cff93fc1..534cabaf 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -1433,6 +1433,24 @@ SELECT 1 FROM g1 WHERE a >= ANY DROP TABLE g1; +--echo # +--echo # Bug#16451878 GEOMETRY QUERY CRASHES SERVER +--echo # + +--echo # should not crash +SELECT ASTEXT(0x0100000000030000000100000000000010); + +--echo #should not crash +SELECT ENVELOPE(0x0100000000030000000100000000000010); + +--echo #should not crash +SELECT + GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffff0000, 1); + +--echo #should not crash +SELECT + GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1); + --echo # --echo # MDEV-3819 missing constraints for spatial column types --echo # diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 5af27607..9824abe7 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -2437,6 +2437,21 @@ SET @@global.log_output= @old_log_output_state; SET @@global.slow_query_log= @old_slow_query_log_state; SET @@global.general_log= @old_general_log_state; +--echo # MDEV-5481 mysqldump fails to dump geometry types properly + +create table t1 (g GEOMETRY) CHARSET koi8r; +create table t2 (g GEOMETRY) CHARSET koi8r; +insert into t1 values (point(1,1)), (point(2,2)); +--exec $MYSQL_DUMP --hex-blob --character-sets-dir=$MYSQL_SHAREDIR/charsets --tab=$MYSQLTEST_VARDIR/tmp/ test t1 +--echo ################################################## +--cat_file $file +--echo ################################################## +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +--eval LOAD DATA INFILE '$file' INTO TABLE t2 CHARACTER SET koi8r +--remove_file $file +select astext(g) from t2; +drop table t1, t2; + --echo # --echo # End of 5.1 tests --echo # diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test index 03890770..63f29ffd 100644 --- a/mysql-test/t/partition.test +++ b/mysql-test/t/partition.test @@ -2494,3 +2494,335 @@ INSERT INTO t1 VALUES (1),(2),(2),(3),(4); ALTER TABLE t1 ADD PARTITION PARTITIONS 2; SELECT * from t1 order by i; DROP TABLE t1; + +--echo # +--echo # MDEV-5177: ha_partition and innodb index intersection produce fewer rows (MySQL Bug#70703) +--echo # +create table t1 ( + a int not null, + b int not null, + pk int not null, + primary key (pk), + key(a), + key(b) +) partition by hash(pk) partitions 10; + +insert into t1 values (1,2,4); # both +insert into t1 values (1,0,17); # left +insert into t1 values (1,2,25); # both + +insert into t1 values (10,20,122); +insert into t1 values (10,20,123); + +# Now, fill in some data so that the optimizer choses index_merge +create table t2 (a int); +insert into t2 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); + +insert into t1 select 1,2, 200 + A.a + 10*B.a + 100*C.a from t2 A, t2 B, t2 C; + +insert into t1 select 10+A.a + 10*B.a + 100*C.a + 1000*D.a, + 10+A.a + 10*B.a + 100*C.a + 1000*D.a, + 2000 + A.a + 10*B.a + 100*C.a + 1000*D.a + from t2 A, t2 B, t2 C ,t2 D; + +# This should show index_merge, using intersect +explain select * from t1 where a=1 and b=2 and pk between 1 and 999999 ; +# 794 rows in output +create temporary table t3 as +select * from t1 where a=1 and b=2 and pk between 1 and 999 ; +select count(*) from t3; +drop table t3; + +# 802 rows in output +create temporary table t3 as +select * from t1 ignore index(a,b) where a=1 and b=2 and pk between 1 and 999 ; +select count(*) from t3; +drop table t3; + +drop table t1,t2; + +--echo # +--echo # MDEV-5555: Incorrect index_merge on BTREE indices +--echo # + +CREATE TABLE t1 ( + id bigint(20) unsigned NOT NULL, + id2 bigint(20) unsigned NOT NULL, + dob date DEFAULT NULL, + address char(100) DEFAULT NULL, + city char(35) DEFAULT NULL, + hours_worked_per_week smallint(5) unsigned DEFAULT NULL, + weeks_worked_last_year tinyint(3) unsigned DEFAULT NULL, + KEY dob (dob), + KEY address (address), + KEY city (city), + KEY hours_worked_per_week (hours_worked_per_week), + KEY weeks_worked_last_year (weeks_worked_last_year) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +PARTITION BY KEY (id) PARTITIONS 5; + +--echo # Insert some rows +--disable_query_log +INSERT INTO t1 VALUES (123,123,'2001-04-14','address123','city123',40,51), +(127,127,'1977-03-30','address127','city127',0,0), +(131,131,'1985-07-29','address131','city131',50,52), +(135,135,'1997-01-20','address135','city135',0,0), +(139,139,'1963-04-27','address139','city139',27,52), +(143,143,'1979-01-28','address143','city143',40,52), +(147,147,'1985-08-28','address147','city147',0,0), +(151,151,'1997-01-24','address151','city151',40,52), +(156,156,'1975-02-19','address156','city156',46,52), +(158,158,'1996-07-06','address158','city158',46,8), +(164,164,'1925-12-30','address164','city164',0,0), +(166,166,'2010-12-30','address166','city166',0,0), +(172,172,'1996-08-15','address172','city172',0,0), +(174,174,'2008-05-20','address174','city174',40,52), +(180,180,'1969-09-05','address180','city180',25,52), +(182,182,'1977-08-11','address182','city182',40,8), +(188,188,'2012-03-29','address188','city188',0,0), +(190,190,'1978-02-19','address190','city190',0,0), +(215,215,'1982-02-07','address215','city215',40,36), +(223,223,'2005-02-11','address223','city223',55,52), +(247,247,'2005-07-02','address247','city247',30,51), +(255,255,'1997-08-15','address255','city255',0,0), +(2,2,'1973-05-05','address2','city2',25,52), +(4,4,'2012-07-21','address4','city4',40,12), +(6,6,'1982-07-15','address6','city6',0,0), +(8,8,'1979-02-16','address8','city8',0,0), +(10,10,'1955-10-06','address10','city10',60,52), +(12,12,'1977-08-09','address12','city12',40,52), +(14,14,'2005-03-28','address14','city14',0,0), +(16,16,'1949-11-07','address16','city16',40,52), +(18,18,'2012-01-04','address18','city18',0,0), +(20,20,'2011-01-23','address20','city20',0,0), +(22,22,'1954-10-14','address22','city22',20,52), +(24,24,'2010-01-22','address24','city24',0,0), +(26,26,'1999-08-15','address26','city26',0,0), +(28,28,'1964-07-05','address28','city28',10,20), +(30,30,'2004-10-13','address30','city30',0,0), +(32,32,'2007-06-08','address32','city32',0,0), +(34,34,'1977-02-23','address34','city34',40,52), +(36,36,'2007-06-11','address36','city36',75,52), +(38,38,'1932-04-12','address38','city38',0,0), +(40,40,'1968-11-16','address40','city40',0,0), +(42,42,'1996-10-01','address42','city42',38,52), +(44,44,'1977-08-23','address44','city44',18,6), +(46,46,'1978-11-23','address46','city46',0,0), +(48,48,'1998-02-27','address48','city48',0,0), +(50,50,'1923-09-08','address50','city50',40,52), +(52,52,'1964-09-09','address52','city52',0,0), +(55,55,'2001-01-27','address55','city55',40,40), +(56,56,'1938-08-28','address56','city56',48,52), +(59,59,'1967-12-19','address59','city59',40,52), +(60,60,'1969-06-30','address60','city60',40,46), +(63,63,'2002-04-05','address63','city63',0,0), +(64,64,'1972-11-21','address64','city64',48,52), +(67,67,'1988-04-04','address67','city67',0,0), +(68,68,'1964-07-14','address68','city68',4,16), +(71,71,'1998-03-09','address71','city71',0,0), +(72,72,'1960-10-28','address72','city72',35,52), +(75,75,'1968-04-14','address75','city75',40,52), +(76,76,'1977-05-13','address76','city76',0,0), +(79,79,'1982-12-19','address79','city79',0,0), +(80,80,'1966-01-07','address80','city80',15,12), +(83,83,'1947-02-09','address83','city83',10,18), +(84,84,'1976-06-23','address84','city84',40,52), +(87,87,'2000-10-24','address87','city87',25,4), +(88,88,'2002-05-23','address88','city88',20,52), +(91,91,'2000-11-28','address91','city91',60,52), +(92,92,'1965-07-17','address92','city92',40,52), +(95,95,'1977-09-16','address95','city95',30,52), +(96,96,'1994-09-26','address96','city96',0,0), +(99,99,'2008-02-19','address99','city99',0,0), +(100,100,'1953-01-07','address100','city100',0,0), +(103,103,'2010-12-29','address103','city103',0,0), +(104,104,'1990-12-03','address104','city104',40,52), +(107,107,'2003-10-27','address107','city107',0,0), +(108,108,'1998-03-05','address108','city108',40,17), +(111,111,'2002-10-18','address111','city111',0,0), +(112,112,'1960-04-02','address112','city112',0,0), +(115,115,'1989-05-28','address115','city115',40,52), +(116,116,'1985-10-25','address116','city116',15,52), +(119,119,'1974-04-15','address119','city119',0,0), +(120,120,'1926-03-21','address120','city120',0,0), +(157,157,'1972-03-23','address157','city157',0,0), +(159,159,'2002-11-08','address159','city159',0,0), +(165,165,'1998-07-10','address165','city165',0,0), +(167,167,'1973-11-16','address167','city167',0,0), +(173,173,'1966-06-26','address173','city173',0,0), +(175,175,'1957-02-02','address175','city175',0,0), +(181,181,'1964-11-16','address181','city181',45,26), +(183,183,'1943-12-02','address183','city183',0,0), +(189,189,'1986-06-30','address189','city189',0,0), +(191,191,'2005-05-14','address191','city191',0,0), +(196,196,'1961-03-23','address196','city196',0,0), +(197,197,'1955-07-13','address197','city197',0,0), +(198,198,'2006-11-26','address198','city198',0,0), +(199,199,'1978-02-06','address199','city199',0,0), +(208,208,'2012-04-13','address208','city208',48,52), +(210,210,'1989-08-18','address210','city210',0,0), +(211,211,'1982-08-17','address211','city211',40,52), +(212,212,'1919-08-29','address212','city212',0,0), +(213,213,'1987-03-25','address213','city213',0,0), +(228,228,'1988-05-05','address228','city228',40,52), +(229,229,'1936-10-15','address229','city229',0,0), +(230,230,'1973-08-19','address230','city230',40,52), +(231,231,'2002-06-18','address231','city231',50,52), +(240,240,'2011-10-17','address240','city240',60,52), +(242,242,'1981-07-24','address242','city242',0,0), +(243,243,'1978-10-12','address243','city243',0,0), +(244,244,'2003-01-15','address244','city244',0,0), +(245,245,'1950-09-26','address245','city245',0,0), +(125,125,'1939-08-02','address125','city125',28,32), +(126,126,'1984-02-10','address126','city126',0,0), +(129,129,'1992-01-20','address129','city129',0,0), +(130,130,'1992-09-18','address130','city130',0,0), +(133,133,'1996-05-07','address133','city133',24,20), +(134,134,'1987-07-13','address134','city134',0,0), +(137,137,'2004-03-10','address137','city137',0,0), +(138,138,'1989-02-10','address138','city138',0,0), +(141,141,'1970-03-21','address141','city141',0,0), +(142,142,'1984-05-25','address142','city142',40,50), +(145,145,'1959-05-24','address145','city145',0,0), +(146,146,'1946-07-28','address146','city146',35,16), +(149,149,'1993-09-16','address149','city149',0,0), +(150,150,'1975-12-18','address150','city150',0,0), +(153,153,'1993-12-20','address153','city153',0,0), +(155,155,'1934-10-29','address155','city155',0,0), +(161,161,'1969-11-04','address161','city161',50,50), +(163,163,'1976-05-03','address163','city163',40,52), +(169,169,'1982-12-19','address169','city169',0,0), +(171,171,'1976-07-01','address171','city171',0,0), +(177,177,'2002-11-16','address177','city177',0,0), +(179,179,'1964-02-05','address179','city179',40,32), +(185,185,'1981-02-06','address185','city185',0,0), +(187,187,'1962-06-04','address187','city187',40,52), +(216,216,'1996-05-21','address216','city216',48,52), +(248,248,'1963-09-06','address248','city248',0,0), +(256,256,'1966-07-14','address256','city256',0,0), +(53,53,'1992-05-25','address53','city53',0,0), +(57,57,'2003-11-12','address57','city57',25,20), +(61,61,'1953-01-29','address61','city61',0,0), +(65,65,'1975-05-02','address65','city65',10,10), +(69,69,'1938-03-20','address69','city69',0,0), +(73,73,'1969-05-05','address73','city73',0,0), +(77,77,'1996-05-19','address77','city77',0,0), +(81,81,'1985-06-22','address81','city81',0,0), +(85,85,'2002-10-10','address85','city85',0,0), +(89,89,'1958-06-16','address89','city89',0,0), +(93,93,'1962-06-16','address93','city93',0,0), +(97,97,'1964-10-08','address97','city97',0,0), +(101,101,'1986-06-11','address101','city101',40,52), +(105,105,'1999-05-14','address105','city105',40,45), +(109,109,'2000-05-23','address109','city109',0,0), +(113,113,'1960-08-03','address113','city113',8,15), +(117,117,'1982-02-15','address117','city117',50,36), +(121,121,'1998-10-18','address121','city121',24,52), +(192,192,'1964-07-24','address192','city192',40,52), +(193,193,'1973-05-03','address193','city193',0,0), +(194,194,'1980-01-14','address194','city194',40,52), +(195,195,'1975-07-15','address195','city195',45,52), +(200,200,'2006-03-09','address200','city200',0,0), +(201,201,'2008-05-20','address201','city201',3,28), +(202,202,'2000-06-30','address202','city202',12,52), +(203,203,'1992-07-08','address203','city203',50,52), +(204,204,'1988-07-05','address204','city204',14,40), +(205,205,'1950-10-29','address205','city205',0,0), +(206,206,'1962-11-25','address206','city206',0,0), +(207,207,'1946-06-03','address207','city207',0,0), +(214,214,'1973-12-14','address214','city214',0,0), +(217,217,'1945-11-06','address217','city217',40,36), +(218,218,'2007-07-20','address218','city218',0,0), +(219,219,'1979-10-05','address219','city219',0,0), +(220,220,'1992-06-20','address220','city220',10,12), +(221,221,'2007-03-26','address221','city221',50,52), +(222,222,'1989-12-24','address222','city222',0,0), +(224,224,'1975-07-14','address224','city224',0,0), +(225,225,'1976-02-23','address225','city225',20,52), +(226,226,'1974-06-22','address226','city226',0,0), +(227,227,'2004-01-16','address227','city227',0,0), +(232,232,'1958-01-01','address232','city232',0,0), +(233,233,'1966-08-03','address233','city233',40,32), +(234,234,'1975-10-22','address234','city234',40,52), +(235,235,'1983-10-25','address235','city235',0,0), +(236,236,'1974-03-07','address236','city236',0,0), +(237,237,'1965-12-31','address237','city237',45,20), +(238,238,'1971-10-16','address238','city238',0,0), +(239,239,'1989-07-19','address239','city239',0,0), +(246,246,'1960-07-08','address246','city246',0,0), +(249,249,'1943-07-01','address249','city249',40,30), +(250,250,'1983-10-15','address250','city250',30,52), +(251,251,'1979-07-03','address251','city251',0,0), +(252,252,'1985-10-04','address252','city252',15,4), +(253,253,'1966-10-24','address253','city253',0,0), +(254,254,'1956-02-02','address254','city254',0,0), +(1,1,'2003-11-23','address1','city1',40,52), +(3,3,'1938-01-23','address3','city3',0,0), +(5,5,'2006-12-27','address5','city5',40,48), +(7,7,'1969-04-09','address7','city7',0,0), +(9,9,'2006-06-14','address9','city9',0,0), +(11,11,'1999-01-12','address11','city11',40,52), +(13,13,'1968-01-13','address13','city13',50,12), +(15,15,'1960-04-11','address15','city15',0,0), +(17,17,'2006-10-13','address17','city17',40,52), +(19,19,'1950-08-19','address19','city19',0,0), +(21,21,'2000-05-01','address21','city21',40,30), +(23,23,'1952-06-09','address23','city23',40,52), +(25,25,'1934-12-08','address25','city25',32,40), +(27,27,'1995-04-19','address27','city27',40,45), +(29,29,'1986-01-14','address29','city29',44,52), +(31,31,'1978-04-19','address31','city31',10,20), +(33,33,'1989-11-23','address33','city33',25,10), +(35,35,'2012-01-02','address35','city35',8,48), +(37,37,'2005-08-24','address37','city37',40,42), +(39,39,'1973-11-02','address39','city39',40,52), +(41,41,'2011-10-12','address41','city41',20,30), +(43,43,'1960-12-24','address43','city43',0,0), +(45,45,'1990-04-17','address45','city45',35,40), +(47,47,'1964-04-02','address47','city47',0,0), +(49,49,'1957-01-25','address49','city49',40,52), +(51,51,'1970-10-20','address51','city51',0,0), +(54,54,'1987-09-30','address54','city54',0,0), +(58,58,'1975-05-07','address58','city58',0,0), +(62,62,'1972-08-03','address62','city62',40,52), +(66,66,'1995-11-04','address66','city66',0,0), +(70,70,'1985-10-19','address70','city70',40,52), +(74,74,'1969-06-09','address74','city74',0,0), +(78,78,'2003-01-16','address78','city78',66,52), +(82,82,'2012-04-29','address82','city82',50,30), +(86,86,'2008-02-03','address86','city86',0,0), +(90,90,'1973-05-15','address90','city90',35,12), +(94,94,'1987-10-28','address94','city94',40,50), +(98,98,'1973-06-10','address98','city98',65,50), +(102,102,'2009-09-13','address102','city102',0,0), +(106,106,'1986-07-03','address106','city106',0,0), +(110,110,'1982-06-10','address110','city110',35,52), +(114,114,'1963-10-08','address114','city114',48,52), +(118,118,'1948-03-07','address118','city118',0,0), +(122,122,'1997-12-19','address122','city122',0,0), +(124,124,'1966-03-25','address124','city124',0,0), +(128,128,'1968-08-13','address128','city128',0,0), +(132,132,'1989-09-25','address132','city132',20,20), +(136,136,'1993-09-02','address136','city136',0,0), +(140,140,'1981-05-31','address140','city140',48,52), +(144,144,'1960-09-15','address144','city144',0,0), +(148,148,'1945-02-13','address148','city148',40,38), +(152,152,'2010-11-13','address152','city152',20,52), +(154,154,'1950-11-07','address154','city154',55,52), +(160,160,'1981-01-17','address160','city160',0,0), +(162,162,'2001-03-19','address162','city162',0,0), +(168,168,'2003-03-28','address168','city168',0,0), +(170,170,'1977-06-18','address170','city170',50,52), +(176,176,'1967-04-15','address176','city176',30,50), +(178,178,'1989-10-25','address178','city178',60,12), +(184,184,'2004-04-21','address184','city184',0,0), +(186,186,'1952-11-08','address186','city186',50,48), +(209,209,'1943-03-15','address209','city209',40,30), +(241,241,'1979-12-02','address241','city241',0,0), +(257,257,'2010-03-06','address257','city257',40,47); +--enable_query_log + +select * from t1 where hours_worked_per_week = 40 and weeks_worked_last_year = 52 and dob < '1949-11-21'; +select * from t1 IGNORE INDEX(dob, weeks_worked_last_year, hours_worked_per_week) where hours_worked_per_week = 40 and weeks_worked_last_year = 52 and dob < '1949-11-21'; + +drop table t1; diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index 5f4c815a..9775a8dc 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -3594,4 +3594,42 @@ EXECUTE stmt; DROP TABLE t1,t2; + +--echo # +--echo # MDEV-5369: Wrong result (0 instead of NULL) on 2nd execution of +--echo # PS with LEFT JOIN, TEMPTABLE view +--echo # + + +CREATE TABLE t1 (a INT) ENGINE=MyISAM; +INSERT INTO t1 VALUES (0),(8); + +CREATE TABLE t2 (pk INT PRIMARY KEY) ENGINE=MyISAM; +CREATE ALGORITHM=TEMPTABLE VIEW v2 AS SELECT * FROM t2; + +SELECT SUM(pk) FROM t1 LEFT JOIN v2 ON a = pk; + +PREPARE stmt FROM "SELECT SUM(pk) FROM t1 LEFT JOIN v2 ON a = pk"; +EXECUTE stmt; +EXECUTE stmt; +DEALLOCATE PREPARE stmt; + +DROP VIEW v2; +DROP TABLE t1, t2; + +--echo # End of 5.3 tests + +--echo # +--echo # MDEV-5505: Assertion `! is_set()' fails on PREPARE SELECT +--echo # with out of range in GROUP BY +--echo # +CREATE TABLE t1 (a INT); + +--error ER_DATA_OUT_OF_RANGE +PREPARE stmt FROM "SELECT 1 FROM t1 GROUP BY 0 OR 18446744073709551615+1"; +--error ER_DATA_OUT_OF_RANGE +SELECT 1 FROM t1 GROUP BY 0 OR 18446744073709551615+1; + +drop table t1; + --echo # End of 5.3 tests diff --git a/mysql-test/t/rpl_mysqldump_slave.test b/mysql-test/t/rpl_mysqldump_slave.test index 3f39fe19..3fbcfe49 100644 --- a/mysql-test/t/rpl_mysqldump_slave.test +++ b/mysql-test/t/rpl_mysqldump_slave.test @@ -27,4 +27,13 @@ connection slave; # Execute mysqldump with --dump-slave ,--apply-slave-statements and --include-master-host-port --exec $MYSQL_DUMP_SLAVE --compact --dump-slave --apply-slave-statements --include-master-host-port test +# +# MDEV-5624 mysqldump --dump-slave option does not restart the replication if the dump has failed +# +slave start; +--replace_regex /MASTER_LOG_POS=[0-9]+/MASTER_LOG_POS=BINLOG_START/ +--error 2 +--exec $MYSQL_DUMP_SLAVE --compact --dump-slave no_such_db +slave start; + --source include/rpl_end.inc diff --git a/mysql-test/t/subselect4.test b/mysql-test/t/subselect4.test index c9174c94..1c058c5e 100644 --- a/mysql-test/t/subselect4.test +++ b/mysql-test/t/subselect4.test @@ -1853,6 +1853,41 @@ SELECT * FROM t1 AS t WHERE a='r' AND (c,b) NOT IN (SELECT c,b FROM t2 WHERE (c,b)=(t.c,t.b)); DROP TABLE t1, t2; + +--echo # +--echo # MDEV-5468: assertion failure with a simplified condition in subselect +--echo # + +CREATE TABLE t1 (a int, b int) ENGINE=MyISAM; +INSERT INTO t1 VALUES (1,1); + +CREATE TABLE t2 ( pk int PRIMARY KEY, c INT) ENGINE=MyISAM; +INSERT INTO t2 VALUES (1,4), (2,6); + +SELECT ( SELECT MAX(b) FROM t1, t2 WHERE pk = a AND b < from_sq.c ) AS select_sq, + COUNT( DISTINCT from_sq.c ) +FROM ( SELECT DISTINCT t2_1.* FROM t2 AS t2_1, t2 AS t2_2 ) AS from_sq +GROUP BY select_sq ; + +DROP TABLE t1,t2; + + +CREATE TABLE t1 (id int, a2 char(2), a3 char(3)) ENGINE=MyISAM; +INSERT INTO t1 VALUES (1,'BE','BEL'); + +CREATE TABLE t2 (id int, a2 char(2), a3 char(3)) ENGINE=MyISAM; +INSERT INTO t2 VALUES (1,'BE','BEL'), (2,'MX','MEX'); +CREATE VIEW v2 AS SELECT DISTINCT * FROM t2; + +SELECT * FROM t1 AS outer_t1, v2 +WHERE v2.a3 = outer_t1.a3 + AND EXISTS ( SELECT * FROM t1 WHERE a2 < v2.a2 AND id = outer_t1.id ) + AND outer_t1.a3 < 'J' +ORDER BY v2.id; + +DROP VIEW v2; +DROP TABLE t1,t2; + --echo # --echo # MDEV-3899 Valgrind warnings (blocks are definitely lost) in filesort on IN subquery with SUM and DISTINCT --echo # diff --git a/mysql-test/t/subselect_sj.test b/mysql-test/t/subselect_sj.test index a6ce3f25..1b0076fd 100644 --- a/mysql-test/t/subselect_sj.test +++ b/mysql-test/t/subselect_sj.test @@ -2489,6 +2489,24 @@ INSERT INTO t1 VALUES ('mysql'),('information_schema'); SELECT * FROM t1 WHERE db IN (SELECT `SCHEMA_NAME` FROM information_schema.SCHEMATA); DROP TABLE t1; +--echo # +--echo # MDEV-5581: Server crashes in in JOIN::prepare on 2nd execution of PS with materialization+semijoin +--echo # +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (2),(3); + +CREATE TABLE t2 (b INT); +INSERT INTO t2 VALUES (8),(9); + +CREATE TABLE t3 (c INT, INDEX(c)); +INSERT INTO t2 VALUES (5),(6); + +PREPARE stmt FROM +"SELECT * FROM t1 WHERE ( 9, 5 ) IN ( SELECT b, COUNT(*) FROM t2 WHERE 1 IN ( SELECT MIN(c) FROM t3 ) )"; +EXECUTE stmt; +EXECUTE stmt; + +DROP TABLE t1,t2,t3; --echo # --echo # MySQL Bug#13340270: assertion table->sort.record_pointers == __null diff --git a/mysql-test/t/subselect_sj2.test b/mysql-test/t/subselect_sj2.test index 18221c90..9d9e7848 100644 --- a/mysql-test/t/subselect_sj2.test +++ b/mysql-test/t/subselect_sj2.test @@ -1245,6 +1245,24 @@ SELECT * FROM t1 WHERE ( 1, 1 ) IN ( DROP TABLE t1,t2,t3; +--echo # +--echo # MDEV-5582: Plugin 'MEMORY' has ref_count=1 after shutdown with materialization+semijoin +--echo # +CREATE TABLE t1 (a INT) engine=innodb; +INSERT INTO t1 VALUES (8),(9); + +CREATE TABLE t2 (b INT) engine=innodb; +INSERT INTO t2 VALUES (2),(3); + +CREATE TABLE t3 (c INT, INDEX(c)) engine=innodb; +INSERT INTO t2 VALUES (4),(5); + +explain +SELECT * FROM t1 WHERE 9 IN ( SELECT b FROM t2 WHERE 1 IN ( SELECT MIN(c) FROM t3 ) ); +SELECT * FROM t1 WHERE 9 IN ( SELECT b FROM t2 WHERE 1 IN ( SELECT MIN(c) FROM t3 ) ); + +DROP TABLE t1,t2,t3; + --source include/have_innodb.inc --disable_warnings diff --git a/mysql-test/t/udf_debug_sync.test b/mysql-test/t/udf_debug_sync.test new file mode 100644 index 00000000..593500c1 --- /dev/null +++ b/mysql-test/t/udf_debug_sync.test @@ -0,0 +1,40 @@ +--source include/have_debug_sync.inc +--source include/have_udf.inc + +# +# MDEV-5616 - Deadlock between CREATE/DROP FUNCTION and SELECT from view +# +--replace_result $UDF_EXAMPLE_SO UDF_EXAMPLE_LIB +eval CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "$UDF_EXAMPLE_SO"; +CREATE VIEW v1 AS SELECT myfunc_int(1); +connect(con1, localhost, root,,); + +connection con1; +SET debug_sync='mysql_create_function_after_lock SIGNAL locked WAIT_FOR go'; +--replace_result $UDF_EXAMPLE_SO UDF_EXAMPLE_LIB +send_eval CREATE FUNCTION myfunc_double RETURNS REAL SONAME "$UDF_EXAMPLE_SO"; + +connection default; +SET debug_sync='now WAIT_FOR locked'; +SET debug_sync='find_udf_before_lock SIGNAL go'; +SELECT * FROM v1; +FLUSH TABLES; + +connection con1; +reap; +SET debug_sync='mysql_drop_function_after_lock SIGNAL locked WAIT_FOR go'; +send DROP FUNCTION myfunc_double; + +connection default; +SET debug_sync='now WAIT_FOR locked'; +SET debug_sync='find_udf_before_lock SIGNAL go'; +SELECT * FROM v1; + +connection con1; +reap; +disconnect con1; + +connection default; +SET debug_sync='RESET'; +DROP VIEW v1; +DROP FUNCTION myfunc_int; diff --git a/mysql-test/t/union_crash-714.test b/mysql-test/t/union_crash-714.test new file mode 100644 index 00000000..6c31a220 --- /dev/null +++ b/mysql-test/t/union_crash-714.test @@ -0,0 +1,9 @@ +# +# MDEV-714 LP:1020645 - crash (sig 11) with union query +# +--source include/have_debug.inc +create table t1 (i tinyint); +set debug_dbug='+d,bug11747970_raise_error'; +--error ER_QUERY_INTERRUPTED +insert into t1 (i) select i from t1 union select i from t1; +drop table t1; diff --git a/mysql-test/t/xml.test b/mysql-test/t/xml.test index b36bd206..7013a306 100644 --- a/mysql-test/t/xml.test +++ b/mysql-test/t/xml.test @@ -673,6 +673,12 @@ SELECT UPDATEXML('x','(a)/a',''); SELECT UPDATEXML('x','(a)//a',''); SELECT ExtractValue('aabb','(a)/a|(a)/b'); +# +# MDEV-5689 ExtractValue(xml, 'substring(/x,/y)') crashes +# MySQL bug#12428404 MYSQLD.EXE CRASHES WHEN EXTRACTVALUE() IS CALLED WITH MALFORMED XPATH EXP +# +SELECT ExtractValue('abc21','substring(/a/b,..)'); + --echo # --echo # End of 5.5 tests --echo # diff --git a/mysys/file_logger.c b/mysys/file_logger.c index 4c07b8c7..da8b5c8d 100644 --- a/mysys/file_logger.c +++ b/mysys/file_logger.c @@ -16,6 +16,7 @@ #include "my_global.h" #include +#include #include #include diff --git a/mysys/md5.c b/mysys/md5.c index 655befa5..aefc23c1 100644 --- a/mysys/md5.c +++ b/mysys/md5.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 1ee71e55..8191e92b 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -1,5 +1,4 @@ -/* - Copyright (c) 2000, 2011, Oracle and/or its affiliates +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/mf_qsort.c b/mysys/mf_qsort.c index e681ac9c..3e91c0ac 100644 --- a/mysys/mf_qsort.c +++ b/mysys/mf_qsort.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000-2002, 2007 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/mf_radix.c b/mysys/mf_radix.c index ecaeee69..b0ed419e 100644 --- a/mysys/mf_radix.c +++ b/mysys/mf_radix.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2007 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/mf_same.c b/mysys/mf_same.c index b4af4cbf..244dc650 100644 --- a/mysys/mf_same.c +++ b/mysys/mf_same.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2001, 2007 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/mf_soundex.c b/mysys/mf_soundex.c index b3718f20..2784d112 100644 --- a/mysys/mf_soundex.c +++ b/mysys/mf_soundex.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2002, 2004, 2007 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/mf_tempdir.c b/mysys/mf_tempdir.c index e6b56f7d..34b469b4 100644 --- a/mysys/mf_tempdir.c +++ b/mysys/mf_tempdir.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,7 +43,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist) pathlist=getenv("TMP"); #endif if (!pathlist || !pathlist[0]) - pathlist=(char*) DEFAULT_TMPDIR; + pathlist= DEFAULT_TMPDIR; } do { diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c index 5ff139bc..62b3e097 100644 --- a/mysys/mf_tempfile.c +++ b/mysys/mf_tempfile.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -111,7 +111,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix, sizeof(prefix_buff)-7),"XXXXXX") - prefix_buff); if (!dir && ! (dir =getenv("TMPDIR"))) - dir=DEFAULT_TMPDIR; + dir= DEFAULT_TMPDIR; if (strlen(dir)+ pfx_len > FN_REFLEN-2) { errno=my_errno= ENAMETOOLONG; diff --git a/mysys/mf_wcomp.c b/mysys/mf_wcomp.c index 74e6fccb..fe64d06f 100644 --- a/mysys/mf_wcomp.c +++ b/mysys/mf_wcomp.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2003, 2004 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/mulalloc.c b/mysys/mulalloc.c index 2caac699..9384ed74 100644 --- a/mysys/mulalloc.c +++ b/mysys/mulalloc.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2002, 2003, 2007 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_access.c b/mysys/my_access.c index b96e11d9..22f145a7 100644 --- a/mysys/my_access.c +++ b/mysys/my_access.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2000 MySQL AB - Copyright (c) 2012, Monty Program Ab +/* Copyright (c) 2000, 2012, Oracle and/or its affiliates + Copyright (c) 2012, 2014, SkySQL Ab This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_aes.c b/mysys/my_aes.c index 5c52a0b1..7074f700 100644 --- a/mysys/my_aes.c +++ b/mysys/my_aes.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2002 MySQL AB +/* Copyright (c) 2002, 2006 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_conio.c b/mysys/my_conio.c index dc87b83f..2480c37d 100644 --- a/mysys/my_conio.c +++ b/mysys/my_conio.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2005, 2007 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_crc32.c b/mysys/my_crc32.c index 27800098..0981c757 100644 --- a/mysys/my_crc32.c +++ b/mysys/my_crc32.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2003 MySQL AB +/* Copyright (c) 2003, 2004 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_div.c b/mysys/my_div.c index 29f04a7a..660b87e5 100644 --- a/mysys/my_div.c +++ b/mysys/my_div.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2002, 2004, 2007 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_error.c b/mysys/my_error.c index 3302add6..23bc06c3 100644 --- a/mysys/my_error.c +++ b/mysys/my_error.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c index 25846ebc..52f61649 100644 --- a/mysys/my_fopen.c +++ b/mysys/my_fopen.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. - Copyright (c) 1985-2011 Monty Program Ab +/* Copyright (c) 2000, 2012, Oracle and/or its affiliates + Copyright (c) 1985, 2011, Monty Program Ab This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_getpagesize.c b/mysys/my_getpagesize.c index 2c2804df..e1c1fcb1 100644 --- a/mysys/my_getpagesize.c +++ b/mysys/my_getpagesize.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright (c) 2000-2003, 2006 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_libwrap.c b/mysys/my_libwrap.c index dea4bca1..1cbfa830 100644 --- a/mysys/my_libwrap.c +++ b/mysys/my_libwrap.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 MySQL AB +/* Copyright (c) 2003, 2006 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_lockmem.c b/mysys/my_lockmem.c index 2e036936..3e27564f 100644 --- a/mysys/my_lockmem.c +++ b/mysys/my_lockmem.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index 570ab967..5264210a 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.c @@ -1,5 +1,5 @@ -/* - Copyright (c) 2000, 2010, Oracle and/or its affiliates +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates + Copyright (c) 2009, 2014, SkySQL Ab This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_memmem.c b/mysys/my_memmem.c index 5184037e..5806c502 100644 --- a/mysys/my_memmem.c +++ b/mysys/my_memmem.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2006, 2007 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_mkdir.c b/mysys/my_mkdir.c index 0e77180c..5e9691f5 100644 --- a/mysys/my_mkdir.c +++ b/mysys/my_mkdir.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2001, 2006 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_once.c b/mysys/my_once.c index b9232db9..dfd5de81 100644 --- a/mysys/my_once.c +++ b/mysys/my_once.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c index e8ac1ded..fcaf78cc 100644 --- a/mysys/my_symlink2.c +++ b/mysys/my_symlink2.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2001, 2003, 2005-2007 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/my_wincond.c b/mysys/my_wincond.c index f88e33e1..6674a5d3 100644 --- a/mysys/my_wincond.c +++ b/mysys/my_wincond.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -289,7 +289,7 @@ int pthread_cond_signal(pthread_cond_t *cond) int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, - struct timespec *abstime) + const struct timespec *abstime) { if (have_native_conditions) { diff --git a/mysys/my_winthread.c b/mysys/my_winthread.c index d7d7817d..81fd0e72 100644 --- a/mysys/my_winthread.c +++ b/mysys/my_winthread.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/test_dir.c b/mysys/test_dir.c index 0ac55956..364562a6 100644 --- a/mysys/test_dir.c +++ b/mysys/test_dir.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2006 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/test_xml.c b/mysys/test_xml.c index e5ff42ab..56b50611 100644 --- a/mysys/test_xml.c +++ b/mysys/test_xml.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2002 MySQL AB + Use is subject to license terms This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index 7fd87edd..d0bb2f1e 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -1,6 +1,5 @@ -/* - Copyright (c) 2000, 2011, Oracle and/or its affiliates - Copyright (c) 2012, Monty Program Ab +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates + Copyright (c) 2012, 2014, SkySQL Ab This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/packaging/WiX/CPackWixConfig.cmake b/packaging/WiX/CPackWixConfig.cmake index e8edd8a8..c782b7cd 100644 --- a/packaging/WiX/CPackWixConfig.cmake +++ b/packaging/WiX/CPackWixConfig.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/packaging/WiX/custom_ui.wxs b/packaging/WiX/custom_ui.wxs index 6e243832..d49e4210 100644 --- a/packaging/WiX/custom_ui.wxs +++ b/packaging/WiX/custom_ui.wxs @@ -2,7 +2,7 @@ xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">