Fix problems from 5.5 merge

* Update mysqld_safe script to remove duplicated parameter --crash-script * Make --core-file-size accept underscores as well as dashes correctly. * Add mysqld_safe_helper to Debian and Ubuntu files. * Update innodb minor version to 35

Author: cvicentiu

debian/dist/Debian/mariadb-server-10.0.files.in

@@ -38,6 +38,7 @@ usr/bin/mysql_zap
 usr/bin/mysqlbinlog
 usr/bin/mysqld_multi
 usr/bin/mysqld_safe
+usr/bin/mysqld_safe_helper
 usr/bin/mysqlhotcopy
 usr/bin/perror
 usr/bin/replace

debian/dist/Ubuntu/mariadb-server-10.0.files.in

@@ -40,6 +40,7 @@ usr/bin/mysql_zap
 usr/bin/mysqlbinlog
 usr/bin/mysqld_multi
 usr/bin/mysqld_safe
+usr/bin/mysqld_safe_helper
 usr/bin/mysqlhotcopy
 usr/bin/perror
 usr/bin/replace

scripts/mysqld_safe.sh

@@ -215,7 +215,6 @@ parse_arguments() {
  for arg do
  val=`echo "$arg" | sed -e "s;--[^=]*=;;"`
  case "$arg" in
- --crash[-_]script=*) CRASH_SCRIPT="$val" ;;
  # these get passed explicitly to mysqld
  --basedir=*) MY_BASEDIR_VERSION="$val" ;;
  --datadir=*|--data=*) DATADIR="$val" ;;
@@ -241,7 +240,7 @@ parse_arguments() {
  --socket=*) mysql_unix_port="$val" ;;
 
  # mysqld_safe-specific options - must be set in my.cnf ([mysqld_safe])!
- --core[-_]file-size=*) core_file_size="$val" ;;
+ --core[-_]file[-_]size=*) core_file_size="$val" ;;
  --ledir=*) check_executable_location "$arg" ; ledir="$val" ;;
  --malloc[-_]lib=*) check_executable_location "$arg"; set_malloc_lib "$val" ;;
  --crash[-_]script=*) check_executable_location "$arg"; crash_script="$val" ;;

storage/innobase/include/univ.i

@@ -44,7 +44,7 @@ Created 1/20/1994 Heikki Tuuri
 
 #define INNODB_VERSION_MAJOR5
 #define INNODB_VERSION_MINOR6
-#define INNODB_VERSION_BUGFIX33
+#define INNODB_VERSION_BUGFIX35
 
 /* The following is the InnoDB version as shown in
 SELECT plugin_version FROM information_schema.plugins;