Commits · e46f8f3d0aa59e71c40e0f2bd7d67414b2b8628b · nexedi / MariaDB

08 Jul, 2013 6 commits

Alexander Barkov authored Jul 08, 2013

- no previous declaration for ‘void XmlCleanupParserLib()’
- no previous declaration for ‘void CloseXML2File’
- no previous declaration for ‘void XmlInitParserLib()’

modified:
  storage/connect/ha_connect.cc
  storage/connect/libdoc.cpp
  storage/connect/libdoc.h
  storage/connect/plgdbutl.cpp

e46f8f3d

fixing warnings: · f9ba8073

Alexander Barkov authored Jul 08, 2013

- no previous declaration for ‘ddwrap’
- implicit declaration of function ‘ddwrap’

modified:
  storage/connect/fmdlex.c

f9ba8073

Fixing a typo in the previous push · f2d2c1ea
Alexander Barkov authored Jul 08, 2013
```
modified:
  storage/connect/fmdlex.c
```
f2d2c1ea

fixing warnings: · 269fd01b

Alexander Barkov authored Jul 08, 2013

- no previous declaration for ‘_isatty’
- implicit declaration of function ‘_isatty’

modified:
  storage/connect/fmdlex.c
  storage/connect/osutil.c

269fd01b

Fixing the "no previous declaration for ‘_strerror'" warning. · e2461d47
Alexander Barkov authored Jul 08, 2013
```
modified:
  storage/connect/filamvct.cpp
  storage/connect/osutil.c
  storage/connect/tabvct.cpp
```
e2461d47

Fixing numerous "variable is set but never used" warnings. · 66c1665e

Alexander Barkov authored Jul 08, 2013

modified:
  storage/connect/filamfix.cpp
  storage/connect/filamtxt.cpp
  storage/connect/filamvct.cpp
  storage/connect/odbconn.cpp
  storage/connect/tabodbc.cpp
  storage/connect/xindex.cpp

66c1665e

06 Jul, 2013 1 commit
- - Remove unuseful option causing valgrind error or warning · 63446440
  Olivier Bertrand authored Jul 06, 2013
```
modified:
  storage/connect/myconn.cpp
```
  63446440
05 Jul, 2013 1 commit

- Try to fix a uninitialised valgrind warning · ce1b9cb4

Olivier Bertrand authored Jul 05, 2013

modified:
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/mycat.cc

- Fix a regression error on XML libdoc wrong Nlist freing

modified:
  storage/connect/domdoc.h
  storage/connect/libdoc.cpp
  storage/connect/libdoc.h
  storage/connect/plgxml.h
  storage/connect/tabxml.cpp

ce1b9cb4

04 Jul, 2013 2 commits
- - Make sure Remark is initialised · 923eddcf
  Olivier Bertrand authored Jul 04, 2013
```
modified:
  storage/connect/ha_connect.cc
```
  923eddcf
- - Make sure Remark is initialised in ha_connect::GetColumnOption · 29ec49b0
  Olivier Bertrand authored Jul 04, 2013
```
modified:
  storage/connect/ha_connect.cc
```
  29ec49b0
03 Jul, 2013 2 commits
- - Makes memory check conditionally · ffedc6b8
  Olivier Bertrand authored Jul 03, 2013
```
modified:
  storage/connect/libdoc.cpp
```
  ffedc6b8
- - Make sure result are ordered the same on all platforms · 59b3833c
  Olivier Bertrand authored Jul 03, 2013
```
modified:
  storage/connect/mysql-test/connect/r/mul.result
  storage/connect/mysql-test/connect/t/mul.test
```
  59b3833c
01 Jul, 2013 1 commit

- Fix memory leak in libdoc.cpp in LIBXMLDOC::GetNodeList replacing · 37fce46f

Olivier Bertrand authored Jul 02, 2013

  xmlXPathFreeNodeSetList(Xop);         // Caused memory leak, by
  xmlXPathFreeObject(Xop);

modified:
  storage/connect/libdoc.cpp

37fce46f

30 Jun, 2013 2 commits
- - Working on eliminating valgrind warning/errors · 29f10f0f
  Olivier Bertrand authored Jun 30, 2013
```
 
modified:
  storage/connect/tabdos.cpp
  storage/connect/tabfix.cpp
  storage/connect/value.cpp
```
  29f10f0f
- - Trying to get rid of some valgrind warnings · b98360a4
  Olivier Bertrand authored Jun 30, 2013
```
modified:
  storage/connect/mycat.cc
  storage/connect/valblk.cpp
  storage/connect/value.cpp
```
  b98360a4
29 Jun, 2013 1 commit
- - Release storage allocated by flex · 639ce065
  Olivier Bertrand authored Jun 29, 2013
```
modified:
  storage/connect/fmdlex.c
```
  639ce065
28 Jun, 2013 2 commits

- Add the PROFILE_End function in inihandl. Called by connect_done_func · b8d6f973

Olivier Bertrand authored Jun 29, 2013

  to release the cache memory allocated by the PROFILE perocessing.
  (also add some break at the end of switch's to avoid warnings)

modified:
  storage/connect/filamvct.cpp
  storage/connect/ha_connect.cc
  storage/connect/inihandl.c
  storage/connect/inihandl.h

b8d6f973

- Release memory allocated by inihandl in connect_done_func. · 9508e913
Olivier Bertrand authored Jun 28, 2013
```
modified:
  storage/connect/ha_connect.cc

- Remove unuseful last change

modified:
  storage/connect/block.h
```
9508e913

26 Jun, 2013 3 commits
- - Trying to remove those warnings about non virtual destructor · 2662ae4b
  Olivier Bertrand authored Jun 26, 2013
```
modified:
  storage/connect/block.h
```
  2662ae4b
- - In connect_assisted_discovery the test on topt->quoted must · d662c48a
  Olivier Bertrand authored Jun 26, 2013
```
  be done on its signed value

modified:
  storage/connect/ha_connect.cc
```
  d662c48a
- - Fix potential bug in MYSQLCOL::WriteColumn: ShowValue was call with · c6c1a6e2
  Olivier Bertrand authored Jun 26, 2013
```
  *Bind->length instead of Bind->buffer_length

modified:
  storage/connect/tabmysql.cpp
```
  c6c1a6e2
16 Jun, 2013 1 commit

- Implemented: The use of Federated servers. · b5130b5b

Olivier Bertrand authored Jun 16, 2013

modified:
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/plugutil.c
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
  storage/connect/tabtbl.cpp

b5130b5b

14 Jun, 2013 2 commits

- Add a test case for multiple tables · b0c378b4

Olivier Bertrand authored Jun 14, 2013

added:
  storage/connect/mysql-test/connect/r/mul.result
  storage/connect/mysql-test/connect/t/mul.test

b0c378b4

- Fix regression error for multiple 2 tables. · d861b617

Olivier Bertrand authored Jun 14, 2013

modified:
  storage/connect/tabmul.cpp

- Fix regression error on field types. Cannot eliminate BINARY_FLAG that
  is on for DATE columns. Update result from dbf.test case.

modified:
  storage/connect/ha_connect.cc
  storage/connect/mysql-test/connect/r/dbf.result

d861b617

12 Jun, 2013 3 commits
- - To avoid crashing in debug mode, the error message concerning the · a8428e3a
  Olivier Bertrand authored Jun 12, 2013
```
  making of the index is changed to a warning.

modified:
  storage/connect/ha_connect.cc
  storage/connect/tabmul.cpp*
```
  a8428e3a
- - Suballocate filename in TDBMUL::InitFileNames. This fix the bug · 36b71876
  Olivier Bertrand authored Jun 12, 2013
```
  MDEV-4524 but I still don't know why it happened with a stack variable.
  (and only on Linux)

modified:
  storage/connect/tabmul.cpp
```
  36b71876
- - Add trace in TDBMUL::GetMaxSize. · 1784618e
  Olivier Bertrand authored Jun 12, 2013
```
modified:
  storage/connect/tabmul.cpp
```
  1784618e
11 Jun, 2013 1 commit

- Fix MDEV-4638 · 13ced819

Olivier Bertrand authored Jun 12, 2013

modified:
  storage/connect/ha_connect.cc
  storage/connect/valblk.cpp

- Add trace in tabmul

modified:
  storage/connect/tabmul.cpp

13ced819

08 Jun, 2013 1 commit

- Commit merged changes · c0fe5cc3

Olivier Bertrand authored Jun 08, 2013

added:
  mysql-test/include/kill_binlog_dump_threads.inc
  mysql-test/r/ctype_ucs2_query_cache.result
  mysql-test/r/empty_user_table.result
  mysql-test/r/grant_4332.result
  mysql-test/r/init_connection_query_cache.result
  mysql-test/suite/federated/federated.result
  mysql-test/suite/federated/federated.test
  mysql-test/suite/innodb/t/innodb_bug14676111-master.opt
  mysql-test/suite/maria/distinct.result
  mysql-test/suite/maria/distinct.test
  mysql-test/suite/rpl/r/rpl_gtid_master_promote.result
  mysql-test/suite/rpl/r/rpl_gtid_mdev4474.result
  mysql-test/suite/rpl/r/rpl_gtid_mdev4484.result
  mysql-test/suite/rpl/r/rpl_gtid_mdev4485.result
  mysql-test/suite/rpl/r/rpl_gtid_reconnect.result
  mysql-test/suite/rpl/r/rpl_gtid_strict.result
  mysql-test/suite/rpl/r/rpl_gtid_until.result
  mysql-test/suite/rpl/t/rpl_gtid_master_promote.cnf
  mysql-test/suite/rpl/t/rpl_gtid_master_promote.test
  mysql-test/suite/rpl/t/rpl_gtid_mdev4474.cnf
  mysql-test/suite/rpl/t/rpl_gtid_mdev4474.test
  mysql-test/suite/rpl/t/rpl_gtid_mdev4484.test
  mysql-test/suite/rpl/t/rpl_gtid_mdev4485.cnf
  mysql-test/suite/rpl/t/rpl_gtid_mdev4485.test
  mysql-test/suite/rpl/t/rpl_gtid_reconnect.test
  mysql-test/suite/rpl/t/rpl_gtid_strict.test
  mysql-test/suite/rpl/t/rpl_gtid_until.test
  mysql-test/suite/sys_vars/r/gtid_binlog_pos_basic.result
  mysql-test/suite/sys_vars/r/gtid_current_pos_basic.result
  mysql-test/suite/sys_vars/r/gtid_strict_mode_basic.result
  mysql-test/suite/sys_vars/r/innodb_buffer_pool_evict_basic.result
  mysql-test/suite/sys_vars/t/gtid_binlog_pos_basic.test
  mysql-test/suite/sys_vars/t/gtid_current_pos_basic.test
  mysql-test/suite/sys_vars/t/gtid_strict_mode_basic.test
  mysql-test/suite/sys_vars/t/innodb_buffer_pool_evict_basic.test
  mysql-test/t/ctype_ucs2_query_cache-master.opt
  mysql-test/t/ctype_ucs2_query_cache.test
  mysql-test/t/empty_user_table.test
  mysql-test/t/grant_4332.test
  mysql-test/t/init_connection_query_cache-master.opt
  mysql-test/t/init_connection_query_cache.test
  plugin/handler_socket/regtest/test_01_lib/test24.expected
  plugin/handler_socket/regtest/test_01_lib/test24.pl
  sql/db.opt
renamed:
  mysql-test/suite/sys_vars/r/gtid_pos_basic.result => mysql-test/suite/sys_vars/r/gtid_slave_pos_basic.result
  mysql-test/suite/sys_vars/t/gtid_pos_basic.test => mysql-test/suite/sys_vars/t/gtid_slave_pos_basic.test
modified:
  .bzrignore
  BUILD/FINISH.sh
  BUILD/compile-amd64-debug-max
  BUILD/compile-amd64-max
  BUILD/compile-darwin-mwcc
  BUILD/compile-hpux11-parisc2-aCC
  BUILD/compile-irix-mips64-mipspro
  BUILD/compile-ndb-autotest
  BUILD/compile-pentium
  BUILD/compile-pentium-debug-max-no-embedded
  BUILD/compile-pentium-debug-max-no-ndb
  BUILD/compile-pentium-max
  BUILD/compile-ppc-debug
  BUILD/compile-ppc-debug-max
  BUILD/compile-ppc-debug-max-no-ndb
  BUILD/compile-ppc-max
  BUILD/compile-solaris-amd64-debug
  CMakeLists.txt
  VERSION
  client/client_priv.h
  client/completion_hash.h
  client/echo.c
  client/get_password.c
  client/mysql.cc
  client/mysqlcheck.c
  client/mysqldump.c
  client/mysqltest.cc
  client/sql_string.cc.dontuse
  cmake/configure.pl
  cmake/cpack_rpm.cmake
  cmake/create_initial_db.cmake.in
  cmake/make_dist.cmake.in
  cmake/mysql_version.cmake
  cmake/os/FreeBSD.cmake
  cmake/os/Linux.cmake
  cmake/package_name.cmake
  cmake/plugin.cmake
  cmake/readline.cmake
  cmake/ssl.cmake
  cmake/zlib.cmake
  configure.cmake
  debian/dist/Debian/control
  debian/dist/Ubuntu/control
  extra/charset2html.c
  extra/yassl/CMakeLists.txt
  extra/yassl/examples/client/client.cpp
  extra/yassl/examples/echoclient/echoclient.cpp
  extra/yassl/examples/echoserver/echoserver.cpp
  extra/yassl/examples/server/server.cpp
  extra/yassl/include/buffer.hpp
  extra/yassl/include/cert_wrapper.hpp
  extra/yassl/include/lock.hpp
  extra/yassl/include/openssl/prefix_ssl.h
  extra/yassl/include/socket_wrapper.hpp
  extra/yassl/include/yassl_error.hpp
  extra/yassl/include/yassl_imp.hpp
  extra/yassl/include/yassl_int.hpp
  extra/yassl/include/yassl_types.hpp
  extra/yassl/src/buffer.cpp
  extra/yassl/src/cert_wrapper.cpp
  extra/yassl/src/crypto_wrapper.cpp
  extra/yassl/src/handshake.cpp
  extra/yassl/src/lock.cpp
  extra/yassl/src/make.bat
  extra/yassl/src/socket_wrapper.cpp
  extra/yassl/src/ssl.cpp
  extra/yassl/src/yassl.cpp
  extra/yassl/src/yassl_error.cpp
  extra/yassl/src/yassl_imp.cpp
  extra/yassl/taocrypt/benchmark/benchmark.cpp
  extra/yassl/taocrypt/benchmark/make.bat
  extra/yassl/taocrypt/include/aes.hpp
  extra/yassl/taocrypt/include/asn.hpp
  extra/yassl/taocrypt/include/block.hpp
  extra/yassl/taocrypt/include/blowfish.hpp
  extra/yassl/taocrypt/include/des.hpp
  extra/yassl/taocrypt/include/hash.hpp
  extra/yassl/taocrypt/include/hc128.hpp
  extra/yassl/taocrypt/include/integer.hpp
  extra/yassl/taocrypt/include/kernelc.hpp
  extra/yassl/taocrypt/include/misc.hpp
  extra/yassl/taocrypt/include/modes.hpp
  extra/yassl/taocrypt/include/pwdbased.hpp
  extra/yassl/taocrypt/include/rabbit.hpp
  extra/yassl/taocrypt/include/rsa.hpp
  extra/yassl/taocrypt/include/runtime.hpp
  extra/yassl/taocrypt/include/types.hpp
  extra/yassl/taocrypt/mySTL/stdexcept.hpp
  extra/yassl/taocrypt/mySTL/vector.hpp
  extra/yassl/taocrypt/src/aes.cpp
  extra/yassl/taocrypt/src/aestables.cpp
  extra/yassl/taocrypt/src/algebra.cpp
  extra/yassl/taocrypt/src/arc4.cpp
  extra/yassl/taocrypt/src/blowfish.cpp
  extra/yassl/taocrypt/src/coding.cpp
  extra/yassl/taocrypt/src/dsa.cpp
  extra/yassl/taocrypt/src/hash.cpp
  extra/yassl/taocrypt/src/hc128.cpp
  extra/yassl/taocrypt/src/make.bat
  extra/yassl/taocrypt/src/md4.cpp
  extra/yassl/taocrypt/src/md5.cpp
  extra/yassl/taocrypt/src/misc.cpp
  extra/yassl/taocrypt/src/rabbit.cpp
  extra/yassl/taocrypt/src/random.cpp
  extra/yassl/taocrypt/src/ripemd.cpp
  extra/yassl/taocrypt/src/rsa.cpp
  extra/yassl/taocrypt/src/sha.cpp
  extra/yassl/taocrypt/src/twofish.cpp
  extra/yassl/taocrypt/test/make.bat
  extra/yassl/taocrypt/test/memory.cpp
  extra/yassl/taocrypt/test/test.cpp
  extra/yassl/testsuite/make.bat
  extra/yassl/testsuite/test.hpp
  extra/yassl/testsuite/testsuite.cpp
  include/atomic/x86-gcc.h
  include/base64.h
  include/ft_global.h
  include/m_ctype.h
  include/m_string.h
  include/my_global.h
  include/my_md5.h
  include/my_pthread.h
  include/my_sys.h
  include/my_user.h
  include/my_xml.h
  include/myisam.h
  include/myisamchk.h
  include/myisampack.h
  include/mysql.h
  include/mysql/plugin_audit.h
  include/mysql/plugin_audit.h.pp
  include/mysql/service_my_snprintf.h
  include/mysql_com.h
  include/mysql_time.h
  include/mysql_version.h.in
  include/probes_mysql_nodtrace.h
  include/thread_pool_priv.h
  include/welcome_copyright_notice.h
  libmysql/libmysql.c
  libmysqld/lib_sql.cc
  mysql-test/collections/default.experimental
  mysql-test/include/check-testcase.test
  mysql-test/include/get_relay_log_pos.inc
  mysql-test/include/mtr_check.sql
  mysql-test/include/rpl_init.inc
  mysql-test/include/wait_show_condition.inc
  mysql-test/mysql-test-run.pl
  mysql-test/r/1st.result
  mysql-test/r/cast.result
  mysql-test/r/connect.result
  mysql-test/r/create.result
  mysql-test/r/ctype_cp932_binlog_stm.result
  mysql-test/r/ctype_utf8mb4.result
  mysql-test/r/func_compress.result
  mysql-test/r/func_group.result
  mysql-test/r/func_math.result
  mysql-test/r/func_str.result
  mysql-test/r/func_time_hires.result
  mysql-test/r/gis-rtree.result
  mysql-test/r/information_schema.result
  mysql-test/r/innodb_ext_key.result
  mysql-test/r/join_nested.result
  mysql-test/r/join_nested_jcl6.result
  mysql-test/r/join_outer.result
  mysql-test/r/join_outer_innodb.result
  mysql-test/r/join_outer_jcl6.result
  mysql-test/r/log_slow.result
  mysql-test/r/log_tables_upgrade.result
  mysql-test/r/myisam-metadata.result
  mysql-test/r/myisam.result
  mysql-test/r/mysql_upgrade.result
  mysql-test/r/mysql_upgrade_ssl.result
  mysql-test/r/mysqlcheck.result
  mysql-test/r/mysqld--help.result
  mysql-test/r/mysqldump-max.result
  mysql-test/r/partition.result
  mysql-test/r/repair.result
  mysql-test/r/select.result
  mysql-test/r/select_jcl6.result
  mysql-test/r/select_pkeycache.result
  mysql-test/r/show_check.result
  mysql-test/r/sp.result
  mysql-test/r/stat_tables_rbr.result
  mysql-test/r/status_user.result
  mysql-test/r/subselect_mat.result
  mysql-test/r/subselect_sj.result
  mysql-test/r/subselect_sj2_mat.result
  mysql-test/r/subselect_sj_jcl6.result
  mysql-test/r/subselect_sj_mat.result
  mysql-test/r/system_mysql_db.result
  mysql-test/r/system_mysql_db_fix40123.result
  mysql-test/r/system_mysql_db_fix50030.result
  mysql-test/r/system_mysql_db_fix50117.result
  mysql-test/r/type_datetime.result
  mysql-test/r/user_var-binlog.result
  mysql-test/r/varbinary.result
  mysql-test/r/variables.result
  mysql-test/suite/binlog/disabled.def
  mysql-test/suite/binlog/r/binlog_spurious_ddl_errors.result
  mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result
  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
  mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test
  mysql-test/suite/binlog/t/binlog_spurious_ddl_errors.test
  mysql-test/suite/federated/federatedx.test
  mysql-test/suite/funcs_1/r/is_columns_is.result
  mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
  mysql-test/suite/funcs_1/r/is_columns_mysql.result
  mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
  mysql-test/suite/funcs_1/r/is_key_column_usage.result
  mysql-test/suite/funcs_1/r/is_statistics.result
  mysql-test/suite/funcs_1/r/is_statistics_mysql.result
  mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
  mysql-test/suite/funcs_1/r/is_table_constraints.result
  mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
  mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result
  mysql-test/suite/funcs_1/r/is_tables_mysql.result
  mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
  mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
  mysql-test/suite/funcs_1/r/processlist_priv_ps.result
  mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
  mysql-test/suite/funcs_1/r/processlist_val_ps.result
  mysql-test/suite/handler/interface.result
  mysql-test/suite/handler/interface.test
  mysql-test/suite/innodb/r/binlog_consistent.result
  mysql-test/suite/innodb/r/group_commit_binlog_pos.result
  mysql-test/suite/innodb/r/group_commit_binlog_pos_no_optimize_thread.result
  mysql-test/suite/innodb/r/innodb_bug14147491.result
  mysql-test/suite/innodb/t/innodb_bug12400341.test
  mysql-test/suite/innodb/t/innodb_bug14147491.test
  mysql-test/suite/innodb/t/innodb_bug14676111.test
  mysql-test/suite/maria/maria-autozerofill.result
  mysql-test/suite/maria/maria-autozerofill.test
  mysql-test/suite/maria/maria-recovery2.result
  mysql-test/suite/maria/maria-recovery2.test
  mysql-test/suite/maria/maria.result
  mysql-test/suite/maria/maria.test
  mysql-test/suite/maria/maria3.result
  mysql-test/suite/multi_source/gtid.result
  mysql-test/suite/multi_source/gtid.test
  mysql-test/suite/multi_source/info_logs.result
  mysql-test/suite/multi_source/multisource.result
  mysql-test/suite/multi_source/relaylog_events.result
  mysql-test/suite/multi_source/reset_master_slave.inc
  mysql-test/suite/multi_source/reset_slave.result
  mysql-test/suite/multi_source/simple.result
  mysql-test/suite/multi_source/syntax.result
  mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result
  mysql-test/suite/parts/r/partition_alter1_1_innodb.result
  mysql-test/suite/parts/r/partition_alter1_2_innodb.result
  mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result
  mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result
  mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result
  mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result
  mysql-test/suite/parts/r/partition_alter4_innodb.result
  mysql-test/suite/parts/r/partition_basic_innodb.result
  mysql-test/suite/parts/r/partition_engine_innodb.result
  mysql-test/suite/parts/t/partition_basic_innodb.test
  mysql-test/suite/perfschema/r/digest_table_full.result
  mysql-test/suite/perfschema/r/statement_digest.result
  mysql-test/suite/perfschema/r/statement_digest_consumers.result
  mysql-test/suite/perfschema/r/statement_digest_long_query.result
  mysql-test/suite/plugins/r/audit_null.result
  mysql-test/suite/plugins/r/cassandra.result
  mysql-test/suite/plugins/r/qc_info.result
  mysql-test/suite/plugins/r/show_all_plugins.result
  mysql-test/suite/plugins/t/audit_null.test
  mysql-test/suite/plugins/t/cassandra.test
  mysql-test/suite/plugins/t/qc_info.test
  mysql-test/suite/plugins/t/unix_socket.test
  mysql-test/suite/rpl/disabled.def
  mysql-test/suite/rpl/r/rpl_charset_sjis.result
  mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
  mysql-test/suite/rpl/r/rpl_gtid_basic.result
  mysql-test/suite/rpl/r/rpl_gtid_crash.result
  mysql-test/suite/rpl/r/rpl_gtid_errorhandling.result
  mysql-test/suite/rpl/r/rpl_gtid_mdev4473.result
  mysql-test/suite/rpl/r/rpl_gtid_nobinlog.result
  mysql-test/suite/rpl/r/rpl_gtid_startpos.result
  mysql-test/suite/rpl/r/rpl_gtid_stop_start.result
  mysql-test/suite/rpl/r/rpl_mariadb_slave_capability.result
  mysql-test/suite/rpl/r/rpl_mdev382.result
  mysql-test/suite/rpl/r/rpl_password_boundaries.result
  mysql-test/suite/rpl/r/rpl_row_until.result
  mysql-test/suite/rpl/r/rpl_sp_effects.result
  mysql-test/suite/rpl/r/rpl_stm_until.result
  mysql-test/suite/rpl/r/rpl_sync.result
  mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test
  mysql-test/suite/rpl/t/rpl_charset_sjis.test
  mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test
  mysql-test/suite/rpl/t/rpl_gtid_basic.test
  mysql-test/suite/rpl/t/rpl_gtid_crash.test
  mysql-test/suite/rpl/t/rpl_gtid_errorhandling.test
  mysql-test/suite/rpl/t/rpl_gtid_mdev4473.test
  mysql-test/suite/rpl/t/rpl_gtid_nobinlog.test
  mysql-test/suite/rpl/t/rpl_gtid_startpos.test
  mysql-test/suite/rpl/t/rpl_gtid_stop_start.test
  mysql-test/suite/rpl/t/rpl_mariadb_slave_capability.test
  mysql-test/suite/rpl/t/rpl_password_boundaries.test
  mysql-test/suite/rpl/t/rpl_row_until.test
  mysql-test/suite/rpl/t/rpl_sp_effects.test
  mysql-test/suite/rpl/t/rpl_stm_until.test
  mysql-test/suite/rpl/t/rpl_sync.test
  mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result
  mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic.result
  mysql-test/suite/sys_vars/t/myisam_sort_buffer_size_basic.test
  mysql-test/t/cast.test
  mysql-test/t/ctype_cp932_binlog_stm.test
  mysql-test/t/ctype_utf8mb4.test
  mysql-test/t/func_group.test
  mysql-test/t/func_str.test
  mysql-test/t/gis-rtree.test
  mysql-test/t/innodb_ext_key.test
  mysql-test/t/join_nested.test
  mysql-test/t/join_outer.test
  mysql-test/t/join_outer_innodb.test
  mysql-test/t/log_slow.test
  mysql-test/t/myisam-metadata.test
  mysql-test/t/myisam.test
  mysql-test/t/mysql_plugin.test
  mysql-test/t/mysqlshow.test
  mysql-test/t/repair.test
  mysql-test/t/select.test
  mysql-test/t/sp.test
  mysql-test/t/subselect_sj.test
  mysql-test/t/subselect_sj_mat.test
  mysql-test/t/system_mysql_db_fix40123.test
  mysql-test/t/system_mysql_db_fix50030.test
  mysql-test/t/system_mysql_db_fix50117.test
  mysql-test/t/type_datetime.test
  mysql-test/t/varbinary.test
  mysql-test/t/variables.test
  mysys/errors.c
  mysys/mf_format.c
  mysys/mf_keycache.c
  mysys/my_lockmem.c
  mysys/my_malloc.c
  mysys/my_once.c
  mysys/my_thr_init.c
  mysys/my_write.c
  mysys/thr_alarm.c
  mysys/thr_mutex.c
  packaging/WiX/mysql_server.wxs.in
  packaging/rpm-uln/mysql.spec.sh
  plugin/audit_null/audit_null.c
  plugin/handler_socket/docs-en/about-handlersocket.en.txt
  plugin/handler_socket/docs-en/installation.en.txt
  plugin/handler_socket/docs-en/perl-client.en.txt
  plugin/handler_socket/docs-en/protocol.en.txt
  plugin/handler_socket/docs-ja/installation.ja.txt
  plugin/handler_socket/docs-ja/perl-client.ja.txt
  plugin/handler_socket/docs-ja/protocol.ja.txt
  plugin/handler_socket/handlersocket/database.cpp
  plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.xs
  plugin/handler_socket/regtest/test_01_lib/run.sh
  plugin/handler_socket/regtest/test_01_lib/test14.pl
  plugin/handler_socket/regtest/test_01_lib/test17.pl
  plugin/handler_socket/regtest/test_01_lib/test19.pl
  plugin/qc_info/qc_info.cc
  regex/my_regex.h
  regex/regcomp.c
  scripts/mysql_system_tables.sql
  scripts/mysql_system_tables_data.sql
  sql-common/client.c
  sql/CMakeLists.txt
  sql/event_db_repository.cc
  sql/ha_partition.cc
  sql/ha_partition.h
  sql/handler.cc
  sql/handler.h
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/item_func.cc
  sql/item_func.h
  sql/item_strfunc.cc
  sql/item_strfunc.h
  sql/item_sum.cc
  sql/key.cc
  sql/key.h
  sql/lex.h
  sql/log.cc
  sql/log.h
  sql/log_event.cc
  sql/log_event.h
  sql/mdl.cc
  sql/multi_range_read.cc
  sql/mysql_install_db.cc
  sql/mysqld.cc
  sql/mysqld.h
  sql/opt_range.cc
  sql/partition_element.h
  sql/partition_info.cc
  sql/partition_info.h
  sql/rpl_gtid.cc
  sql/rpl_gtid.h
  sql/rpl_mi.cc
  sql/rpl_mi.h
  sql/rpl_rli.cc
  sql/rpl_rli.h
  sql/rpl_utility.cc
  sql/set_var.cc
  sql/set_var.h
  sql/share/errmsg-utf8.txt
  sql/slave.cc
  sql/sp.cc
  sql/sp_head.cc
  sql/sql_acl.cc
  sql/sql_admin.cc
  sql/sql_admin.h
  sql/sql_audit.cc
  sql/sql_audit.h
  sql/sql_base.cc
  sql/sql_binlog.cc
  sql/sql_cache.cc
  sql/sql_class.cc
  sql/sql_connect.cc
  sql/sql_delete.cc
  sql/sql_error.cc
  sql/sql_error.h
  sql/sql_handler.cc
  sql/sql_insert.cc
  sql/sql_join_cache.cc
  sql/sql_lex.cc
  sql/sql_lex.h
  sql/sql_parse.cc
  sql/sql_partition.cc
  sql/sql_partition.h
  sql/sql_partition_admin.cc
  sql/sql_plugin_compat.h
  sql/sql_prepare.cc
  sql/sql_repl.cc
  sql/sql_repl.h
  sql/sql_select.cc
  sql/sql_show.cc
  sql/sql_statistics.cc
  sql/sql_string.cc
  sql/sql_string.h
  sql/sql_table.cc
  sql/sql_test.cc
  sql/sql_view.cc
  sql/sql_yacc.yy
  sql/sys_vars.cc
  sql/sys_vars.h
  sql/threadpool_unix.cc
  sql/tztime.cc
  storage/cassandra/cassandra_se.cc
  storage/cassandra/cassandra_se.h
  storage/cassandra/ha_cassandra.cc
  storage/connect/myconn.cpp
  storage/federated/ha_federated.cc
  storage/federatedx/ha_federatedx.cc
  storage/innobase/os/os0file.cc
  storage/maria/ha_maria.cc
  storage/maria/ma_blockrec.c
  storage/maria/ma_blockrec.h
  storage/maria/ma_check.c
  storage/maria/ma_delete.c
  storage/maria/ma_loghandler.c
  storage/maria/ma_open.c
  storage/maria/ma_pagecrc.c
  storage/maria/ma_recovery.c
  storage/maria/ma_scan.c
  storage/maria/ma_search.c
  storage/maria/ma_sort.c
  storage/maria/ma_state.c
  storage/maria/ma_state.h
  storage/maria/ma_test1.c
  storage/maria/ma_test2.c
  storage/maria/ma_update.c
  storage/maria/ma_write.c
  storage/maria/maria_chk.c
  storage/maria/maria_def.h
  storage/maria/maria_ftdump.c
  storage/maria/maria_read_log.c
  storage/maria/unittest/ma_test_recovery.expected
  storage/myisam/ha_myisam.cc
  storage/myisam/mi_check.c
  storage/myisam/mi_write.c
  storage/myisam/myisam_ftdump.c
  storage/myisam/myisamchk.c
  storage/myisam/myisamdef.h
  storage/myisam/myisampack.c
  storage/myisam/sort.c
  storage/myisammrg/ha_myisammrg.cc
  storage/perfschema/pfs_engine_table.cc
  storage/perfschema/pfs_global.cc
  storage/perfschema/pfs_global.h
  storage/sphinx/CMakeLists.txt
  storage/sphinx/snippets_udf.cc
  storage/xtradb/btr/btr0btr.c
  storage/xtradb/btr/btr0cur.c
  storage/xtradb/btr/btr0pcur.c
  storage/xtradb/btr/btr0sea.c
  storage/xtradb/buf/buf0buf.c
  storage/xtradb/buf/buf0flu.c
  storage/xtradb/buf/buf0lru.c
  storage/xtradb/buf/buf0rea.c
  storage/xtradb/dict/dict0dict.c
  storage/xtradb/fil/fil0fil.c
  storage/xtradb/fsp/fsp0fsp.c
  storage/xtradb/handler/ha_innodb.cc
  storage/xtradb/include/btr0btr.ic
  storage/xtradb/include/buf0buf.h
  storage/xtradb/include/buf0buf.ic
  storage/xtradb/include/buf0flu.ic
  storage/xtradb/include/buf0lru.h
  storage/xtradb/include/fut0fut.ic
  storage/xtradb/include/log0log.h
  storage/xtradb/include/log0log.ic
  storage/xtradb/include/mtr0mtr.h
  storage/xtradb/include/mtr0mtr.ic
  storage/xtradb/include/read0read.h
  storage/xtradb/include/read0read.ic
  storage/xtradb/include/srv0srv.h
  storage/xtradb/include/trx0purge.h
  storage/xtradb/include/trx0sys.h
  storage/xtradb/include/trx0sys.ic
  storage/xtradb/include/trx0trx.h
  storage/xtradb/include/trx0trx.ic
  storage/xtradb/include/univ.i
  storage/xtradb/lock/lock0lock.c
  storage/xtradb/log/log0log.c
  storage/xtradb/mtr/mtr0mtr.c
  storage/xtradb/os/os0file.c
  storage/xtradb/read/read0read.c
  storage/xtradb/row/row0ins.c
  storage/xtradb/row/row0merge.c
  storage/xtradb/row/row0sel.c
  storage/xtradb/row/row0vers.c
  storage/xtradb/srv/srv0srv.c
  storage/xtradb/trx/trx0purge.c
  storage/xtradb/trx/trx0roll.c
  storage/xtradb/trx/trx0sys.c
  storage/xtradb/trx/trx0trx.c
  strings/ctype-bin.c
  strings/ctype-mb.c
  strings/ctype-simple.c
  strings/ctype-uca.c
  strings/ctype-utf8.c
  strings/ctype.c
  strings/decimal.c
  support-files/MySQL-shared-compat.spec.sh
  support-files/compiler_warnings.supp
  support-files/mysql.spec.sh
  tests/mysql_client_test.c
  vio/viosocket.c
  vio/viossl.c
  win/packaging/ca/CustomAction.cpp
  win/packaging/extra.wxs.in
  win/packaging/heidisql.cmake
  mysql-test/suite/sys_vars/r/gtid_slave_pos_basic.result
  mysql-test/suite/sys_vars/t/gtid_slave_pos_basic.test
pending merges:
  Alexander Barkov 2013-06-08 Enabling Connect tests
    Alexander Barkov 2013-06-08 [merge] Merge from 10.0-connect
    Sergei Golubchik 2013-06-06 [merge] 10.0-base merge
    Sergei Golubchik 2013-06-06 [merge] 5.5 merge
    Vladislav Vaintroub 2013-06-01 Fix a compile warning on NetBSD
    Vladislav Vaintroub 2013-06-01 MDEV-4607 : libreadline-related  compil...
    sanja@montyprogra... 2013-05-30 MDEV-4520: Assertion `0' fails in Quer...
    Sergei Golubchik 2013-05-28 followup for revision 3751 "centos5 gcc 4....
    sanja@montyprogra... 2013-05-23 MDEV-4520: Assertion `0' fails in Quer...
    Vladislav Vaintroub 2013-05-22 MDEV-4548 - compile sphinx.so/dll and i...
    Vladislav Vaintroub 2013-05-27 MDEV-4553 - Fixes for compilation under...
    Sergei Golubchik 2013-05-24 MDEV-4516 SELECT from I_S.QUERY_CACHE_INFO...
    Sergei Golubchik 2013-05-21 fix for compiled-in FederatedX
    Sergei Golubchik 2013-05-21 MDEV-388 Creating a federated table with a...
    Sergei Golubchik 2013-05-21 [merge] 5.3 merge
    Sergei Golubchik 2013-05-21 fixes for buildbot
    Sergei Golubchik 2013-05-20 MDEV-388 Creating a federated table with a...
    Sergei Golubchik 2013-05-20 increase MAX_HA (number of simultaneously ...
    Sergei Golubchik 2013-05-20 [merge] 5.3 merge.
    Sergei Golubchik 2013-05-20 [merge] 5.2 merge
    Sergei Golubchik 2013-05-20 [merge] 5.1 merge
    Michael Widenius 2013-05-11 Fixed compiler failure on solaris
    Michael Widenius 2013-05-11 Fixed compiler warning
    Michael Widenius 2013-05-11 MDEV-4280: Assertion `empty_size == empty_...
    sanja@askmonty.org 2013-04-09 MDEV-4326 fix.
    Vladislav Vaintroub 2013-05-19 MDEV-4544 - update MSI to include Heidi...
    Vladislav Vaintroub 2013-05-19 Fix cpack error - safe_process.pl does ...
    Sergei Golubchik 2013-05-08 MDEV-4462 mysqld gets SIGFPE when mysql.us...
    sanja@askmonty.org 2013-05-03 MDEV-4290:
    Sergey Petrunya 2013-05-05 [merge] Merge
    Vladislav Vaintroub 2013-05-19 remove start menu shortcut to upgrade w...
    Vladislav Vaintroub 2013-05-19 MDEV-4544 : Update MSI installer to use...
    Alexander Barkov 2013-05-17 Bug#MDEV-4518 Server crashes in is_white_s...
    Michael Widenius 2013-05-15 - Solaris fixes:
    Alexey Botchkov 2013-05-15 MDEV-4266 Server upgrade via apt-get instal...
    Alexey Botchkov 2013-05-15 MDEV-4521 MBRContains, MBRWithin no longer ...
    Michael Widenius 2013-05-14 When one does 'REPAIR TABLE', update uuid(...
    knielsen@knielsen... 2013-05-14 Fix test failure in plugins.unix_socke...
    Sergei Golubchik 2013-05-13 MDEV-4514 After increasing user name lengt...
    Sergei Golubchik 2013-05-13 MDEV-4505 Buffer overrun when processing -...
    Sergei Golubchik 2013-05-13 MDEV-4199 Installing postfix on CentOS 5.9...
    Sergei Golubchik 2013-05-13 fix test cases
    Michael Widenius 2013-05-13 Fixed MDEV-4291: Assertion `trid >= info->...
    Michael Widenius 2013-05-12 MDEV-3999: Valgrind errors 'invalid write'...
    Michael Widenius 2013-05-11 Fixed that SHOW PROCESSLIST and informatio...
    Michael Widenius 2013-05-11 MDEV-4231: Possible bug in function _ma_ap...
    Vladislav Vaintroub 2013-05-09 Fix compile error
    Vladislav Vaintroub 2013-05-09 Small mysql_install_db.exe fixes
    Vladislav Vaintroub 2013-05-08 MDEV-4206 : log all slow statements (do...
    Alexander Barkov 2013-05-08 The bug
    Sergei Golubchik 2013-05-08 [merge] Merge with XtraDB as of Percona-Se...
    Sergei Golubchik 2013-05-08 Percona-Server-5.5.30-rel30.2.tar.gz
    Sergei Golubchik 2013-05-07 centos5 gcc 4.1 asm bug
    Sergei Golubchik 2013-05-07 Compilation warnings.
    Sergei Golubchik 2013-05-07 [merge] mysql-5.5.31 merge
    Balasubramanian K... 2013-04-12 Updated mysql.spec.sh for rpm-uln
    Balasubramanian K... 2013-03-25 Reverted MySQL Release Engineering mai...
    Balasubramanian K... 2013-03-21 Added SuSE RPM Build fix
    mysql-builder@ora... 2013-03-08
    Balasubramanian K... 2013-03-06 [merge] Added fix for Bug#16445097
    Balasubramanian K... 2013-03-06 Added fix for Bug#16445097
    Balasubramanian K... 2013-03-05 [merge] Updated Code for Bug#16235828 ...
    Balasubramanian K... 2013-03-05 Updated Code for Bug#16235828
     2013-03-01 Updated mysql.spec.sh file for br16298542
    balasubramanian.k... 2013-02-28 Updated release number in mysql.spec.s...
    balasubramanian.k... 2013-02-28 Updated mysql.spec.sh file for br16298542
    Marc Alff 2013-03-01 [merge] L0ocal merge
    Venkatesh Duggirala 2013-03-01 BUG#11753923-SQL THREAD CRASHES ON DISK...
    Jon Olav Hauglid 2013-02-28 Bug#16385711: HANDLER, CREATE TABLE IF NOT...
    Marc Alff 2013-02-28 Bug#16414644 ASSERTION FAILED: SIZE == PFS_ALLOCA...
    mysql-builder@ora... 2013-02-28
    mysql-builder@ora... 2013-02-28 [merge]
    mysql-builder@ora... 2013-02-28 [merge]
    mysql-builder@ora... 2012-09-14
    Gleb Shchepa 2013-02-28 [merge] Manual up-merge (16311231 backport)
    Gleb Shchepa 2013-02-27 Bug #16311231: MISSING DATA ON SUBQUERY WITH W...
    kevin.lewis@oracl... 2013-02-27 Bug #16305265   HANG IN RENAME TABLE
    Marko Mäkelä 2013-02-27 [merge] Merge mysql-5.1 to mysql-5.5.
    Marko Mäkelä 2013-02-27 Bug#16400920 INNODB TRIES TO PASS EMPTY BUFFER...
    Harin Vadodaria 2013-02-26 [merge] Bug#16372927: STACK OVERFLOW WITH L...
    Harin Vadodaria 2013-02-26 Bug#16372927: STACK OVERFLOW WITH LONG DATA...
    Tor Didriksen 2013-02-25 Bug#16062056   REMOVE THE "DUMMY.BAK" FILE FRO...
    Aditya A 2013-02-26 Bug#14653504  CRASH WHEN TRUNCATING PARTITIONS FRO...
    Murthy Narkedimilli 2013-02-26 [merge] Updated/added copyright headers
    Murthy Narkedimilli 2013-02-25 Updated/added copyright headers.
    Akhila Maddukuri 2013-02-25 Bug#16103072 TEST MYSQL_PLUGIN USES UNSAFE...
    mysql-builder@ora... 2013-02-25
    Annamalai Gurusami 2013-02-25 Bug #16044655 CRASH: SETTING DEFAULT VAL...
    Murthy Narkedimilli 2013-02-23 [merge] Upmerging the changes from 5.1 ...
    mysql-builder@ora... 2013-02-23
    mysql-builder@ora... 2013-02-23
    Satya Bodapati 2013-02-23 Testcase fix for Bug#14147491
    sayantan.dutta@or... 2013-02-22 Bug #13619394 - MAKE TEST FAILS ON MY_...
    Daniel Fischer 2013-02-22 [merge] merge
    Daniel Fischer 2013-02-20 Bug #13071597: MYSQL SERVER COMMUNITY TO ADV...
    Annamalai Gurusami 2013-02-22 [merge] Merge from mysql-5.1 to mysql-5.5
    Annamalai Gurusami 2013-02-22 Bug #14211565 CRASH WHEN ATTEMPTING TO S...
    Tor Didriksen 2013-02-20 Bug#14300733 CMAKE DOES NOT CHECK FOR ZLIB VE...
    Satya Bodapati 2013-02-21 Testcase fix for Bug#14147491
    Satya Bodapati 2013-02-20 Testcase fix for BUG#14147491
    Sujatha Sivakumar 2013-02-19 [merge] Merge from mysq-5.1 to mysql-5.5
    Sujatha Sivakumar 2013-02-19 Bug#11746817:MYSQL_INSTALL_DB CREATES WIL...
    Harin Vadodaria 2013-02-19 [merge] Bug#16235681: TURN OFF DEFAULT COMP...
    Harin Vadodaria 2013-02-19 Bug#16235681: TURN OFF DEFAULT COMPRESSION ...
    Annamalai Gurusami 2013-02-19 [merge] Null merge from mysql-5.1 to mys...
    mysql-builder@ora... 2013-02-19
    Shivji Kumar Jha 2013-02-19 BUG#15965353- RPL.RPL_ROW_UNTIL FAILS ON PB2,
    Pedro Gomes 2013-02-18 [merge] BUG#13545447: RPL_ROTATE_LOGS FAILS DUE...
    Pedro Gomes 2013-02-18 BUG#13545447: RPL_ROTATE_LOGS FAILS DUE TO CONC...
    Anirudh Mangipudi 2013-02-18 Bug #12546953   "SHOW VARIABLES LIKE 'DAT...
    Tor Didriksen 2013-02-18 BUG#13545447: RPL_ROTATE_LOGS FAILS DUE TO CO...
    mysql-builder@ora... 2013-02-18
    Shivji Kumar Jha 2013-02-17 [merge] BUG#15965353- RPL.RPL_ROW_UNTIL FA...
    Shivji Kumar Jha 2013-02-17 BUG#15965353- RPL.RPL_ROW_UNTIL FAILS ON PB2,
    Pedro Gomes 2013-02-15 [merge] BUG#13545447: RPL_ROTATE_LOGS FAILS DUE...
    Pedro Gomes 2013-02-15 BUG#13545447: RPL_ROTATE_LOGS FAILS DUE TO CONC...
    Alexander Nozdrin 2013-02-15 Bug#16056537: MYSQLD CRASHES IN ITEM_FUNC...
    Harin Vadodaria 2013-02-15 [merge] Bug#16218104: MYSQL YASSL - LUCKY T...
    Harin Vadodaria 2013-02-15 Bug#16218104: MYSQL YASSL - LUCKY THIRTEEN:...
    Shivji Kumar Jha 2013-02-15 [merge] BUG#12359942- REPLICATION TEST FRO...
    Shivji Kumar Jha 2013-02-15 BUG#12359942- REPLICATION TEST FROM ENGINE...
    Mattias Jonsson 2013-02-14 Bug#16274455: CAN NOT ACESS PARTITIONED TAB...
    Annamalai Gurusami 2013-02-14 [merge] Merge from mysql-5.1 to mysql-5.5
    Annamalai Gurusami 2013-02-14 For the error code ER_TOO_LONG_IDENT, th...
    Annamalai Gurusami 2013-02-12 [merge] Merge from mysql-5.1 to mysql-5.5.
    Annamalai Gurusami 2013-02-12 Bug #11753153 INNODB GENERATES SYMBOLS T...
    Mattias Jonsson 2013-02-04 post-push test result update for bug#14521864.
    Venkatesh Duggirala 2013-02-08 [merge] BUG#16247322-MTR NOT RUNNING SY...
    Venkatesh Duggirala 2013-02-08 BUG#16247322-MTR NOT RUNNING SYS_VARS T...
    Venkatesh Duggirala 2013-02-08 [merge] BUG#16247322-MTR NOT RUNNING SY...
    Venkatesh Duggirala 2013-02-08 BUG#16247322-MTR NOT RUNNING SYS_VARS T...
    Marko Mäkelä 2013-02-08 [merge] Merge mysql-5.1 to mysql-5.5.
    Marko Mäkelä 2013-02-08 Add missing linkage specifiers, so that ha_inn...
    Marko Mäkelä 2013-02-08 Bug#16292043 RACE CONDITION IN SRV_EXPORT_INNO...
    Igor Solodovnikov 2013-02-07 [merge] Null-merge from mysql-5.1
    Igor Solodovnikov 2013-02-07 bug#14163155 COM_CHANGE_USER DOESN'T WORK...
    Tor Didriksen 2013-02-07 [merge] merge 5.1 => 5.5
    Tor Didriksen 2013-02-07 Bug#16192219 CRASH IN TEST_IF_SKIP_SORT_ORDER...
    Venkatesh Duggirala 2013-02-07 [merge] Bug #16247322 MTR NOT RUNNING S...
    Venkatesh Duggirala 2013-02-07 Bug#16247322- MTR NOT RUNNING SYS_VARS ...
    kevin.lewis@oracl... 2013-02-06 Bug#16263506 - INNODB; USE ABORT() ON ...
    Ravinder Thakur 2013-02-06 Bug#14711808 MSI INSTALLATION / UPGRADE CAN...
    sayantan.dutta@or... 2013-02-06 [merge] 13625278 5.1 => 5.5
    sayantan.dutta@or... 2013-02-06 BUG #13625278 - PB2 SHOULD PROVIDE MOR...
    Hery Ramilison 2013-02-05 [merge] Upmerge of the 5.1.68 build
    hery.ramilison@or... 2013-02-05 [merge] Merge from mysql-5.1.68-release
    sunanda.menon@ora... 2013-02-05 [merge] Merge from mysql-5.5.30-release
    sayantan.dutta@or... 2013-02-05 [merge] 13625278 5.1=> 5.5
    sayantan.dutta@or... 2013-02-05 BUG #13625278 - PB2 SHOULD PROVIDE MOR...
    Thayumanavar 2013-02-05 BUG#16196591 - CLIENTS CANNOT CONNECT TO MYSQL
    sayantan.dutta@or... 2013-02-04 [merge] 16190704 5.1 => 5.5 nullmerge
    sayantan.dutta@or... 2013-02-04 Bug #16190704: MTR STILL LOSES THE FAI...
    Inaam Rana 2013-02-01 Bug#16249505 INNODB REPORTS THAT IT'S GOING TO W...
    sayantan.dutta@or... 2013-02-01 BUG #16190704 - MTR STILL LOSES THE FA...
    Nisha Gopalakrishnan 2013-02-01 BUG#16207679: MISSING ERROR WHEN RESIG...
    Gleb Shchepa 2013-01-31 [merge] Bug #11827369: ASSERTION FAILED: !THD-...
    Gleb Shchepa 2013-01-31 [merge] Bug #11827369: ASSERTION FAILED: !THD-...
    Gleb Shchepa 2013-01-23 Bug #11827369: ASSERTION FAILED: !THD->LEX->CO...
    Yasufumi Kinoshita 2013-01-31 [merge] merge to mysql-5.5 from mysql-5.1
    Yasufumi Kinoshita 2013-01-31 Bug #16220051 : INNODB_BUG12400341 FAILS...
    Chaithra Gopalareddy 2013-01-31 [merge] Bug#14096619: UNABLE TO RESTOR...
    Chaithra Gopalareddy 2013-01-31 Bug#14096619: UNABLE TO RESTORE DATABA...
    Mattias Jonsson 2013-01-30 [merge] Bug#14521864: MYSQL 5.1 TO 5.5 BUGS...
    mysql-builder@ora... 2013-01-30 [merge]
    mysql-builder@ora... 2013-01-04
    mysql-builder@ora... 2013-01-30
    Aditya A 2013-01-30 Bug#14756795  SELECT FROM NEW INNODB I_S TABLES CR...
    Krunal Bauskar 2013-01-30 [merge] - BUG#1608883:  KILLING A QUERY INSI...
    Krunal Bauskar 2013-01-30 - BUG#1608883:  KILLING A QUERY INSIDE INNOD...
    Neeraj Bisht 2013-01-29 [merge] Bug#16208709 - CRASH IN GET_SEL_ARG_FO...
    Neeraj Bisht 2013-01-29 Bug#16208709 - CRASH IN GET_SEL_ARG_FOR_KEYPAR...
    Nuno Carvalho 2013-01-28 [merge] BUG#16200555: EMPTY NAME FOR USER VAR...
    Nuno Carvalho 2013-01-28 BUG#16200555: EMPTY NAME FOR USER VARIABLE IS...
    Satya Bodapati 2013-01-28 Bug#16183892 - INNODB PURGE BUFFERING IS NOT...
    Venkatesh Duggirala 2013-01-28 [merge] Bug#16084594 USER_VAR ITEM IN '...
    Venkatesh Duggirala 2013-01-28 Bug#16084594 USER_VAR ITEM IN 'LOAD FIL...
    Venkatesh Duggirala 2013-01-26 Bug#16056813-MEMORY LEAK ON FILTERED SLAVE
    mysql-builder@ora... 2013-01-24 [merge]
    Venkata Sidagam 2013-01-24 BUG#11908153 CRASH AND/OR VALGRIND ERRORS I...
    Venkata Sidagam 2013-01-24 [merge] Bug #11752803  SERVER CRASHES IF MA...
    Venkata Sidagam 2013-01-24 Bug #11752803  SERVER CRASHES IF MAX_CONNEC...
    Venkatesh Duggirala 2013-01-24 BUG#14798572: REMOVE UNUSED VARIABLE BI...
    Yasufumi Kinoshita 2013-01-23 [merge] Merge mysql-5.1 to mysql-5.5.
    Yasufumi Kinoshita 2013-01-23 Bug #16089381 : POSSIBLE NUMBER UNDERFLO...
    Marko Mäkelä 2013-01-21 [merge] Merge mysql-5.1 to mysql-5.5.
    Marko Mäkelä 2013-01-21 Bug#16067973 DROP TABLE SLOW WHEN IT DECOMPRES...
    Venkatesh Duggirala 2013-01-19 [merge] BUG#11752707-SLAVE CRASHES IF R...
    Venkatesh Duggirala 2013-01-19 Bug#11752707-SLAVE CRASHES IF RBR HAS A...
    Astha Pareek 2013-01-18 BUG#11761680
    mysql-builder@ora... 2013-01-18
    Astha Pareek 2013-01-18 Description
    Marko Mäkelä 2013-01-17 Bug#16138582 MTR_MEMO_RELEASE AND DYN_ARRAY TO...
    Anirudh Mangipudi 2013-01-16 [merge] BUG#14117025: UNABLE TO RESTORE DUMP
    Anirudh Mangipudi 2013-01-16 BUG#14117025: UNABLE TO RESTORE DUMP
    Neeraj Bisht 2013-01-16 [merge] Bug#11751794 MYSQL GIVES THE WRONG RES...
    Neeraj Bisht 2013-01-16 Bug#11751794 MYSQL GIVES THE WRONG RESULT WITH...
    mysql-builder@ora... 2013-01-16
    Nisha Gopalakrishnan 2013-01-15 Bug#11757464:SERVER CRASH IN RECURSIVE...
    Neeraj Bisht 2013-01-15 [merge] Bug#11758009 - UNION EXECUTION ORDER W...
    Neeraj Bisht 2013-01-15 Bug#11758009 - UNION EXECUTION ORDER WRONG ?
    mysql-builder@ora... 2013-01-15
    Neeraj Bisht 2013-01-14 [merge] BUG#14303860 - EXECUTING A SELECT QUER...
    Neeraj Bisht 2013-01-14 BUG#14303860 - EXECUTING A SELECT QUERY WITH TOO
    Olav Sandstaa 2013-01-14 Fix for Bug#14636211 WRONG RESULT (EXTRA ROW)...
    Krunal Bauskar 2013-01-14 [merge] Merge from mysql-5.1 to mysql-5.5
    Krunal Bauskar 2013-01-14 - BUG#1608883:  KILLING A QUERY INSIDE INNOD...
    Nisha Gopalakrishnan 2013-01-12 [merge] BUG#11757250: REPLACE(...) INS...
    Nisha Gopalakrishnan 2013-01-12 BUG#11757250: REPLACE(...) INSIDE A ST...
    Aditya A 2013-01-11 [merge] Bug#15843818  PARTITIONING BY RANGE WITH T...
    Aditya A 2013-01-11 Bug#15843818  PARTITIONING BY RANGE WITH TO_DAYS A...
    Chaithra Gopalareddy 2013-01-11 [merge] Merge from 5.1 to 5.5
    Chaithra Gopalareddy 2013-01-10 Bug#11760726: LEFT JOIN OPTIMIZED INTO...
    Venkata Sidagam 2013-01-10 Bug #14553380 MYSQL C API LIBRARY EXITS AT ...
    Praveenkumar Hula... 2013-01-10 [merge] Merge from 5.1 to 5.5
    Praveenkumar Hula... 2013-01-10 Bug#11749556: DEBUG ASSERTION WHEN ACC...
    Annamalai Gurusami 2013-01-10 Bug #16004999 ASSERT STATE == TRX_STATE_...
    prabakaran thirum... 2013-01-10 Bug#16064876    MAIN.KILL FAILS OCCASI...
    Sunny Bains 2013-01-10 [merge] Merge from mysql-5.1 to mysql-5.5.
    Sunny Bains 2013-01-10 Bug#13997024 SEGV IN SYNC_ARRAY_CELL_PRINT PRIN...
    Hery Ramilison 2013-01-08 [merge] Empty version change upmerge
    hery.ramilison@or... 2013-01-08 Raise version number after cloning 5.1.68
    Sunanda Menon 2013-01-08 Raise version number after cloning 5.5.30
    Michael Widenius 2013-05-06 If one declared several continue handler f...
    Sergey Petrunya 2013-05-05 [merge] MDEV-4482 fix null-merged to 5.5
    Sergey Petrunya 2013-05-05 [merge] Merge
    Sergey Petrunya 2013-05-05 MDEV-4482: main.windows test fails in build...
    Igor Babaev 2013-05-04 [merge] Merge 5.3->5.5
    Igor Babaev 2013-05-03 Fixed bug mdev-4336.
    Igor Babaev 2013-05-03 Made consistent handling of the predicates of t...
    Igor Babaev 2013-04-29 Fixed bug mdev-4274.
    Sergey Petrunya 2013-05-04 MDEV-4071: Valgrind warnings 'Invalid read'...
    Sergey Petrunya 2013-05-04 MDEV-389: Wrong result (missing row) with s...
    Sergey Petrunya 2013-05-04 Update testcase result
    Sergey Petrunya 2013-05-04 MDEV-4270: crash in fix_semijoin_strategies...
    Sergey Petrunya 2013-05-04 MDEV-621: LP:693329 - Assertion `!is_interl...
    Sergey Petrunya 2013-05-03 MDEV-4465: Reproducible crash (mysqld got s...
    Vladislav Vaintroub 2013-04-30 MDEV-4458 - Windows installer does not ...
    Vladislav Vaintroub 2013-04-28 fix test on Windows
    Igor Babaev 2013-04-27 Fixed bug mdev-4340.
    Vladislav Vaintroub 2013-04-25 Fix build on Windows
    knielsen@knielsen... 2013-04-25 Fix unsigned/signed conversion bug in ...
    knielsen@knielsen... 2013-04-22 MDEV-4396: Fix sporadic failure of tes...
    Sergei Golubchik 2013-04-19 MDEV-260 auditing table accesses
    Vladislav Vaintroub 2013-04-19 MDEV-4398 -
    Sergei Golubchik 2013-04-18 MDEV-4332 Increase username length from 16...
    Sergei Golubchik 2013-04-17 strmake_buf(X,Y) helper, equivalent to str...
    Vladislav Vaintroub 2013-06-06 fix compile error
    Michael Widenius 2013-06-06 Fixed timing failure in myisam-metadata.test
    knielsen@knielsen... 2013-06-05 Fix two small problems in previous push.
    knielsen@knielsen... 2013-06-05 MDEV-26: Global transaction ID.
    knielsen@knielsen... 2013-06-03 MDEV-4605: Failing to load GTID slave ...
    knielsen@knielsen... 2013-05-29 MDEV-4485: Incorrect error handling in...
    knielsen@knielsen... 2013-05-29 MDEV-4485: Master did not allow slave ...
    Michael Widenius 2013-06-05 - Fixed compiler warning
    knielsen@knielsen... 2013-05-28 [merge] merge compile fix 10.0-base ->...
    knielsen@knielsen... 2013-05-28 Fix type-typo which caused windows bui...
    knielsen@knielsen... 2013-05-28 [merge] Merge 10.0-base -> 10.0
    knielsen@knielsen... 2013-05-28 [merge] Merge 10.0-base -> 10.0
    knielsen@knielsen... 2013-05-28 MDEV-4478: Implement GTID "strict mode"
    knielsen@knielsen... 2013-05-25 MDEV-4475 follow-up patch: Add forgott...
    knielsen@knielsen... 2013-05-24 MDEV-4475: Replication from MariaDB 10...
    knielsen@knielsen... 2013-05-22 MDEV-26: Global transaction ID.
    knielsen@knielsen... 2013-05-16 Fix race condition in binlog dump thre...
    knielsen@knielsen... 2013-05-15 MDEV-26: Global transaction ID.
    Michael Widenius 2013-05-10 Merge of patch lp:~ahiguti100/maria/handle...
    Michael Widenius 2013-05-10 Added some fixes that should make MyISAM &...
    knielsen@knielsen... 2013-05-06 Fix big problem in previous push. (Rel...
    Michael Widenius 2013-05-05 Fixed errors and compiler warnings found b...
    Sergey Petrunya 2013-05-28 MDEV-4001: Cassandra: server crashes in ha_...
    Sergey Petrunya 2013-05-28 MDEV-4443: Cassandra SE: ERROR 1928 (HY000)...

c0fe5cc3

07 Jun, 2013 4 commits

- Set timeout values in MYSQLC::Open · adeff678
Olivier Bertrand authored Jun 08, 2013
```
modified:
  storage/connect/myconn.cpp
```
adeff678
Enabling Connect tests · 76fc94af
Alexander Barkov authored Jun 08, 2013
```
modified:
  mysql-test/mysql-test-run.pl
```
76fc94af

Merge from 10.0-connect · a2cfb802

Alexander Barkov authored Jun 08, 2013

added:
  include/mysql/service_thd_timezone.h
  libservices/thd_timezone_service.c
  storage/connect/inihandl.h
  storage/connect/mysql-test/connect/r/grant.result
  storage/connect/mysql-test/connect/r/ini_grant.result
  storage/connect/mysql-test/connect/r/mysql_grant.result
  storage/connect/mysql-test/connect/r/occur.result
  storage/connect/mysql-test/connect/r/odbc_sqlite3_grant.result
  storage/connect/mysql-test/connect/r/pivot.result
  storage/connect/mysql-test/connect/r/xcol.result
  storage/connect/mysql-test/connect/r/xml_grant.result
  storage/connect/mysql-test/connect/std_data/expenses.txt
  storage/connect/mysql-test/connect/t/grant.test
  storage/connect/mysql-test/connect/t/have_odbc_sqlite3.inc
  storage/connect/mysql-test/connect/t/ini_grant.test
  storage/connect/mysql-test/connect/t/mysql_grant.test
  storage/connect/mysql-test/connect/t/occur.test
  storage/connect/mysql-test/connect/t/odbc_sqlite3_grant.test
  storage/connect/mysql-test/connect/t/pivot.test
  storage/connect/mysql-test/connect/t/xcol.test
  storage/connect/mysql-test/connect/t/xml_grant.test
  storage/connect/rcmsg.h
  storage/connect/taboccur.cpp
  storage/connect/taboccur.h
  storage/connect/tabutil.cpp
  storage/connect/tabutil.h
  storage/connect/tabxcl.cpp
  storage/connect/tabxcl.h
modified:
  include/my_global.h
  include/my_time.h
  include/mysql.h.pp
  include/mysql/plugin.h
  include/mysql/plugin_audit.h.pp
  include/mysql/plugin_auth.h.pp
  include/mysql/plugin_ftparser.h.pp
  include/mysql/services.h
  include/mysql_time.h
  include/probes_mysql_nodtrace.h
  include/service_versions.h
  libservices/CMakeLists.txt
  mysql-test/r/handlersocket.result
  mysql-test/r/plugin.result
  mysql-test/suite/plugins/r/show_all_plugins.result
  sql/item_func.cc
  sql/mysqld.cc
  sql/set_var.cc
  sql/sql_class.cc
  sql/sql_plugin.cc
  sql/sql_plugin.h
  sql/sql_plugin_services.h
  sql/sql_show.cc
  sql/sys_vars.cc
  storage/connect/CMakeLists.txt
  storage/connect/catalog.h
  storage/connect/colblk.cpp
  storage/connect/colblk.h
  storage/connect/connect.cc
  storage/connect/connect.h
  storage/connect/filamdbf.cpp
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/inihandl.c
  storage/connect/maputil.h
  storage/connect/mycat.cc
  storage/connect/myconn.cpp
  storage/connect/myconn.h
  storage/connect/mysql-test/connect/r/bin.result
  storage/connect/mysql-test/connect/r/csv.result
  storage/connect/mysql-test/connect/r/dbf.result
  storage/connect/mysql-test/connect/r/dir.result
  storage/connect/mysql-test/connect/r/fix.result
  storage/connect/mysql-test/connect/r/fmt.result
  storage/connect/mysql-test/connect/r/ini.result
  storage/connect/mysql-test/connect/r/mysql.result
  storage/connect/mysql-test/connect/r/odbc_sqlite3.result
  storage/connect/mysql-test/connect/r/tbl.result
  storage/connect/mysql-test/connect/r/upd.result
  storage/connect/mysql-test/connect/r/vec.result
  storage/connect/mysql-test/connect/r/xml.result
  storage/connect/mysql-test/connect/t/bin.test
  storage/connect/mysql-test/connect/t/csv.test
  storage/connect/mysql-test/connect/t/dbf.test
  storage/connect/mysql-test/connect/t/dir.test
  storage/connect/mysql-test/connect/t/fix.test
  storage/connect/mysql-test/connect/t/fmt.test
  storage/connect/mysql-test/connect/t/ini.test
  storage/connect/mysql-test/connect/t/mysql.test
  storage/connect/mysql-test/connect/t/odbc_sqlite3.test
  storage/connect/mysql-test/connect/t/tbl.test
  storage/connect/mysql-test/connect/t/vec.test
  storage/connect/mysql-test/connect/t/xml.test
  storage/connect/odbconn.cpp
  storage/connect/osutil.c
  storage/connect/osutil.h
  storage/connect/plgcnx.h
  storage/connect/plgdbsem.h
  storage/connect/plgdbutl.cpp
  storage/connect/plugutil.c
  storage/connect/rcmsg.c
  storage/connect/reldef.cpp
  storage/connect/tabcol.cpp
  storage/connect/tabcol.h
  storage/connect/tabfmt.cpp
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
  storage/connect/tabodbc.cpp
  storage/connect/tabpivot.cpp
  storage/connect/tabpivot.h
  storage/connect/tabsys.cpp
  storage/connect/tabsys.h
  storage/connect/tabtbl.cpp
  storage/connect/tabtbl.h
  storage/connect/tabwmi.cpp
  storage/connect/user_connect.cc
  storage/connect/valblk.cpp
  storage/connect/valblk.h
  storage/connect/value.cpp
  storage/connect/value.h
  storage/connect/xobject.h
  storage/connect/xtable.h
  storage/perfschema/ha_perfschema.cc
pending merges:
  Alexander Barkov 2013-06-08 Fixing a few compiler warnings
    Olivier Bertrand 2013-06-05 - Change CRLF line endings to LF
    Olivier Bertrand 2013-06-04 - Adding parallelism to the TBL table type
    Sergei Golubchik 2013-06-03 compiler warnings
    Alexander Barkov 2013-06-03 Fixing the problem with my_bool_t define...
    Olivier Bertrand 2013-05-28 - Fix crash when a null qrp is returned ...
    Olivier Bertrand 2013-05-28 - Extending connect_assisted_discovery c...
    Alexander Barkov 2013-05-28 Recording test results forgotten in the ...
    Alexander Barkov 2013-05-27 [merge] Merging with the latest 10.0
    Alexander Barkov 2013-05-27 - Fixing embedded verision of the Connec...
    Alexander Barkov 2013-05-27 Fixing ABI template, to take into accoun...
    Alexander Barkov 2013-05-27 Fixing ABI template, to take into accoun...
    Olivier Bertrand 2013-05-27 - Fix Windows compile error
    Alexander Barkov 2013-05-24 Adding the timezone plugin service, to c...
    Alexander Barkov 2013-05-24 Do not run mysql.test in case of embedde...
    Alexander Barkov 2013-05-24 Splitting SQLite3 tests into two parts:
    Alexander Barkov 2013-05-24 Removing more cases of direct use of thd.
    Alexander Barkov 2013-05-24 Removing direct access to thd, using fun...
    Olivier Bertrand 2013-05-24 - Fix setting default type to MYSQL->PRO...
    Alexander Barkov 2013-05-23 Connect: fixing non thread-safe code.
    Olivier Bertrand 2013-05-22 - Changing CONNECT version number and date
    Alexander Barkov 2013-05-21 "mtr --suite=connect --embedded" tests d...
    Olivier Bertrand 2013-05-20 - Correct misplaced parenthesis in last ...
    Olivier Bertrand 2013-05-20 - Save and restore srcdef when getting a...
    Olivier Bertrand 2013-05-19 - Removing unused copy file
    Olivier Bertrand 2013-05-19 [merge] - Commit merged and resolve
    Alexander Barkov 2013-05-13 Fixing warnings (mostly "no previous dec...
    Alexander Barkov 2013-05-13 Fixing compiler warnings ("no previous d...
    Alexander Barkov 2013-05-13 Fixing a few "no previous declaration" w...
    Alexander Barkov 2013-05-13 Fixing a few compilation warnings ("no p...
    Olivier Bertrand 2013-05-19 - Allowing views and queries as paramete...
    Olivier Bertrand 2013-05-13 [merge] - Commit merged changes
    Alexander Barkov 2013-05-13 [merge] Merge from maria-10.0
    Alexander Barkov 2013-05-13 Enabling --suite=connect by default
    Olivier Bertrand 2013-05-13 - Code cleaning. Eliminating unused code...
    Olivier Bertrand 2013-05-13 - fix use of uninitialized variable (colp)
    Olivier Bertrand 2013-05-13 - Set tdbp to NULL when ignored
    Olivier Bertrand 2013-05-12 - Changing mode from +x to -x
    Olivier Bertrand 2013-05-12 - Code cleaning.
    Olivier Bertrand 2013-05-11 - Fix tabpivot compile errors on Linux.
    Olivier Bertrand 2013-05-11 - Added a test case for PIVOT tables
    Olivier Bertrand 2013-05-10 - Add pivot table files and support
    Olivier Bertrand 2013-05-10 - Added table type PIVOT
    Olivier Bertrand 2013-05-09 - Fix inverted test on am in MYSQLDEF::D...
    Olivier Bertrand 2013-05-05 - General code cleaning, eliminating a f...
    Olivier Bertrand 2013-05-04 - Add test for XCOL and OCCUR tables
    Olivier Bertrand 2013-05-02 - Adding a loop test to prevent PROXY ba...
    Olivier Bertrand 2013-04-30 - Change in connect_assisted_discovery t...
    Olivier Bertrand 2013-04-30 - Allow PROXY based tables to specify My...
    Olivier Bertrand 2013-04-29 - Fix a bug causing a crash when using O...
    Olivier Bertrand 2013-04-29 - Adding 3 new table types:

a2cfb802

Fixing a few compiler warnings · ffa2eb43
Alexander Barkov authored Jun 08, 2013
```
modified:
  storage/connect/ha_connect.cc
  storage/connect/value.cpp
```
ffa2eb43

06 Jun, 2013 4 commits

10.0-base merge · 72ba9587
Sergei Golubchik authored Jun 06, 2013
```
(without InnoDB - all InnoDB changes were ignored)
```
72ba9587
5.5 merge · 4749d40c
Sergei Golubchik authored Jun 06, 2013

4749d40c
fix compile error · 1ff1cb10
Vladislav Vaintroub authored Jun 06, 2013

1ff1cb10

Fixed timing failure in myisam-metadata.test · 5cf5a9a1

Michael Widenius authored Jun 06, 2013

mysql-test/include/wait_show_condition.inc:
  Print failing statement if timeout
mysql-test/r/myisam-metadata.result:
  Updated DBUG_SYNC
mysql-test/t/myisam-metadata.test:
  Updated DBUG_SYNC.
  Removed wait_show_condtion, as this is not needed when we use DBUG_SYNC
  This should fix timing issues with the test
mysys/thr_mutex.c:
  Added comments
sql/sql_acl.cc:
  atoi -> atoll()  (Safety)
storage/myisam/ha_myisam.cc:
  Send signal before mi_repair_by_sort.

5cf5a9a1

05 Jun, 2013 3 commits

Fix two small problems in previous push. · 64e53a0f
unknown authored Jun 05, 2013

64e53a0f

MDEV-26: Global transaction ID. · 5cb486d1

unknown authored Jun 05, 2013

Fix problems related to reconnect. When we need to reconnect (ie. explict
stop/start of just the IO thread by user, or automatic reconnect due to
loosing network connection with the master), it is a bit complex to correctly
resume at the right point without causing duplicate or missing events in the
relay log. The previous code had multiple problems in this regard.

With this patch, the problem is solved as follows. The IO thread keeps track
(in memory) of which GTID was last queued to the relay log. If it needs to
reconnect, it resumes at that GTID position. It also counts number of events
received within the last, possibly partial, event group, and skips the same
number of events after a reconnect, so that events already enqueued before the
reconnect are not duplicated.

(There is no need to keep any persistent state; whenever we restart slave
threads after both of them being stopped (such as after server restart), we
erase the relay logs and start over from the last GTID applied by SQL thread.
But while the SQL thread is running, this patch is needed to get correct relay
log).

5cb486d1

- Fixed compiler warning · fab9a55d

Michael Widenius authored Jun 05, 2013

- Don't abort InnoDB if one can't allocate resources for AIO
  (this patch was in 5.5 and 10.0-base but was missing in 10.0)


sql/mdl.cc:
  Fixed compiler warning
storage/innobase/os/os0file.cc:
  Don't abort InnoDB if one can't allocate resources for AIO

fab9a55d