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
..
psi	remove numerous #ifdef HAVE_PSI_TABLE_INTERFACE	2013-04-15 18:47:47 +02:00
auth_dialog_client.h	move authentication_windows_client and mysql_clear_password clear client auth plugins	2011-07-12 14:34:47 +02:00
client_plugin.h	5.3 merge	2012-01-13 15:50:02 +01:00
client_plugin.h.pp	move authentication_windows_client and mysql_clear_password clear client auth plugins	2011-07-12 14:34:47 +02:00
plugin.h	Fixing the problem with my_bool_t defined two times.	2013-06-03 11:57:34 +04:00
plugin_audit.h	MDEV-260 auditing table accesses	2013-04-19 12:50:16 +02:00
plugin_audit.h.pp	Merge from 10.0-connect	2013-06-08 01:16:00 +04:00
plugin_auth.h	MDEV-4307 Support at least 48 utf8 characters in username in server and PAM	2013-03-26 19:17:26 +01:00
plugin_auth.h.pp	Fixing the problem with my_bool_t defined two times.	2013-06-03 11:57:34 +04:00
plugin_auth_common.h	MDEV-4307 Support at least 48 utf8 characters in username in server and PAM	2013-03-26 19:17:26 +01:00
plugin_ftparser.h	mysql-5.5.18 merge	2011-11-03 19:17:05 +01:00
plugin_ftparser.h.pp	Fixing the problem with my_bool_t defined two times.	2013-06-03 11:57:34 +04:00
service_debug_sync.h	fixes for test failures	2012-09-27 20:09:46 +02:00
service_kill_statement.h	MDEV-4065 thd_kill_statement service	2013-01-18 19:04:23 +01:00
service_my_snprintf.h	mysql-5.5.31 merge	2013-05-07 13:05:09 +02:00
service_progress_report.h	Added progress reporting for alter table, LOAD DATA INFILE and for aria tables: check table, repair table, analyze table.	2011-07-01 15:08:30 +03:00
service_thd_alloc.h	Updated/added copyright headers	2011-06-30 17:46:53 +02:00
service_thd_timezone.h	Fixing the problem with my_bool_t defined two times.	2013-06-03 11:57:34 +04:00
service_thd_wait.h	MDEV-156 Threadpool - add thd_wait_begin/thd_wait_end to the network IO functions	2013-02-19 20:44:33 +01:00
services.h	Adding the timezone plugin service, to convert between	2013-05-24 19:09:59 +04:00