Imported debian*/ from 5.5.40-0ubuntu0.14.10.1

debian/patches/44_scripts__mysql_config__libs.diff

-## 99-unnamed.dpatch by  <ch@debian.org>
-## DP: Removes unnecessary library dependencies. See #390692
+Author: Christian Hammers <ch@debian.org>
+Description: Removes unnecessary library dependencies. See #390692
+
 --- old/scripts/mysql_config.sh	2014-04-17 22:07:38.668960760 +0300
 +++ new/scripts/mysql_config.sh	2014-04-17 22:08:33.528958126 +0300
 @@ -107,10 +107,10 @@

debian/patches/75_man_syntax_fixes.diff

+Author: Colin Watson <cjwatson@debian.org>
+Description: Fix man page syntax to make package Lintian clean
+
+--- a/man/mysqldump.1
++++ b/man/mysqldump.1
+@@ -2041,12 +2041,12 @@ T}
+ T{
+ \'\' (\fIempty string\fR)
+ T}:T{
+-<field name="\fIcolumn_name\fR"></field>
++<field name="\fIcolumn_name\fR">\:</field>
+ T}
+ T{
+ \'NULL\' (\fIstring value\fR)
+ T}:T{
+-<field name="\fIcolumn_name\fR">NULL</field>
++<field name="\fIcolumn_name\fR">\:NULL</field>
+ T}
+ .TE
+ .sp 1

debian/patches/82_extend_default_test_timeout_for_tokudb.diff

+Author: Otto Kekäläinen <otto@seravo.fi>
+Description: Extend timeout as some Debian pbuilder/sbuilder chroots may be very slow to run these
+
 --- old/mysql-test/CMakeLists.txt	2014-02-12 17:55:23.469136898 +0200
 +++ new/mysql-test/CMakeLists.txt	2014-02-12 17:54:07.471406742 +0200
 @@ -64,7 +64,7 @@

debian/patches/90_spelling.diff

+Author: Otto Kekäläinen <otto@seravo.fi>
+Description: Fix spelling of preceding, specified, received, additionally
+
+--- a/include/mysql_com.h
++++ b/include/mysql_com.h
+@@ -110,7 +110,7 @@ enum enum_server_command
+ #define MYSQL_TYPE_VIRTUAL 245
+ /*
+   Length of random string sent by server on handshake; this is also length of
+-  obfuscated password, recieved from client
++  obfuscated password, received from client
+ */
+ #define SCRAMBLE_LENGTH 20
+ #define SCRAMBLE_LENGTH_323 8
+--- a/man/mysql-test-run.pl.1
++++ b/man/mysql-test-run.pl.1
+@@ -332,7 +332,7 @@ is defined so that
+ can invoke itself with
+ exec $MYSQL_TEST\&.
+ .PP
+-Other tests may refer to the last three variables listed in the preceeding table, to locate files to read or write\&. For example, tests that need to create files will typically put them in
++Other tests may refer to the last three variables listed in the preceding table, to locate files to read or write\&. For example, tests that need to create files will typically put them in
+ $MYSQL_TMP_DIR/\fIfile_name\fR\&.
+ .PP
+ If you are running
+--- a/man/mysqldump.1
++++ b/man/mysqldump.1
+@@ -1261,7 +1261,7 @@ to point the slave to the correct master server host\&. Add any such parameters
+ .\" max-allowed-packet option: mysqldump
+ \fB\-\-max\-allowed\-packet=\fR\fB\fIlength\fR\fR
+ .sp
+-Sets the maximum packet length to send to or recieve from server\&.
++Sets the maximum packet length to send to or receive from server\&.
+ .RE
+ .sp
+ .RS 4
+--- a/mysql-test/mysql-test-run.pl
++++ b/mysql-test/mysql-test-run.pl
+@@ -6489,7 +6489,7 @@ Misc options
+   start-dirty           Only start the servers (without initialization) for
+                         the first specified test case
+   user-args             In combination with start* and no test name, drops
+-                        arguments to mysqld except those speficied with
++                        arguments to mysqld except those specified with
+                         --mysqld (if any)
+   wait-all              If --start or --start-dirty option is used, wait for all
+                         servers to exit before finishing the process
+--- a/mysql-test/r/mysqld--help.result
++++ b/mysql-test/r/mysqld--help.result
+@@ -613,7 +613,7 @@ The following options may be given as the first argument:
+  --relay-log-space-limit=# 
+  Maximum space to use for all relay logs
+  --replicate-annotate-row-events 
+- Tells the slave to write annotate rows events recieved
++ Tells the slave to write annotate rows events received
+  from the master to its own binary log. Ignored if
+  log_slave_updates is not set
+  --replicate-do-db=name 
+--- a/mysql-test/r/ps.result
++++ b/mysql-test/r/ps.result
+@@ -613,8 +613,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),
+ ("4", "1", "sup", "0");
+ create table t3 (
+ id int(11) not null default '0',
+-preceeding_id int(11) not null default '0',
+-primary key  (id,preceeding_id)
++preceding_id int(11) not null default '0',
++primary key  (id,preceding_id)
+ );
+ create table t4 (
+ user_id varchar(50) not null,
+@@ -625,7 +625,7 @@ insert into t4 values("nicke", "imp");
+ prepare stmt from
+ 'select distinct t1.partner_id
+ from t1 left join t3 on t1.id = t3.id
+-     left join t1 pp on pp.id = t3.preceeding_id
++     left join t1 pp on pp.id = t3.preceding_id
+ where
+   exists (
+     select *
+--- a/mysql-test/r/subselect_sj.result
++++ b/mysql-test/r/subselect_sj.result
+@@ -1007,8 +1007,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),
+ ("4", "1", "sup", "0");
+ create table t3 (
+ id int(11) not null default '0',
+-preceeding_id int(11) not null default '0',
+-primary key  (id,preceeding_id)
++preceding_id int(11) not null default '0',
++primary key  (id,preceding_id)
+ );
+ create table t4 (
+ user_id varchar(50) not null,
+--- a/mysql-test/r/subselect_sj_jcl6.result
++++ b/mysql-test/r/subselect_sj_jcl6.result
+@@ -1020,8 +1020,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),
+ ("4", "1", "sup", "0");
+ create table t3 (
+ id int(11) not null default '0',
+-preceeding_id int(11) not null default '0',
+-primary key  (id,preceeding_id)
++preceding_id int(11) not null default '0',
++primary key  (id,preceding_id)
+ );
+ create table t4 (
+ user_id varchar(50) not null,
+--- a/mysql-test/t/ps.test
++++ b/mysql-test/t/ps.test
+@@ -677,8 +677,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),
+ 
+ create table t3 (
+   id int(11) not null default '0',
+-  preceeding_id int(11) not null default '0',
+-  primary key  (id,preceeding_id)
++  preceding_id int(11) not null default '0',
++  primary key  (id,preceding_id)
+ );
+ 
+ create table t4 (
+@@ -692,7 +692,7 @@ insert into t4 values("nicke", "imp");
+ prepare stmt from
+ 'select distinct t1.partner_id
+ from t1 left join t3 on t1.id = t3.id
+-     left join t1 pp on pp.id = t3.preceeding_id
++     left join t1 pp on pp.id = t3.preceding_id
+ where
+   exists (
+     select *
+--- a/mysql-test/t/subselect_sj.test
++++ b/mysql-test/t/subselect_sj.test
+@@ -897,8 +897,8 @@ insert into t2 values ("1", "1", "sup", "0"), ("2", "1", "sup", "1"),
+                       ("4", "1", "sup", "0");
+ create table t3 (
+   id int(11) not null default '0',
+-  preceeding_id int(11) not null default '0',
+-  primary key  (id,preceeding_id)
++  preceding_id int(11) not null default '0',
++  primary key  (id,preceding_id)
+ );
+ 
+ create table t4 (
+--- a/sql/handler.h
++++ b/sql/handler.h
+@@ -1270,7 +1270,7 @@ typedef struct st_ha_create_information
+     For ALTER TABLE defaults to ROW_TYPE_NOT_USED (means "keep the current").
+ 
+     Can be changed either explicitly by the parser.
+-    If nothing speficied inherits the value of the original table (if present).
++    If nothing specified inherits the value of the original table (if present).
+   */
+   enum row_type row_type;
+   uint null_bits;                       /* NULL bits at start of record */
+--- a/sql/log_event.h
++++ b/sql/log_event.h
+@@ -1860,7 +1860,7 @@ public:
+   bool is_valid() const { return query != 0; }
+ 
+   /*
+-    Returns number of bytes additionaly written to post header by derived
++    Returns number of bytes additionally written to post header by derived
+     events (so far it is only Execute_load_query event).
+   */
+   virtual ulong get_post_header_size_for_derived() { return 0; }
+--- a/sql/password.c
++++ b/sql/password.c
+@@ -425,7 +425,7 @@ void make_scrambled_password(char *to, const char *password)
+ 
+ /*
+     Produce an obscure octet sequence from password and random
+-    string, recieved from the server. This sequence corresponds to the
++    string, received from the server. This sequence corresponds to the
+     password, but password can not be easily restored from it. The sequence
+     is then sent to the server for validation. Trailing zero is not stored
+     in the buf as it is not needed.
+@@ -467,7 +467,7 @@ scramble(char *to, const char *message, const char *password)
+ 
+ /*
+     Check that scrambled message corresponds to the password; the function
+-    is used by server to check that recieved reply is authentic.
++    is used by server to check that received reply is authentic.
+     This function does not check lengths of given strings: message must be
+     null-terminated, reply and hash_stage2 must be at least SHA1_HASH_SIZE
+     long (if not, something fishy is going on).
+--- a/sql/rpl_utility.cc
++++ b/sql/rpl_utility.cc
+@@ -1157,7 +1157,7 @@ bool Deferred_log_events::execute(Relay_log_info *rli)
+ void Deferred_log_events::rewind()
+ {
+   /*
+-    Reset preceeding Query log event events which execution was
++    Reset preceding Query log event events which execution was
+     deferred because of slave side filtering.
+   */
+   if (!is_empty())
+--- a/sql/slave.cc
++++ b/sql/slave.cc
+@@ -3524,7 +3524,7 @@ pthread_handler_t handle_slave_sql(void *arg)
+   set_thd_in_use_temporary_tables(rli);   // (re)set sql_thd in use for saved temp tables
+   /*
+     binlog_annotate_row_events must be TRUE only after an Annotate_rows event
+-    has been recieved and only till the last corresponding rbr event has been
++    has been received and only till the last corresponding rbr event has been
+     applied. In all other cases it must be FALSE.
+   */
+   thd->variables.binlog_annotate_row_events= 0;
+--- a/sql/sql_connect.cc
++++ b/sql/sql_connect.cc
+@@ -704,7 +704,7 @@ static void update_global_user_stats_with_user(THD *thd,
+   user_stats->cpu_time+=   (thd->status_var.cpu_time -
+                             thd->org_status_var.cpu_time); 
+   /*
+-    This is handle specially as bytes_recieved is incremented BEFORE
++    This is handle specially as bytes_received is incremented BEFORE
+     org_status_var is copied.
+   */
+   user_stats->bytes_received+= (thd->org_status_var.bytes_received-
+--- a/sql/sql_prepare.cc
++++ b/sql/sql_prepare.cc
+@@ -74,7 +74,7 @@ When one supplies long data for a placeholder:
+ 
+   - Server gets the long data in pieces with command type
+     'COM_STMT_SEND_LONG_DATA'.
+-  - The packet recieved will have the format as:
++  - The packet received will have the format as:
+     [COM_STMT_SEND_LONG_DATA:1][STMT_ID:4][parameter_number:2][data]
+   - data from the packet is appended to the long data value buffer for this
+     placeholder.
+--- a/sql/sql_select.cc
++++ b/sql/sql_select.cc
+@@ -20444,7 +20444,7 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
+     Item *view_ref= NULL;
+     /*
+       If we have found field not by its alias in select list but by its
+-      original field name, we should additionaly check if we have conflict
++      original field name, we should additionally check if we have conflict
+       for this name (in case if we would perform lookup in all tables).
+     */
+     if (resolution == RESOLVED_BEHIND_ALIAS && !order_item->fixed &&
+@@ -21467,7 +21467,7 @@ change_to_use_tmp_fields(THD *thd, Item **ref_pointer_array,
+          We are replacing the argument of Item_func_set_user_var after its value
+          has been read.  The argument's null_value should be set by now, so we
+          must set it explicitly for the replacement argument since the null_value
+-         may be read without any preceeding call to val_*().
++         may be read without any preceding call to val_*().
+         */
+         new_field->update_null_value();
+         List<Item> list;
+--- a/sql/sys_vars.cc
++++ b/sql/sys_vars.cc
+@@ -3817,7 +3817,7 @@ static Sys_var_mybool Sys_binlog_annotate_row_events(
+ #ifdef HAVE_REPLICATION
+ static Sys_var_mybool Sys_replicate_annotate_row_events(
+        "replicate_annotate_row_events",
+-       "Tells the slave to write annotate rows events recieved from the master "
++       "Tells the slave to write annotate rows events received from the master "
+        "to its own binary log. Ignored if log_slave_updates is not set",
+        READ_ONLY GLOBAL_VAR(opt_replicate_annotate_row_events),
+        CMD_LINE(OPT_ARG), DEFAULT(0));
+--- a/sql/tztime.cc
++++ b/sql/tztime.cc
+@@ -2032,7 +2032,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
+ 
+   /*
+     At last we are doing the same thing for records in
+-    mysql.time_zone_transition table. Here we additionaly need records
++    mysql.time_zone_transition table. Here we additionally need records
+     in ascending order by index scan also satisfies us.
+   */
+   table= tz_tables->table; 
+--- a/storage/maria/ma_rnext.c
++++ b/storage/maria/ma_rnext.c
+@@ -71,7 +71,7 @@ int maria_rnext(MARIA_HA *info, uchar *buf, int inx)
+       Normally SQL layer would never request "search next" if
+       "search first" failed. But HANDLER may do anything.
+ 
+-      As mi_rnext() without preceeding mi_rkey()/mi_rfirst()
++      As mi_rnext() without preceding mi_rkey()/mi_rfirst()
+       equals to mi_rfirst(), we must restore original state
+       as if failing mi_rfirst() was not called.
+     */
+--- a/storage/ndb/include/ndbapi/NdbEventOperation.hpp
++++ b/storage/ndb/include/ndbapi/NdbEventOperation.hpp
+@@ -63,7 +63,7 @@ class NdbEventOperationImpl;
+  * - Event code does not check table schema version. Make sure to drop events
+  * after table is dropped. Will be fixed in later
+  * versions.
+- * - If a node failure has occured not all events will be recieved
++ * - If a node failure has occured not all events will be received
+  * anymore. Drop NdbEventOperation and Create again after nodes are up
+  * again. Will be fixed in later versions.
+  *
+--- a/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
++++ b/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
+@@ -163,7 +163,7 @@ namespace NDB_CPC.telnetclient
+ 				}
+ 				else
+ 				{
+-					// If no data was recieved then the connection is probably dead
++					// If no data was received then the connection is probably dead
+ 					Console.WriteLine( "Disconnected", sock.RemoteEndPoint );
+ 					sock.Shutdown( SocketShutdown.Both );
+ 					sock.Close();
+--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
++++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+@@ -10559,7 +10559,7 @@ void Dbtc::releaseAbortResources(Signal* signal)
+ 
+   // MASV let state be CS_ABORTING until all 
+   // signals in the "air" have been received. Reset to CS_CONNECTED
+-  // will be done when a TCKEYREQ with start flag is recieved
++  // will be done when a TCKEYREQ with start flag is received
+   // or releaseApiCon is called
+   // apiConnectptr.p->apiConnectstate = CS_CONNECTED;
+   apiConnectptr.p->apiConnectstate = CS_ABORTING;
+--- a/storage/ndb/src/mgmsrv/MgmtSrvr.hpp
++++ b/storage/ndb/src/mgmsrv/MgmtSrvr.hpp
+@@ -526,7 +526,7 @@ private:
+   //  we signal with a condition variable to the waiting
+   //  thread (receiveOptimisedResponse) that the signal has arrived.
+   // Parameters:
+-  //  signal: The recieved signal
++  //  signal: The received signal
+   // Returns: -
+   //**************************************************************************
+ 
+--- a/storage/ndb/test/ndbapi/testDict.cpp
++++ b/storage/ndb/test/ndbapi/testDict.cpp
+@@ -942,7 +942,7 @@ int runStoreFrm(NDBT_Context* ctx, NDBT_Step* step){
+     
+     // Verfiy the frm data
+     if (memcmp(pData, pData2, resultLen) != 0){
+-      g_err << "Wrong data recieved" << endl;
++      g_err << "Wrong data received" << endl;
+       for (size_t i = 0; i < dataLen; i++){
+ 	unsigned char c = ((unsigned char*)pData2)[i];
+ 	g_err << hex << c << ", ";
+--- a/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
++++ b/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
+@@ -42,7 +42,7 @@ void ColAtt_DisplayError(SQLSMALLINT ColAtt_HandleType,
+  * Test returning descriptor information
+  *
+  * Tests:
+- * -# Call SQLColAttribute, without preceeding SQLPrepare
++ * -# Call SQLColAttribute, without preceding SQLPrepare
+  * -# ???
+  * 
+  * @return Zero, if test succeeded
+--- a/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
++++ b/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
+@@ -42,7 +42,7 @@ void ColAtt_DisplayErrorTest2(SQLSMALLINT ColAttTest2_HandleType,
+  * Test returning descriptor information
+  *
+  * Test:
+- * -# Call SQLColAttribute without preceeding SQLExecute
++ * -# Call SQLColAttribute without preceding SQLExecute
+  * -# Let TYPE is 'ITEM' in Table 20, FieldIdentifer is zero
+  * -# Let TYPE is 'ITEM' in Table 20, ColumnNumber is less than one
+  * -# FieldIdentifer is not one of the code valuess in Table 20
+--- a/storage/xtradb/fil/fil0fil.c
++++ b/storage/xtradb/fil/fil0fil.c
+@@ -3946,7 +3946,7 @@ func_exit:
+ 		page_no = dict_index_get_page(index);
+ 		ut_a(page_no == 3);
+ 
+-		fprintf(stderr, "InnoDB: It is compressed .ibd file. need to convert additionaly on buffer pool.\n");
++		fprintf(stderr, "InnoDB: It is compressed .ibd file. need to convert additionally on buffer pool.\n");
+ 
+ 		/* down to leaf */
+ 		mtr_start(&mtr);

debian/patches/99_remove_rename_mariadb-server_files_in.diff

-## DP: Remove hackish upstream manipulation of debian/* contents
+Author: Otto Kekäläinen <otto@seravo.fi>
+Description: Remove upstream debian/* handling that is obsolete
 
 --- old/CMakeLists.txt	2014-01-29 20:55:56.499842093 +0200
 +++ new/CMakeLists.txt	2014-01-31 17:12:27.633594128 +0200

debian/patches/series

@@ -4,5 +4,7 @@
 44_scripts__mysql_config__libs.diff
 50_mysql-test__db_test.diff
 61_replace_dash_with_bash_mbug675185.diff
+75_man_syntax_fixes.diff
 82_extend_default_test_timeout_for_tokudb.diff
+90_spelling.diff
 99_remove_rename_mariadb-server_files_in.diff

debian/po/it.po

-# Italian (it) translation of debconf templates for mysql-dfsg-5.1
-# Copyright (C) 2009 Software in the Public Interest
-# This file is distributed under the same license as the mysql-dfsg-5.1 package.
-# Luca Monducci <luca.mo@tiscali.it>, 2006 - 2009.
+# Italian (it) translation of debconf templates for mariadb-5.5
+# This file is distributed under the same license as the mariadb-5.5 package.
+# Luca Monducci <luca.mo@tiscali.it>, 2006-2014.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n"
+"Project-Id-Version: mariadb-5.5 5.5.39 italian debconf templates\n"
 "Report-Msgid-Bugs-To: mariadb-5.5@packages.debian.org\n"
 "POT-Creation-Date: 2013-09-09 12:48+0300\n"
-"PO-Revision-Date: 2009-08-08 11:03+0200\n"
+"PO-Revision-Date: 2014-08-30 18:35+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
 "Language: it\n"
@@ -46,8 +45,8 @@ msgid ""
 "There is no guarantee that the version you're currently installing will be "
 "able to use the current databases."
 msgstr ""
-"Non è garantito che la versione che si sta installando sia in grado di usare "
-"i database presenti."
+"Non è garantito che la versione che sta per essere installata sia in grado "
+"di usare i database presenti."
 
 #. Type: note
 #. Description
@@ -62,8 +61,8 @@ msgid ""
 "Using MariaDB under NIS/YP requires a mysql user account to be added on the "
 "local system with:"
 msgstr ""
-"Per usare MariaDB con NIS/YP è necessario aggiungere al sistema locale un "
-"account utente per mysql con:"
+"Per usare MariaDB con NIS/YP è necessario aggiungere al sistema un account "
+"utente locale con nome mysql con:"
 
 #. Type: note
 #. Description
@@ -72,8 +71,8 @@ msgid ""
 "You should also check the permissions and ownership of the /var/lib/mysql "
 "directory:"
 msgstr ""
-"Inoltre si devono verificare i permessi e la proprietà della directory /var/"
-"lib/mysql:"
+"Inoltre è opportuno verificare i permessi e la proprietà della directory /"
+"var/lib/mysql:"
 
 #. Type: boolean
 #. Description
@@ -88,8 +87,8 @@ msgid ""
 "The /var/lib/mysql directory which contains the MariaDB databases is about "
 "to be removed."
 msgstr ""
-"La directory /var/lib/mysql contenente i database di MariaDB sta per essere "
-"eliminata."
+"La directory /var/lib/mysql che contiene i database di MariaDB sta per "
+"essere eliminata."
 
 #. Type: boolean
 #. Description
@@ -116,7 +115,7 @@ msgid ""
 "While not mandatory, it is highly recommended that you set a password for "
 "the MariaDB administrative \"root\" user."
 msgstr ""
-"Sebbene non sia obbligatoria, si raccomanda d'impostare una password per "
+"Anche se non è obbligatorio, si raccomanda d'impostare una password per "
 "l'utente d'amministrazione «root» di MariaDB."
 
 #. Type: password
@@ -160,15 +159,11 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../mariadb-server-5.5.templates:7001
-#, fuzzy
-#| msgid ""
-#| "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for "
-#| "more information."
 msgid ""
 "Please read the /usr/share/doc/mariadb-server-5.5/README.Debian file for "
 "more information."
 msgstr ""
-"Per maggiori informazioni si consulti il file /usr/share/doc/mariadb-"
+"Per maggiori informazioni consultare il file /usr/share/doc/mariadb-"
 "server-5.5/README.Debian."
 
 #. Type: error
@@ -187,7 +182,7 @@ msgstr "Le due password inserite sono diverse. Riprovare."
 #. Description
 #: ../mariadb-server-5.5.templates:9001
 msgid "NDB Cluster seems to be in use"
-msgstr "È in uso un cluster NDB"
+msgstr "È in uso NDB Cluster"
 
 #. Type: error
 #. Description
@@ -197,15 +192,15 @@ msgid ""
 "mysql-cluster package and remove all lines starting with \"ndb\" from all "
 "config files below /etc/mysql/."
 msgstr ""
-"MySQL-5.1 non fornisce più il supporto per i cluster NDB. Si dovrebbe "
-"migrare al nuovo pacchetto mysql-cluster e rimuovere tutte le righe che "
-"iniziano per \"ndb\" da tutti i file di configurazione sotto /etc/mysql/."
+"MySQL-5.1 non fornisce più il supporto per NDB Cluster. Migrare al nuovo "
+"pacchetto mysql-cluster e rimuovere tutte le righe che iniziano per \"ndb\" "
+"da ogni file di configurazione sotto /etc/mysql/."
 
 #. Type: boolean
 #. Description
 #: ../mariadb-server-5.5.templates:10001
 msgid "Really migrate to MariaDB?"
-msgstr ""
+msgstr "Migrare a MariaDB?"
 
 #. Type: boolean
 #. Description
@@ -214,6 +209,8 @@ msgid ""
 "MariaDB is a drop-in replacement for MySQL. It will use your current "
 "configuration file (my.cnf) and current databases."
 msgstr ""
+"MariaDB è un perfetto sostituto per MySQL. Utilizzerà l'attuale file di "
+"configurazione (my.cnf) e i database presenti."
 
 #. Type: boolean
 #. Description
@@ -223,13 +220,6 @@ msgid ""
 "and thus migration back to MySQL might not always work, at least not as "
 "automatically as migrating from MySQL to MariaDB."
 msgstr ""
-
-#~ msgid "Start the MariaDB server on boot?"
-#~ msgstr "Lanciare il server MariaDB all'avvio?"
-
-#~ msgid ""
-#~ "The MariaDB server can be launched automatically at boot time or manually "
-#~ "with the '/etc/init.d/mysql start' command."
-#~ msgstr ""
-#~ "Il server MariaDB può essere lanciato automaticamente all'avvio del "
-#~ "sistema oppure manualmente con il comando «/etc/init.d/mysql start»."
+"Notare che MariaDB dispone di alcune funzionalità avanzate che non esistono "
+"in MySQL, di conseguenza non sempre funziona la migrazione all'indietro "
+"verso MySQL, o almeno non è automatica come la migrazione da MySQL a MariaDB."

debian/rules

@@ -16,6 +16,11 @@ ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
     TAOCRYPT_OPT="-DTAOCRYPT_DISABLE_X86ASM"
 endif
 
+# Disable TokuDB due to failing test suite
+# TokuDB is disabled in Trusty and can very well 
+# be disabled in Utopic too
+TOKUDB_OPT:=-DWITHOUT_TOKUDB=true
+
 export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc
 export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++
 
@@ -29,6 +34,22 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DISTRIBUTION := $(shell lsb_release -i -s)
 RELEASE := $(shell lsb_release -r -s)
 
+# Parallel build support as adviced
+# at https://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules-options
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    # Placeholder code to implement max cpu count value checking
+    # if [$(NUMJOBS) > $(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)]
+    #  then NUMJOBS = 0
+    # fi
+    MAKEFLAGS += -j $(NUMJOBS)
+endif
+
+# Add support for verbose builds
+ifneq (,$(filter verbose,$(DEB_BUILD_OPTIONS)))
+    MAKEFLAGS += VERBOSE=1
+endif
+
 MAKE_TEST_TARGET:=test-force
 ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),)
 # make test-bt is the testsuite run by the MySQL build team
@@ -62,19 +83,22 @@ override_dh_auto_clean:
 	dh_testroot
 	[ ! -d mysql-test/var ] || rm -rf mysql-test/var
 	rm -rf $(BUILDDIR)
-	debconf-updatepo
-
-override_dh_auto_configure: configure-stamp
+	debconf-updatepo # Update po-files when clean runs before each build
 
 override_dh_prep:
         # Don't clean /tmp/ away, it is needed by all binary packages
 
-# We explicitly set -DINSTALL_SUPPORTFILESDIR as it is incorrect in upstream
-# sources (will be fixed in 5.5.30).
-configure-stamp:
+override_dh_auto_configure:
 	@echo "RULES.$@"
 	dh_testdir
 	
+	# Versioned symbols are only available on Linux.
+	# Remove symbols file on kFreeBSD builds so that
+	# dpkg-gensymbols will not fail the build.
+ifneq (,$(filter $(ARCH), kfreebsd-i386 kfreebsd-amd64))
+	rm debian/libmariadbclient18.symbols
+endif
+	
 	# Rename shared libraries SONAME and filenames
 	# libmysqlclient18.so > libmariadbclient18.so etc
 	sed -i 's/mysqlclient/mariadbclient/g' client/CMakeLists.txt tests/CMakeLists.txt scripts/CMakeLists.txt
@@ -86,56 +110,45 @@ configure-stamp:
 	# Neither does RPM packaging related files or comments in other code need sedding.
 	
 	( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
-	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
+	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/usr/local/bin:/usr/bin:/bin"} \
 	    	CC=$${MYSQL_BUILD_CC:-gcc} \
 		CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -DBIG_JOINS=1 -fno-strict-aliasing ${TAOCRYPT_OPT}"} \
 	    	CXX=$${MYSQL_BUILD_CXX:-g++} \
 	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti -fno-strict-aliasing ${TAOCRYPT_OPT}"} \
 	    cmake -DCMAKE_INSTALL_PREFIX=/usr \
-		$(USE_STATIC_MYSQLD) \
+	    $(USE_STATIC_MYSQLD) \
+	    -$(MAKEFLAGS) \
+	    $(TOKUDB_OPT) \
 	    -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
 	    -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
 	    -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" \
-	    -DWITHOUT_TOKUDB=true \
 	    -DBUILD_CONFIG=mysql_release \
 	    -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
 	    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
-	    -DINSTALL_SUPPORTFILESDIR=share/mysql \
 		-DDEB=1 ..'
 	touch $@
 
-# Disable TokuDB above due to
-# * i386 does not work and CMakeLists.txt check for processor does not detect
-#   correct ARCH in chroot
-# * Build errors in Trusty: https://mariadb.atlassian.net/browse/MDEV-5618
-# * There was ugly code in CMakeLists.txt that touched stuff in debian/*
-#   that needs to be re-written
-
-override_dh_auto_build: build-stamp
-
-build-stamp:
+# This is needed, otherwise 'make test' will run before binaries have been built
+override_dh_auto_build:
 	@echo "RULES.$@"
-	cd $(builddir) && $(MAKE) $(AM_EXTRA_MAKEFLAGS)
+	cd $(builddir) && $(MAKE)
 	touch $@
 
 override_dh_auto_test:
 	@echo "RULES.$@"
-ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ;
 endif
 
-override_dh_auto_install: auto_install-stamp
-
-auto_install-stamp:
+override_dh_auto_install:
 	@echo "RULES.$@"
 	dh_testdir
 	dh_testroot
 	
-	# some self written manpages which hopefully
-	# gets overwritten sooner or later with upstreams
-	mkdir -p $(TMP)/usr/share/man/man1/
-	mkdir -p $(TMP)/usr/share/man/man8/
-	cp debian/additions/*.1 $(TMP)/usr/share/man/man1/
+	# If TokuDB plugin was built
+	# add it to the server install list.
+	[ ! -f $(BUILDDIR)/usr/lib/mysql/plugin/ha_tokudb.so ] || echo 'usr/lib/mysql/plugin/ha_tokudb.so\netc/mysql/conf.d/tokudb.cnf\nusr/bin/tokuftdump\nusr/share/doc/mariadb-server-5.5/README-TOKUDB\nusr/share/doc/mariadb-server-5.5/README.md' >> debian/mariadb-server-5.5.install
+	
 	mkdir -p $(TMP)/etc/mysql/conf.d/
 	cp debian/additions/mysqld_safe_syslog.cnf $(TMP)/etc/mysql/conf.d/
 	
@@ -159,11 +172,6 @@ auto_install-stamp:
 	install -d $(TMP)/etc/mysql/conf.d
 	install -m 0644 debian/additions/mariadb.cnf $(TMP)/etc/mysql/conf.d/mariadb.cnf
 	
-	# mariadb-client
-	install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/
-	install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/
-	install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/
-	
 	# mariadb-server
 	rm -vf $(TMP)/usr/share/mysql/mi_test_all* \
 	       $(TMP)/usr/share/mysql/mysql-log-rotate \
@@ -180,6 +188,12 @@ auto_install-stamp:
 	install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_SRC
 	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_BIN
 	
+	# install AppArmor profile
+	install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld
+	
+	# install Apport hook
+	install -D -m 644 debian/mariadb-server-5.5.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-5.5.py
+	
 	# mariadb-test
 	mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql
 	touch $@
@@ -195,14 +209,6 @@ override_dh_installinit-arch:
 override_dh_installcron-arch:
 	dh_installcron --name mysql-server
 
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
-
-binary:	binary-indep binary-arch
-
-get-orig-source:
-	uscan --force-download --verbose
-
 %:
 	dh $@ --parallel
 

debian/source.lintian-overrides

+# The mysql-server-5.6.postrm script handles
+# what debhelper normally would.
+# This is apparently related to #526464.
 maintainer-script-lacks-debhelper-token debian/mariadb-server-5.5.postrm
+# File is multi-licensed, and thus should be OK for Debian
+license-problem-non-free-RFC include/sha1.h
+license-problem-non-free-RFC mysys/sha1.c

debian/upstream/signing-key.asc

+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQGiBEtohJARBACxvZpWSIMTp/e7BUzSW+WDL7Pl0JDg6v7ZJFGJk9qo+5JXIiis
+497Ul0FmVJ6EoyVzfpqe5FyUvqtLCkM6UP5adyvXTHi1KMiYacu2q5yRhDpMKbpM
+LkAg23Yyz1yK/d0TsAkerLJ6K1Bh8NIm44Op+qFrDxeYZDIR5Q8WaCdK8wCg/jc8
+p/4XaKq74ghUHEX+35qk63UD/0YEsgHrsRQZ42wKNeO8ZUJKqCVHXYJrCq7DhRhn
+U5aYnuK3op0JusPN5fdIGkKwJy24dWRoRfNIIg0WvM8qUNrC2NvhomnZNudsI0Jb
+XapRemrIwbvrZToD6ei1awdVqa5fT6XIxV4MSQEwn47qmUNSz/0TkUmB3VZ2EL/j
+zfHUA/91ZfAdWCmRemTLWRrzIYYJKyEInZ0qwZVrkyMY8+T7b2/6RGR0f2oV1dOx
+cjbd0+N3vKrUkjuzkcVu/oB8wq9UBfuSHwsxYqub4gvIh0/LW+CsWa955sQ/Hj9H
+48j3nUHaXqM9uJyMMgMlCdo3rLpnYCJH8w2kFfLHIDksMs1YtLQ9TWFyaWFEQiBQ
+YWNrYWdlIFNpZ25pbmcgS2V5IDxwYWNrYWdlLXNpZ25pbmcta2V5QG1hcmlhZGIu
+b3JnPohiBBMRAgAiBQJREUepAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
+CRDLywgqG7lD28y4AJ0aByfYvJWqBm5PZjusZiG0vo9SRwCeM0izj/oryMu0fJi3
+kRbTlojzCd20Q0RhbmllbCBCYXJ0aG9sb21ldyAoTW9udHkgUHJvZ3JhbSBzaWdu
+aW5nIGtleSkgPGRiYXJ0QGFza21vbnR5Lm9yZz6IYAQTEQIAIAUCS2iEkAIbAwYL
+CQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEMvLCCobuUPboDgAoNQVrK4i5LXTgwnW
+ke2MxsXCoHDnAJ93j733YuNkV64aHEUwWxNCkkwUkQ==
+=WMk8
+-----END PGP PUBLIC KEY BLOCK-----

debian/watch

 version=3
-opts="uversionmangle=s/-(rc|beta)/$1/" \
-   ftp://ftp.osuosl.org/pub/mariadb/mariadb-5.5.([\d\.]*(?:-beta|-rc)?)/kvm-tarbake-jaunty-x86/mariadb-([\d\.]*(?:-beta|-rc)?).tar.gz \
-   debian uupdate
+opts=pgpsigurlmangle=s/$/.asc/ \
+ftp://ftp.ddg.lth.se/mariadb/mariadb-5.5.39/source/mariadb-5.5.([\d\.]*).tar.gz \
+debian uupdate
+
+# Simplified watch file still does not work
+#$ uscan --no-download --verbose --debug
+#uscan debug: requesting URL ftp://ftp.ddg.lth.se/mariadb/
+# ftp://ftp.ddg.lth.se/mariadb/mariadb-5.5.39/source/ failed: 400 FTP return code 000
 
 # Added string "-5.5." in path as MariaDB has release series 5.5 and 10.x in parallel,
 # and we want uscan to check for updates only in the 5-series.
+
+# Automated signature checking with pgpsigurlmangle has been available
+# only since devscripts version 2.13.3