[Commits] ca07ee8: Merge tag 'mariadb-5.5.47' into 5.5-galera

Nirbhay Choubey nirbhay at mariadb.com
Thu Dec 10 20:00:08 EET 2015


revision-id: ca07ee85ea28d4b820498535508c6b23f089c22c
parent(s): 278ff1661a9fcf690b6b7604eb889fd287e6246a d67aacb4fbb449ffa8db4e3d70fe8756d62b5222
committer: Nirbhay Choubey
branch nick: 5.5-galera
timestamp: 2015-12-10 13:00:08 -0500
message:

Merge tag 'mariadb-5.5.47' into 5.5-galera


 VERSION                                            |   2 +-
 client/mysql_plugin.c                              |  10 +-
 client/mysql_upgrade.c                             |  94 ++++++-----
 client/mysqlcheck.c                                |   2 +-
 client/mysqldump.c                                 |  20 +--
 client/mysqlshow.c                                 |  39 +++--
 cmake/cpack_rpm.cmake                              |   2 +-
 ...ariadb-galera-server-5.5.mysql-server.logrotate |   2 +-
 libmysql/conf_to_src.c                             |   4 +-
 mysql-test/include/default_mysqld.cnf              |   3 +
 mysql-test/r/create.result                         |   6 +
 mysql-test/r/ctype_filename.result                 |   3 +
 mysql-test/r/ctype_utf8.result                     |  27 +++
 mysql-test/r/events_1.result                       |   2 +-
 mysql-test/r/fulltext.result                       |   2 +-
 mysql-test/r/mysql_plugin.result                   |   2 +-
 mysql-test/r/mysql_upgrade.result                  |   9 +-
 mysql-test/r/mysqldump.result                      |  26 +++
 mysql-test/r/ps.result                             |  21 +++
 mysql-test/r/ps_change_master.result               |  22 +++
 mysql-test/r/range.result                          |  13 ++
 mysql-test/r/range_mrr_icp.result                  |  13 ++
 mysql-test/r/show_row_order-9226.result            |  80 +++++++++
 mysql-test/r/udf_notembedded.result                |   6 +
 mysql-test/r/update.result                         |  59 +++++++
 mysql-test/r/view.result                           |  33 ++++
 .../suite/federated/error_on_close-8313.result     |  27 +++
 .../suite/federated/error_on_close-8313.test       |  38 +++++
 mysql-test/suite/innodb/r/dropdb.result            |   9 +
 mysql-test/suite/innodb/r/innodb-autoinc.result    |  16 +-
 .../suite/innodb/r/innodb-fk-warnings.result       |  24 +--
 mysql-test/suite/innodb/r/innodb-fk.result         |   6 +-
 .../r/innodb_information_schema_tables.result      |   2 +
 mysql-test/suite/innodb/t/dropdb.test              |  12 ++
 mysql-test/suite/innodb/t/innodb-autoinc.test      |   3 +-
 .../innodb/t/innodb_information_schema_tables.opt  |  29 ++++
 .../innodb/t/innodb_information_schema_tables.test |  64 +++++++
 .../suite/plugins/r/feedback_plugin_install.result |   3 +-
 .../suite/plugins/r/feedback_plugin_load.result    |   3 +-
 .../suite/plugins/r/feedback_plugin_send.result    |  10 +-
 .../suite/plugins/t/feedback_plugin_install.test   |   4 +-
 .../suite/plugins/t/feedback_plugin_load.test      |   3 +-
 .../suite/plugins/t/feedback_plugin_send.test      |  21 ++-
 mysql-test/t/create.test                           |   8 +
 mysql-test/t/ctype_filename.test                   |   3 +
 mysql-test/t/ctype_utf8.test                       |  16 ++
 mysql-test/t/events_1.test                         |   2 +-
 mysql-test/t/mysql_upgrade.test                    |   9 +-
 mysql-test/t/mysqldump.test                        |  10 ++
 mysql-test/t/ps.test                               |  22 +++
 mysql-test/t/ps_change_master.test                 |  45 +++++
 mysql-test/t/range.test                            |  12 ++
 mysql-test/t/show_row_order-9226.test              |  73 ++++++++
 mysql-test/t/udf_notembedded.test                  |  14 ++
 mysql-test/t/update.test                           |  73 ++++++++
 mysql-test/t/view.test                             |  35 ++++
 mysys/my_getopt.c                                  |   2 +-
 packaging/rpm-oel/mysql.spec.in                    |   7 +-
 plugin/daemon_example/daemon_example.cc            |  12 +-
 plugin/feedback/feedback.cc                        |  33 ++++
 plugin/feedback/feedback.h                         |   4 +
 plugin/feedback/sender_thread.cc                   |   8 +-
 regex/main.c                                       |  17 +-
 scripts/mysqld_multi.sh                            |  27 +--
 sql-common/client.c                                |  55 +++---
 sql/field.h                                        |  20 +--
 sql/item.cc                                        |  23 ++-
 sql/item_cmpfunc.cc                                |   2 +-
 sql/item_cmpfunc.h                                 |   4 +-
 sql/item_func.cc                                   |  10 +-
 sql/item_subselect.cc                              |  28 +++-
 sql/log.cc                                         |   2 +
 sql/mysqld.cc                                      |  14 +-
 sql/mysqld.h                                       |   4 +-
 sql/sql_acl.cc                                     |   4 +
 sql/sql_insert.cc                                  |  16 +-
 sql/sql_lex.cc                                     |  23 +++
 sql/sql_lex.h                                      |   2 +
 sql/sql_prepare.cc                                 |  16 +-
 sql/sql_reload.cc                                  |   5 +-
 sql/sql_select.cc                                  |  38 ++++-
 sql/sql_show.cc                                    |   5 +-
 sql/sql_table.cc                                   |   5 +-
 sql/sql_udf.cc                                     |   4 +-
 sql/sql_udf.h                                      |   3 +
 sql/sql_update.cc                                  |  32 +++-
 sql/sql_update.h                                   |   1 +
 sql/sql_view.cc                                    |   5 +
 sql/sql_yacc.yy                                    |   9 +
 sql/table.cc                                       |  17 +-
 storage/federated/ha_federated.cc                  |  31 ++--
 storage/federatedx/ha_federatedx.cc                |  71 ++++----
 storage/innobase/dict/dict0crea.c                  |   2 +-
 storage/innobase/dict/dict0dict.c                  | 122 +++++++-------
 storage/innobase/handler/ha_innodb.cc              |  32 ++--
 storage/innobase/log/log0recv.c                    |   8 +-
 storage/myisam/mi_create.c                         |   6 +-
 storage/tokudb/hatoku_cmp.cc                       | 186 ---------------------
 storage/tokudb/hatoku_cmp.h                        |  19 ---
 storage/tokudb/hatoku_hton.h                       |   8 -
 storage/xtradb/CMakeLists.txt                      |  17 +-
 storage/xtradb/btr/btr0cur.c                       |  47 +++++-
 storage/xtradb/dict/dict0crea.c                    |   2 +-
 storage/xtradb/dict/dict0dict.c                    | 122 +++++++-------
 storage/xtradb/handler/ha_innodb.cc                | 178 +++++++++++++++-----
 storage/xtradb/handler/i_s.cc                      |  15 +-
 storage/xtradb/include/ha_prototypes.h             |  10 ++
 storage/xtradb/include/os0file.h                   |  11 +-
 storage/xtradb/include/os0sync.h                   | 115 ++++++++++++-
 storage/xtradb/include/sync0sync.h                 |   9 +-
 storage/xtradb/include/sync0sync.ic                |   9 +-
 storage/xtradb/include/univ.i                      |   4 +-
 storage/xtradb/lock/lock0lock.c                    |  10 +-
 storage/xtradb/log/log0online.c                    |  16 +-
 storage/xtradb/log/log0recv.c                      |   2 +-
 storage/xtradb/os/os0file.c                        |  17 +-
 storage/xtradb/row/row0ins.c                       |   5 +-
 storage/xtradb/trx/trx0trx.c                       |   6 +
 strings/ctype-utf8.c                               |   2 +-
 support-files/mysql.server.sh                      |   2 +-
 unittest/mysys/CMakeLists.txt                      |   1 +
 unittest/mysys/my_getopt-t.c                       |  71 ++++++++
 122 files changed, 1962 insertions(+), 749 deletions(-)

diff --cc debian/mariadb-galera-server-5.5.mysql-server.logrotate
index 0f0de51,0000000..789ad35
mode 100644,000000..100644
--- a/debian/mariadb-galera-server-5.5.mysql-server.logrotate
+++ b/debian/mariadb-galera-server-5.5.mysql-server.logrotate
@@@ -1,27 -1,0 +1,27 @@@
 +# - I put everything in one block and added sharedscripts, so that mysql gets 
 +#   flush-logs'd only once.
 +#   Else the binary logs would automatically increase by n times every day.
 +# - The error log is obsolete, messages go to syslog now.
- /var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mysql-slow.log {
++/var/log/mysql.log /var/log/mysql/mysql.log /var/log/mysql/mariadb-slow.log {
 +	daily
 +	rotate 7
 +	missingok
 +	create 640 mysql adm
 +	compress
 +	sharedscripts
 +	postrotate
 +		test -x /usr/bin/mysqladmin || exit 0
 +
 +		# If this fails, check debian.conf! 
 +		MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
 +		if [ -z "`$MYADMIN ping 2>/dev/null`" ]; then
 +		  # Really no mysqld or rather a missing debian-sys-maint user?
 +		  # If this occurs and is not a error please report a bug.
 +		  if ps cax | grep -q mysqld; then
 + 		    exit 1
 +		  fi 
 +		else
 +		  $MYADMIN flush-logs
 +		fi
 +	endscript
 +}
diff --cc mysql-test/suite/innodb/r/innodb-autoinc.result
index 4617db0,2ea6869..24a4558
--- a/mysql-test/suite/innodb/r/innodb-autoinc.result
+++ b/mysql-test/suite/innodb/r/innodb-autoinc.result
@@@ -583,9 -566,8 +583,9 @@@ SHOW VARIABLES LIKE "%auto_inc%"
  Variable_name	Value
  auto_increment_increment	65535
  auto_increment_offset	65535
 +wsrep_auto_increment_control	ON
  INSERT INTO t1 VALUES (NULL),(NULL);
- ERROR 22003: Out of range value for column 'c1' at row 1
+ ERROR HY000: Failed to read auto-increment value from storage engine
  SELECT * FROM t1;
  c1
  1
diff --cc storage/innobase/handler/ha_innodb.cc
index 0fce4e4,f2a2eec..8915849
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@@ -11513,28 -10456,12 +11524,25 @@@ ha_innobase::get_auto_increment
  
  		current = *first_value;
  
- 		/* If the increment step of the auto increment column
- 		decreases then it is not affecting the immediate
- 		next value in the series. */
- 		if (prebuilt->autoinc_increment > increment) {
+ 		if (prebuilt->autoinc_increment != increment) {
  
 +#ifdef WITH_WSREP
 +			WSREP_DEBUG("autoinc decrease: %llu -> %llu\n"
 +				    "THD: %ld, current: %llu, autoinc: %llu", 
 +				    prebuilt->autoinc_increment,
 +				    increment,
 +				    wsrep_thd_thread_id(ha_thd()),
 +				    current, autoinc);
 +			if (!wsrep_on(ha_thd()))
 +			{
 +#endif /* WITH_WSREP */
  			current = autoinc - prebuilt->autoinc_increment;
 +#ifdef WITH_WSREP
 +			}
 +#endif /* WITH_WSREP */
  
  			current = innobase_next_autoinc(
- 				current, 1, increment, 1, col_max_value);
+ 				current, 1, increment, offset, col_max_value);
  
  			dict_table_autoinc_initialize(prebuilt->table, current);
  
diff --cc storage/xtradb/handler/ha_innodb.cc
index 3ae440c,f3b9167..0834f4d
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@@ -12654,28 -11640,12 +12708,25 @@@ ha_innobase::get_auto_increment
  
  		current = *first_value;
  
- 		/* If the increment step of the auto increment column
- 		decreases then it is not affecting the immediate
- 		next value in the series. */
- 		if (prebuilt->autoinc_increment > increment) {
+ 		if (prebuilt->autoinc_increment != increment) {
  
 +#ifdef WITH_WSREP
 +			WSREP_DEBUG("autoinc decrease: %llu -> %llu\n"
 +				    "THD: %ld, current: %llu, autoinc: %llu", 
 +				    prebuilt->autoinc_increment,
 +				    increment,
 +				    wsrep_thd_thread_id(ha_thd()),
 +				    current, autoinc);
 +			if (!wsrep_on(ha_thd()))
 +			{
 +#endif /* WITH_WSREP */
  			current = autoinc - prebuilt->autoinc_increment;
 +#ifdef WITH_WSREP
 +			}
 +#endif /* WITH_WSREP */
  
  			current = innobase_next_autoinc(
- 				current, 1, increment, 1, col_max_value);
+ 				current, 1, increment, offset, col_max_value);
  
  			dict_table_autoinc_initialize(prebuilt->table, current);
  


More information about the commits mailing list