mariadb/include
Alexander Barkov a2cfb8023f Merge from 10.0-connect
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:
2013-06-08 01:16:00 +04:00
..
atomic centos5 gcc 4.1 asm bug 2013-05-07 18:28:36 +02:00
mysql Merge from 10.0-connect 2013-06-08 01:16:00 +04:00
base64.h Updated/added copyright headers 2013-02-26 06:35:17 +01:00
CMakeLists.txt 10.0-base -> 10.0-monty 2012-10-19 20:38:59 +02:00
decimal.h merge 2012-04-05 23:07:18 +02:00
errmsg.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
ft_global.h mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
handler_state.h Fix for MDEV-533: Confusing error code when doing auto-increment insert for out-of-range values 2012-09-18 15:14:19 +03:00
hash.h small cleanup 2013-04-07 14:03:43 +02:00
heap.h MDEV-4011 Added per thread memory counting and usage 2013-01-23 16:16:14 +01:00
keycache.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
lf.h 1. fix an old typo. A purgatory must be cleaned on every LF_PURGATORY_SIZE freeing, 2012-09-04 12:12:28 +02:00
m_ctype.h 10.0-base merge 2013-06-06 21:32:29 +02:00
m_string.h mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
ma_dyncol.h 5.5 merge 2013-01-29 15:10:47 +01:00
maria.h remove ULL() and LL(), because they're totally unnecessary 2013-04-07 14:00:16 +02:00
my_aes.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
my_alarm.h 5.3 merge 2012-01-13 15:50:02 +01:00
my_alloc.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
my_atomic.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
my_attribute.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
my_base.h * frm extra2 segment. 2013-04-09 16:18:33 +02:00
my_bit.h merge with 5.3 2011-10-19 21:45:18 +02:00
my_bitmap.h 5.3 merge 2012-01-13 15:50:02 +01:00
my_compare.h 5.3->5.5 merge 2011-11-22 18:04:38 +01:00
my_compiler.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
my_context.h merge with 5.5 2012-11-03 12:28:51 +01:00
my_dbug.h MDEV-26: Global transaction ID. 2013-03-26 14:44:27 +01:00
my_decimal_limits.h 5.3 merge 2012-01-13 15:50:02 +01:00
my_dir.h my_dir() cleanup 2013-04-07 15:19:45 +02:00
my_getopt.h 10.0-base -> 10.0-monty 2012-10-19 20:38:59 +02:00
my_global.h Merge from 10.0-connect 2013-06-08 01:16:00 +04:00
my_handler_errors.h Fixes after Serg's review of %M extenstions 2012-06-17 15:34:39 +03:00
my_libwrap.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
my_list.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
my_md5.h 10.0-base merge 2013-06-06 21:32:29 +02:00
my_net.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
my_nosys.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
my_pthread.h 10.0-base merge 2013-06-06 21:32:29 +02:00
my_rdtsc.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
my_stacktrace.h Define dummy my_init_stacktrace() to allow one to call it without #ifdef HAVE_STACKTRACE 2012-04-03 15:48:56 +03:00
my_sys.h 10.0-base merge 2013-06-06 21:32:29 +02:00
my_time.h Adding the timezone plugin service, to convert between 2013-05-24 19:09:59 +04:00
my_tree.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
my_uctype.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
my_user.h Updated/added copyright headers 2013-02-26 06:35:17 +01:00
my_valgrind.h Compile 10.0 on Windows 2012-08-30 11:36:24 +02:00
my_xml.h Updated/added copyright headers 2013-02-26 06:35:17 +01:00
myisam.h Added some fixes that should make MyISAM & Aria REPAIR work with more than 4G records 2013-05-10 12:32:34 +03:00
myisamchk.h 5.5 merge 2013-06-06 17:51:28 +02:00
myisammrg.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
myisampack.h mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
mysql.h 10.0-base merge 2013-06-06 21:32:29 +02:00
mysql.h.pp Adding the timezone plugin service, to convert between 2013-05-24 19:09:59 +04:00
mysql_async.h MDEV-3802: Millisecond timeout support in non-blocking client library + fix incorrect blocking. 2012-10-12 11:00:01 +02:00
mysql_com.h 10.0-base merge 2013-06-06 21:32:29 +02:00
mysql_com_server.h Next part of merge. See TODO for details 2012-08-14 17:23:34 +03:00
mysql_embed.h 5.3 merge 2012-01-13 15:50:02 +01:00
mysql_time.h Merge from 10.0-connect 2013-06-08 01:16:00 +04:00
mysql_version.h.in mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
mysqld_default_groups.h MDEV-4068 rpm scriptlet chown command dangerous 2013-03-06 09:32:13 +01:00
mysys_err.h 5.3 merge 2012-01-13 15:50:02 +01:00
password.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
probes_mysql.d.base Updated/added copyright headers 2011-06-30 17:46:53 +02:00
probes_mysql.h more portable fix for lp:942266 - 5.5 builds fail with systemtap-sdt-dev installed on Ubuntu 2012-05-11 09:18:00 +02:00
probes_mysql_nodtrace.h Merge from 10.0-connect 2013-06-08 01:16:00 +04:00
queues.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
rijndael.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
service_versions.h Adding the timezone plugin service, to convert between 2013-05-24 19:09:59 +04:00
sha1.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sha2.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_common.h 10.0-base -> 10.0-monty 2012-10-19 20:38:59 +02:00
sslopt-case.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
sslopt-longopts.h Next part of merge. See TODO for details 2012-08-14 17:23:34 +03:00
sslopt-vars.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
t_ctype.h Many files: 2006-12-23 20:17:15 +01:00
thr_alarm.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
thr_lock.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
thread_pool_priv.h mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
typelib.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
violite.h 10.0-base merge 2013-04-15 15:09:22 +02:00
waiting_threads.h use PSI wrappers in aria and other non-MySQL code 2011-07-13 21:10:18 +02:00
welcome_copyright_notice.h mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
wqueue.h fix the include guards and add missing gplv2 headers 2012-02-17 12:19:38 +01:00