delta/mariadb-git.git/sql/sql_connect.cc, branch hf-10.1.wsrep_debug

Merge branch '10.0' into 10.1

2016-05-04T13:23:26+00:00

Merge branch '5.5' into 10.0

2016-04-26T21:05:26+00:00

MDEV-7775 Wrong error message (Unknown error) when idle sessions are killed after wait_timeout

2016-04-25T20:46:43+00:00

restore the error message that was removed by mistake in ec38c1bbd709

Merge branch '10.0' into 10.1

2015-11-19T14:52:14+00:00

remove unneded #include's that had a dubious explanation

2015-10-24T17:58:34+00:00

- Renaming variables so that they don't shadow others (After this patch one can compile with -Wshadow and get much fewer warnings)

2015-07-06T17:24:14+00:00

- Changed ER(ER_...) to ER_THD(thd, ER_...) when thd was known or if there was many calls to current_thd in the same function.
- Changed ER(ER_..) to ER_THD_OR_DEFAULT(current_thd, ER...) in some places where current_thd is not necessary defined.
- Removing calls to current_thd when we have access to thd

Part of this is optimization (not calling current_thd when not needed),
but part is bug fixing for error condition when current_thd is not defined
(For example on startup and end of mysqld)

Notable renames done as otherwise a lot of functions would have to be changed:
- In JOIN structure renamed:
   examined_rows -> join_examined_rows
   record_count -> join_record_count
- In Field, renamed new_field() to make_new_field()

Other things:
- Added DBUG_ASSERT(thd == tmp_thd) in Item_singlerow_subselect() just to be safe.
- Removed old 'tab' prefix in JOIN_TAB::save_explain_data() and use members directly
- Added 'thd' as argument to a few functions to avoid calling current_thd.

Merge tag 'mariadb-10.0.20' into 10.1

2015-06-27T18:35:26+00:00

Merge branch '5.5' into 10.0

2015-06-11T18:20:35+00:00

MDEV-7500 thread_handling option in my.cnf is not passing "connect events" to audit plugin.

2015-06-08T07:09:13+00:00

  The MYSQL_AUDIT_NOTIFY_CONNECTION_CONNECT() call moved to the login_connection()
  function. So that it'll be invoked in any thread handling mode.

Merge branch '10.0' into bb-10.1-merge

2014-12-02T21:25:16+00:00

Conflicts:
	.bzrignore
	VERSION
	cmake/plugin.cmake
	debian/dist/Debian/control
	debian/dist/Ubuntu/control
	mysql-test/r/join_outer.result
	mysql-test/r/join_outer_jcl6.result
	mysql-test/r/null.result
	mysql-test/r/old-mode.result
	mysql-test/r/union.result
	mysql-test/t/join_outer.test
	mysql-test/t/null.test
	mysql-test/t/old-mode.test
	mysql-test/t/union.test
	packaging/rpm-oel/mysql.spec.in
	scripts/mysql_config.sh
	sql/ha_ndbcluster.cc
	sql/ha_ndbcluster_binlog.cc
	sql/ha_ndbcluster_cond.cc
	sql/item_cmpfunc.h
	sql/lock.cc
	sql/sql_select.cc
	sql/sql_show.cc
	sql/sql_update.cc
	sql/sql_yacc.yy
	storage/innobase/buf/buf0flu.cc
	storage/innobase/fil/fil0fil.cc
	storage/innobase/include/srv0srv.h
	storage/innobase/lock/lock0lock.cc
	storage/tokudb/CMakeLists.txt
	storage/xtradb/buf/buf0flu.cc
	storage/xtradb/fil/fil0fil.cc
	storage/xtradb/include/srv0srv.h
	storage/xtradb/lock/lock0lock.cc
	support-files/mysql.spec.sh