From eb7c5530eccb7d6782077e5562f5a471d2ccbc01 Mon Sep 17 00:00:00 2001 From: Thirunarayanan Balathandayuthapani Date: Sat, 6 Mar 2021 05:55:14 +0530 Subject: [PATCH 1/9] MDEV-24730 Insert log operation fails after purge resets n_core_fields Online log for insert operation of redundant table fails with index->is_instant() assert. Purge can reset the n_core_fields when alter is waiting to upgrade MDL for commit phase of DDL. In the meantime, any insert DML tries to log the operation fails with index is not being instant. row_log_get_n_core_fields(): Get the n_core_fields of online log for the given index. rec_get_converted_size_comp_prefix_low(): Use n_core_fields of online log when InnoDB calculates the size of data tuple during redundant row format table rebuild. rec_convert_dtuple_to_rec_comp(): Use n_core_fields of online log when InnoDB does the conversion of data tuple to record during redudant row format table rebuild. - Adding the test case which has more than 129 instant columns. --- .../suite/innodb/r/instant_alter_debug.result | 10 ++- .../innodb/t/instant_alter_debug.combinations | 4 ++ .../suite/innodb/t/instant_alter_debug.test | 14 ++++- storage/innobase/include/rem0rec.h | 2 + storage/innobase/include/row0log.h | 5 ++ storage/innobase/rem/rem0rec.cc | 63 +++++++++++++------ storage/innobase/row/row0log.cc | 26 +++++--- storage/innobase/row/row0merge.cc | 6 +- 8 files changed, 94 insertions(+), 36 deletions(-) create mode 100644 mysql-test/suite/innodb/t/instant_alter_debug.combinations diff --git a/mysql-test/suite/innodb/r/instant_alter_debug.result b/mysql-test/suite/innodb/r/instant_alter_debug.result index 230097f47c7..fb298a84efa 100644 --- a/mysql-test/suite/innodb/r/instant_alter_debug.result +++ b/mysql-test/suite/innodb/r/instant_alter_debug.result @@ -190,6 +190,12 @@ SET DEBUG_SYNC='RESET'; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; INSERT INTO t1 SET a=0; ALTER TABLE t1 ADD COLUMN b INT NOT NULL DEFAULT 2, ADD COLUMN c INT; +BEGIN NOT ATOMIC +DECLARE c TEXT DEFAULT(SELECT CONCAT('ALTER TABLE t1 ADD (c', +GROUP_CONCAT(seq SEPARATOR ' INT, c'), ' INT), ALGORITHM=INSTANT;') FROM seq_1_to_130); +EXECUTE IMMEDIATE c; +END; +$$ connection stop_purge; START TRANSACTION WITH CONSISTENT SNAPSHOT; connection default; @@ -207,7 +213,7 @@ SET DEBUG_SYNC = 'now SIGNAL logged'; connection ddl; connection default; SET DEBUG_SYNC = RESET; -SELECT * FROM t1; +SELECT a, b, c FROM t1; a b c 1 2 NULL 2 3 4 @@ -231,7 +237,7 @@ ERROR 22004: Invalid use of NULL value disconnect ddl; connection default; SET DEBUG_SYNC = RESET; -SELECT * FROM t1; +SELECT a, b, c, d FROM t1; a b c d 1 2 NULL 1 2 3 4 1 diff --git a/mysql-test/suite/innodb/t/instant_alter_debug.combinations b/mysql-test/suite/innodb/t/instant_alter_debug.combinations new file mode 100644 index 00000000000..f3bc2cc0c25 --- /dev/null +++ b/mysql-test/suite/innodb/t/instant_alter_debug.combinations @@ -0,0 +1,4 @@ +[redundant] +innodb_default_row_format=redundant +[dynamic] +innodb_default_row_format=dynamic diff --git a/mysql-test/suite/innodb/t/instant_alter_debug.test b/mysql-test/suite/innodb/t/instant_alter_debug.test index a1b514f87ac..3d3bb7d3e57 100644 --- a/mysql-test/suite/innodb/t/instant_alter_debug.test +++ b/mysql-test/suite/innodb/t/instant_alter_debug.test @@ -1,6 +1,7 @@ --source include/have_innodb.inc --source include/have_debug.inc --source include/have_debug_sync.inc +--source include/have_sequence.inc SET @save_frequency= @@GLOBAL.innodb_purge_rseg_truncate_frequency; SET GLOBAL innodb_purge_rseg_truncate_frequency=1; @@ -212,6 +213,15 @@ CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; INSERT INTO t1 SET a=0; ALTER TABLE t1 ADD COLUMN b INT NOT NULL DEFAULT 2, ADD COLUMN c INT; +DELIMITER $$; +BEGIN NOT ATOMIC + DECLARE c TEXT DEFAULT(SELECT CONCAT('ALTER TABLE t1 ADD (c', + GROUP_CONCAT(seq SEPARATOR ' INT, c'), ' INT), ALGORITHM=INSTANT;') FROM seq_1_to_130); + EXECUTE IMMEDIATE c; +END; +$$ +DELIMITER ;$$ + connection stop_purge; START TRANSACTION WITH CONSISTENT SNAPSHOT; @@ -238,7 +248,7 @@ reap; connection default; SET DEBUG_SYNC = RESET; -SELECT * FROM t1; +SELECT a, b, c FROM t1; --echo # --echo # MDEV-15872 Crash in online ALTER TABLE...ADD PRIMARY KEY @@ -265,7 +275,7 @@ disconnect ddl; connection default; SET DEBUG_SYNC = RESET; -SELECT * FROM t1; +SELECT a, b, c, d FROM t1; DROP TABLE t1; --echo # diff --git a/storage/innobase/include/rem0rec.h b/storage/innobase/include/rem0rec.h index f88df8de25c..41980cde2c8 100644 --- a/storage/innobase/include/rem0rec.h +++ b/storage/innobase/include/rem0rec.h @@ -982,6 +982,7 @@ rec_copy( @param[out] extra record header size @param[in] status REC_STATUS_ORDINARY or REC_STATUS_COLUMNS_ADDED @return total size, in bytes */ +template ulint rec_get_converted_size_temp( const dict_index_t* index, @@ -1026,6 +1027,7 @@ rec_init_offsets_temp( @param[in] n_fields number of data fields @param[in] status REC_STATUS_ORDINARY or REC_STATUS_COLUMNS_ADDED */ +template void rec_convert_dtuple_to_temp( rec_t* rec, diff --git a/storage/innobase/include/row0log.h b/storage/innobase/include/row0log.h index 232019aee9f..1e1b31c2547 100644 --- a/storage/innobase/include/row0log.h +++ b/storage/innobase/include/row0log.h @@ -247,6 +247,11 @@ row_log_apply( ut_stage_alter_t* stage) MY_ATTRIBUTE((warn_unused_result)); +/** Get the n_core_fields of online log for the index +@param index index whose n_core_fields of log to be accessed +@return number of n_core_fields */ +unsigned row_log_get_n_core_fields(const dict_index_t *index); + #ifdef HAVE_PSI_STAGE_INTERFACE /** Estimate how much work is to be done by the log apply phase of an ALTER TABLE for this index. diff --git a/storage/innobase/rem/rem0rec.cc b/storage/innobase/rem/rem0rec.cc index 4faa90d3b13..c81e0031557 100644 --- a/storage/innobase/rem/rem0rec.cc +++ b/storage/innobase/rem/rem0rec.cc @@ -29,6 +29,7 @@ Created 5/30/1994 Heikki Tuuri #include "mtr0log.h" #include "fts0fts.h" #include "trx0sys.h" +#include "row0log.h" /* PHYSICAL RECORD (OLD STYLE) =========================== @@ -1044,6 +1045,7 @@ rec_get_nth_field_offs_old( /**********************************************************//** Determines the size of a data tuple prefix in ROW_FORMAT=COMPACT. @return total size */ +template MY_ATTRIBUTE((warn_unused_result, nonnull(1,2))) static inline ulint @@ -1068,16 +1070,19 @@ rec_get_converted_size_comp_prefix_low( ut_d(ulint n_null = index->n_nullable); ut_ad(status == REC_STATUS_ORDINARY || status == REC_STATUS_NODE_PTR || status == REC_STATUS_COLUMNS_ADDED); + unsigned n_core_fields = redundant_temp + ? row_log_get_n_core_fields(index) + : index->n_core_fields; if (status == REC_STATUS_COLUMNS_ADDED - && (!temp || n_fields > index->n_core_fields)) { - ut_ad(index->is_instant()); + && (!temp || n_fields > n_core_fields)) { + if (!redundant_temp) { ut_ad(index->is_instant()); } ut_ad(UT_BITS_IN_BYTES(n_null) >= index->n_core_null_bytes); extra_size += UT_BITS_IN_BYTES(index->get_n_nullable(n_fields)) + rec_get_n_add_field_len(n_fields - 1 - - index->n_core_fields); + - n_core_fields); } else { - ut_ad(n_fields <= index->n_core_fields); + ut_ad(n_fields <= n_core_fields); extra_size += index->n_core_null_bytes; } @@ -1192,7 +1197,7 @@ rec_get_converted_size_comp_prefix( ulint* extra) /*!< out: extra size */ { ut_ad(dict_table_is_comp(index->table)); - return(rec_get_converted_size_comp_prefix_low( + return(rec_get_converted_size_comp_prefix_low( index, fields, n_fields, extra, REC_STATUS_ORDINARY, false)); } @@ -1224,7 +1229,7 @@ rec_get_converted_size_comp( case REC_STATUS_COLUMNS_ADDED: ut_ad(n_fields >= index->n_core_fields); ut_ad(n_fields <= index->n_fields); - return rec_get_converted_size_comp_prefix_low( + return rec_get_converted_size_comp_prefix_low( index, fields, n_fields, extra, status, false); case REC_STATUS_NODE_PTR: n_fields--; @@ -1232,7 +1237,7 @@ rec_get_converted_size_comp( index)); ut_ad(dfield_get_len(&fields[n_fields]) == REC_NODE_PTR_SIZE); return REC_NODE_PTR_SIZE /* child page number */ - + rec_get_converted_size_comp_prefix_low( + + rec_get_converted_size_comp_prefix_low( index, fields, n_fields, extra, status, false); case REC_STATUS_INFIMUM: case REC_STATUS_SUPREMUM: @@ -1418,6 +1423,7 @@ rec_convert_dtuple_to_rec_old( @param[in] status rec_get_status(rec) @param[in] temp whether to use the format for temporary files in index creation */ +template static inline void rec_convert_dtuple_to_rec_comp( @@ -1439,7 +1445,9 @@ rec_convert_dtuple_to_rec_comp( ulint UNINIT_VAR(n_node_ptr_field); ulint fixed_len; ulint null_mask = 1; - + const ulint n_core_fields = redundant_temp + ? row_log_get_n_core_fields(index) + : index->n_core_fields; ut_ad(n_fields > 0); ut_ad(temp || dict_table_is_comp(index->table)); ut_ad(index->n_core_null_bytes <= UT_BITS_IN_BYTES(index->n_nullable)); @@ -1448,16 +1456,15 @@ rec_convert_dtuple_to_rec_comp( switch (status) { case REC_STATUS_COLUMNS_ADDED: - ut_ad(index->is_instant()); - ut_ad(n_fields > index->n_core_fields); - rec_set_n_add_field(nulls, n_fields - 1 - - index->n_core_fields); + if (!redundant_temp) { ut_ad(index->is_instant()); } + ut_ad(n_fields > n_core_fields); + rec_set_n_add_field(nulls, n_fields - 1 - n_core_fields); /* fall through */ case REC_STATUS_ORDINARY: ut_ad(n_fields <= dict_index_get_n_fields(index)); if (!temp) { rec_set_heap_no_new(rec, PAGE_HEAP_NO_USER_LOW); - rec_set_status(rec, n_fields == index->n_core_fields + rec_set_status(rec, n_fields == n_core_fields ? REC_STATUS_ORDINARY : REC_STATUS_COLUMNS_ADDED); } if (dict_table_is_comp(index->table)) { @@ -1479,8 +1486,8 @@ rec_convert_dtuple_to_rec_comp( rec_set_status(rec, status); ut_ad(n_fields == dict_index_get_n_unique_in_tree_nonleaf(index) + 1); - ut_d(n_null = std::min(index->n_core_null_bytes * 8U, - index->n_nullable)); + ut_d(n_null = std::min(index->n_core_null_bytes * 8U, + index->n_nullable)); n_node_ptr_field = n_fields - 1; lens = nulls - index->n_core_null_bytes; break; @@ -1615,7 +1622,7 @@ rec_convert_dtuple_to_rec_new( index, status, dtuple->fields, dtuple->n_fields, &extra_size); rec_t* rec = buf + extra_size; - rec_convert_dtuple_to_rec_comp( + rec_convert_dtuple_to_rec_comp( rec, index, dtuple->fields, dtuple->n_fields, status, false); rec_set_info_bits_new(rec, dtuple->info_bits & ~REC_NEW_STATUS_MASK); return(rec); @@ -1659,6 +1666,7 @@ rec_convert_dtuple_to_rec( @param[out] extra record header size @param[in] status REC_STATUS_ORDINARY or REC_STATUS_COLUMNS_ADDED @return total size, in bytes */ +template ulint rec_get_converted_size_temp( const dict_index_t* index, @@ -1667,10 +1675,18 @@ rec_get_converted_size_temp( ulint* extra, rec_comp_status_t status) { - return rec_get_converted_size_comp_prefix_low( + return rec_get_converted_size_comp_prefix_low( index, fields, n_fields, extra, status, true); } +template ulint rec_get_converted_size_temp( + const dict_index_t*, const dfield_t*, ulint, ulint*, + rec_comp_status_t); + +template ulint rec_get_converted_size_temp( + const dict_index_t*, const dfield_t*, ulint, ulint*, + rec_comp_status_t); + /** Determine the offset to each field in temporary file. @param[in] rec temporary file record @param[in] index index of that the record belongs to @@ -1723,6 +1739,7 @@ rec_init_offsets_temp( @param[in] n_fields number of data fields @param[in] status REC_STATUS_ORDINARY or REC_STATUS_COLUMNS_ADDED */ +template void rec_convert_dtuple_to_temp( rec_t* rec, @@ -1731,10 +1748,18 @@ rec_convert_dtuple_to_temp( ulint n_fields, rec_comp_status_t status) { - rec_convert_dtuple_to_rec_comp(rec, index, fields, n_fields, - status, true); + rec_convert_dtuple_to_rec_comp( + rec, index, fields, n_fields, status, true); } +template void rec_convert_dtuple_to_temp( + rec_t*, const dict_index_t*, const dfield_t*, + ulint, rec_comp_status_t); + +template void rec_convert_dtuple_to_temp( + rec_t*, const dict_index_t*, const dfield_t*, + ulint, rec_comp_status_t); + /** Copy the first n fields of a (copy of a) physical record to a data tuple. The fields are copied into the memory heap. @param[out] tuple data tuple diff --git a/storage/innobase/row/row0log.cc b/storage/innobase/row/row0log.cc index 728902165b1..fb6b1738f74 100644 --- a/storage/innobase/row/row0log.cc +++ b/storage/innobase/row/row0log.cc @@ -351,7 +351,7 @@ row_log_online_op( row_merge_buf_encode(), because here we do not encode extra_size+1 (and reserve 0 as the end-of-chunk marker). */ - size = rec_get_converted_size_temp( + size = rec_get_converted_size_temp( index, tuple->fields, tuple->n_fields, &extra_size); ut_ad(size >= extra_size); ut_ad(size <= sizeof log->tail.buf); @@ -399,7 +399,7 @@ row_log_online_op( *b++ = (byte) extra_size; } - rec_convert_dtuple_to_temp( + rec_convert_dtuple_to_temp( b + extra_size, index, tuple->fields, tuple->n_fields); b += size; @@ -741,7 +741,7 @@ row_log_table_delete( old_pk, old_pk->n_fields - 2)->len); ut_ad(DATA_ROLL_PTR_LEN == dtuple_get_nth_field( old_pk, old_pk->n_fields - 1)->len); - old_pk_size = rec_get_converted_size_temp( + old_pk_size = rec_get_converted_size_temp( new_index, old_pk->fields, old_pk->n_fields, &old_pk_extra_size); ut_ad(old_pk_extra_size < 0x100); @@ -754,7 +754,7 @@ row_log_table_delete( *b++ = ROW_T_DELETE; *b++ = static_cast(old_pk_extra_size); - rec_convert_dtuple_to_temp( + rec_convert_dtuple_to_temp( b + old_pk_extra_size, new_index, old_pk->fields, old_pk->n_fields); @@ -854,7 +854,7 @@ row_log_table_low_redundant( rec_comp_status_t status = is_instant ? REC_STATUS_COLUMNS_ADDED : REC_STATUS_ORDINARY; - size = rec_get_converted_size_temp( + size = rec_get_converted_size_temp( index, tuple->fields, tuple->n_fields, &extra_size, status); if (is_instant) { size++; @@ -874,7 +874,7 @@ row_log_table_low_redundant( ut_ad(DATA_ROLL_PTR_LEN == dtuple_get_nth_field( old_pk, old_pk->n_fields - 1)->len); - old_pk_size = rec_get_converted_size_temp( + old_pk_size = rec_get_converted_size_temp( new_index, old_pk->fields, old_pk->n_fields, &old_pk_extra_size); ut_ad(old_pk_extra_size < 0x100); @@ -891,7 +891,7 @@ row_log_table_low_redundant( if (old_pk_size) { *b++ = static_cast(old_pk_extra_size); - rec_convert_dtuple_to_temp( + rec_convert_dtuple_to_temp( b + old_pk_extra_size, new_index, old_pk->fields, old_pk->n_fields); b += old_pk_size; @@ -914,7 +914,7 @@ row_log_table_low_redundant( *b = status; } - rec_convert_dtuple_to_temp( + rec_convert_dtuple_to_temp( b + extra_size, index, tuple->fields, tuple->n_fields, status); b += size; @@ -1036,7 +1036,7 @@ row_log_table_low( ut_ad(DATA_ROLL_PTR_LEN == dtuple_get_nth_field( old_pk, old_pk->n_fields - 1)->len); - old_pk_size = rec_get_converted_size_temp( + old_pk_size = rec_get_converted_size_temp( new_index, old_pk->fields, old_pk->n_fields, &old_pk_extra_size); ut_ad(old_pk_extra_size < 0x100); @@ -1052,7 +1052,7 @@ row_log_table_low( if (old_pk_size) { *b++ = static_cast(old_pk_extra_size); - rec_convert_dtuple_to_temp( + rec_convert_dtuple_to_temp( b + old_pk_extra_size, new_index, old_pk->fields, old_pk->n_fields); b += old_pk_size; @@ -4040,3 +4040,9 @@ row_log_apply( DBUG_RETURN(error); } + +unsigned row_log_get_n_core_fields(const dict_index_t *index) +{ + ut_ad(index->online_log); + return index->online_log->n_core_fields; +} diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index a488c9ce605..484676aa08d 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -308,7 +308,7 @@ row_merge_buf_encode( ulint size; ulint extra_size; - size = rec_get_converted_size_temp( + size = rec_get_converted_size_temp( index, entry->fields, n_fields, &extra_size); ut_ad(size >= extra_size); @@ -321,7 +321,7 @@ row_merge_buf_encode( *(*b)++ = (byte) (extra_size + 1); } - rec_convert_dtuple_to_temp(*b + extra_size, index, + rec_convert_dtuple_to_temp(*b + extra_size, index, entry->fields, n_fields); *b += size; @@ -796,7 +796,7 @@ row_merge_buf_add( ulint size; ulint extra; - size = rec_get_converted_size_temp( + size = rec_get_converted_size_temp( index, entry->fields, n_fields, &extra); ut_ad(data_size + extra_size == size); From f4e4bff9928e7a2d9864cf401d5aacbe428cfb05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Tue, 16 Mar 2021 13:02:44 +0200 Subject: [PATCH 2/9] MDEV-24916 : Assertion `current_stmt_binlog_format == BINLOG_FORMAT_STMT || current_stmt_binlog_format == BINLOG_FORMAT_ROW' failed in THD::is_current_stmt_binlog_format_row Store old value of binlog format before wsrep code so that if we bail out because wsrep is not ready for connections we can restore binlog format correctly. --- sql/sql_parse.cc | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index bcd091d620b..dad7b804e7e 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3673,6 +3673,11 @@ mysql_execute_command(THD *thd) Json_writer_object trace_command(thd); Json_writer_array trace_command_steps(thd, "steps"); + /* store old value of binlog format */ + enum_binlog_format orig_binlog_format,orig_current_stmt_binlog_format; + + thd->get_binlog_format(&orig_binlog_format, + &orig_current_stmt_binlog_format); #ifdef WITH_WSREP if (WSREP(thd)) { @@ -3724,12 +3729,6 @@ mysql_execute_command(THD *thd) DBUG_ASSERT(thd->transaction.stmt.modified_non_trans_table == FALSE); - /* store old value of binlog format */ - enum_binlog_format orig_binlog_format,orig_current_stmt_binlog_format; - - thd->get_binlog_format(&orig_binlog_format, - &orig_current_stmt_binlog_format); - /* Assign system variables with values specified by the clause SET STATEMENT var1=value1 [, var2=value2, ...] FOR @@ -7552,9 +7551,14 @@ void THD::reset_for_next_command(bool do_clear_error) save_prep_leaf_list= false; - DBUG_PRINT("debug", - ("is_current_stmt_binlog_format_row(): %d", - is_current_stmt_binlog_format_row())); +#ifdef WITH_WSREP +#if !defined(DBUG_OFF) + if (mysql_bin_log.is_open()) +#endif +#endif + DBUG_PRINT("debug", + ("is_current_stmt_binlog_format_row(): %d", + is_current_stmt_binlog_format_row())); DBUG_VOID_RETURN; } From 5511c21b41680a8c75f07a002a7362be7d157380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Tue, 16 Mar 2021 13:13:50 +0200 Subject: [PATCH 3/9] MDEV-23851 BF-BF Conflict issue because of UK GAP locks Add missing dbug sync point and correct the test case. --- .../suite/galera/r/galera_UK_conflict.result | 90 ++++++--- .../suite/galera/t/galera_UK_conflict.test | 176 +++++++++++++++--- sql/wsrep_high_priority_service.cc | 11 ++ 3 files changed, 229 insertions(+), 48 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_UK_conflict.result b/mysql-test/suite/galera/r/galera_UK_conflict.result index 76649f1b268..44bb64c9d63 100644 --- a/mysql-test/suite/galera/r/galera_UK_conflict.result +++ b/mysql-test/suite/galera/r/galera_UK_conflict.result @@ -1,3 +1,5 @@ +connection node_2; +connection node_1; CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 int, f3 int, unique key keyj (f2)); INSERT INTO t1 VALUES (1, 1, 0); INSERT INTO t1 VALUES (3, 3, 0); @@ -23,14 +25,14 @@ connection node_1a; SET SESSION wsrep_on = 0; SET SESSION wsrep_on = 1; SET GLOBAL wsrep_provider_options = 'dbug='; -SET GLOBAL wsrep_provider_options = 'dbug=d,commit_monitor_enter_sync'; +SET GLOBAL wsrep_provider_options = 'dbug=d,commit_monitor_master_enter_sync'; connection node_1; COMMIT; connection node_1a; SET SESSION wsrep_on = 0; SET SESSION wsrep_on = 1; SET GLOBAL wsrep_provider_options = 'dbug='; -SET GLOBAL wsrep_provider_options = 'signal=commit_monitor_enter_sync'; +SET GLOBAL wsrep_provider_options = 'signal=commit_monitor_master_enter_sync'; SET GLOBAL wsrep_provider_options = 'dbug='; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; @@ -39,13 +41,13 @@ SET debug_sync='RESET'; SET GLOBAL DEBUG_DBUG = "d,sync.wsrep_apply_cb"; SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; -SET GLOBAL wsrep_provider_options = 'dbug=d,commit_monitor_enter_sync'; +SET GLOBAL wsrep_provider_options = 'dbug=d,commit_monitor_slave_enter_sync'; SET GLOBAL wsrep_provider_options = 'dbug='; SET GLOBAL DEBUG_DBUG = ""; SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; SET GLOBAL debug_dbug = NULL; SET debug_sync='RESET'; -SET GLOBAL wsrep_provider_options = 'signal=commit_monitor_enter_sync'; +SET GLOBAL wsrep_provider_options = 'signal=commit_monitor_slave_enter_sync'; SET GLOBAL wsrep_provider_options = 'dbug='; connection node_1; SELECT * FROM t1; @@ -55,8 +57,6 @@ f1 f2 f3 4 4 2 5 5 2 10 10 0 -wsrep_local_replays -1 SET GLOBAL wsrep_slave_threads = DEFAULT; connection node_2; SELECT * FROM t1; @@ -68,22 +68,64 @@ f1 f2 f3 10 10 0 INSERT INTO t1 VALUES (7,7,7); INSERT INTO t1 VALUES (8,8,8); -SELECT * FROM t1; -f1 f2 f3 -1 1 0 -3 3 1 -4 4 2 -5 5 2 -7 7 7 -8 8 8 -10 10 0 -connection node_1; -SELECT * FROM t1; -f1 f2 f3 -1 1 0 -3 3 1 -4 4 2 -5 5 2 -7 7 7 -10 10 0 +DROP TABLE t1; +test scenario 2 +connection node_1; +CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 int, f3 int, unique key keyj (f2)); +INSERT INTO t1 VALUES (1, 1, 0); +INSERT INTO t1 VALUES (3, 3, 0); +INSERT INTO t1 VALUES (10, 10, 0); +SET GLOBAL wsrep_slave_threads = 3; +SET GLOBAL wsrep_provider_options = 'dbug=d,apply_monitor_slave_enter_sync'; +connection node_1; +SET SESSION wsrep_sync_wait=0; +START TRANSACTION; +DELETE FROM t1 WHERE f2 = 3; +INSERT INTO t1 VALUES (3, 3, 1); +connection node_1a; +SET SESSION wsrep_sync_wait=0; +connection node_2; +INSERT INTO t1 VALUES (5, 5, 2); +connection node_1a; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +SET GLOBAL wsrep_provider_options = 'dbug=d,commit_monitor_master_enter_sync'; +connection node_1; +COMMIT; +connection node_1a; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +SET GLOBAL DEBUG_DBUG = "d,sync.wsrep_replay_cb"; +SET GLOBAL wsrep_provider_options = 'signal=commit_monitor_master_enter_sync'; +SET GLOBAL wsrep_provider_options = 'dbug='; +SET GLOBAL wsrep_provider_options = 'signal=apply_monitor_slave_enter_sync'; +SET GLOBAL wsrep_provider_options = 'dbug='; +SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_replay_cb_reached"; +SET GLOBAL wsrep_provider_options = 'dbug=d,commit_monitor_slave_enter_sync'; +connection node_2; +INSERT INTO t1 VALUES (4, 4, 2); +connection node_1a; +SET SESSION wsrep_on = 0; +SET SESSION wsrep_on = 1; +SET GLOBAL wsrep_provider_options = 'dbug='; +SET GLOBAL wsrep_provider_options = 'signal=commit_monitor_slave_enter_sync'; +SET GLOBAL wsrep_provider_options = 'dbug='; +SET GLOBAL DEBUG_DBUG = ""; +SET DEBUG_SYNC = "now SIGNAL signal.wsrep_replay_cb"; +SET GLOBAL debug_dbug = NULL; +SET debug_sync='RESET'; +connection node_1; +SET GLOBAL wsrep_slave_threads = DEFAULT; +connection node_2; +SELECT * FROM t1; +f1 f2 f3 +1 1 0 +3 3 1 +4 4 2 +5 5 2 +10 10 0 +INSERT INTO t1 VALUES (7,7,7); +INSERT INTO t1 VALUES (8,8,8); DROP TABLE t1; diff --git a/mysql-test/suite/galera/t/galera_UK_conflict.test b/mysql-test/suite/galera/t/galera_UK_conflict.test index 57bafbf8ae0..9978ba9b8bf 100644 --- a/mysql-test/suite/galera/t/galera_UK_conflict.test +++ b/mysql-test/suite/galera/t/galera_UK_conflict.test @@ -1,14 +1,14 @@ # # This test tests the operation of transaction replay with a scenario -# where two subsequent write sets in applying conflict with local transaction +# where two subsequent write sets being applied conflict with local transaction # in commit phase. The conflict is "false positive" confict on GAP lock in # secondary unique index. # The first applier will cause BF abort for the local committer, which # starts replaying because of positive certification. -# In buggy version, scenatio continues so that ehile the local transaction +# In buggy version, the test scenario continues so that while the local transaction # is replaying, the latter applier experiences similar UK GAP lock conflict # and forces the replayer to abort second time. -# In fixed version, this latter BF abort should not happen. +# In fixed version, this latter replayer BF abort should not happen. # --source include/galera_cluster.inc @@ -16,15 +16,16 @@ --source include/have_debug_sync.inc --source include/galera_have_debug_sync.inc ---let $wsrep_local_replays_old = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_replays'` + +--let $expected_wsrep_local_replays = `SELECT VARIABLE_VALUE+1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_replays'` CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 int, f3 int, unique key keyj (f2)); INSERT INTO t1 VALUES (1, 1, 0); INSERT INTO t1 VALUES (3, 3, 0); INSERT INTO t1 VALUES (10, 10, 0); -# we will need 2 appliers threads for applyin two write sets in parallel in node1 -# and 1 applier thread for handling replaying +# we will need 2 appliers threads for applyin two writes ets in parallel in node1 +# and 1 applier thread for handling replaying SET GLOBAL wsrep_slave_threads = 3; SET GLOBAL DEBUG_DBUG = "d,sync.wsrep_apply_cb"; @@ -42,7 +43,7 @@ INSERT INTO t1 VALUES (3, 3, 1); --connection node_1a SET SESSION wsrep_sync_wait=0; -# send from node 2 first INSERT transaction, which will conflict on GAP lock in node 1 +# send from node 2 first an INSERT transaction, which will conflict on GAP lock in node 1 --connection node_2 INSERT INTO t1 VALUES (5, 5, 2); @@ -67,7 +68,7 @@ INSERT INTO t1 VALUES (4, 4, 2); # both appliers are now waiting in separate sync points # Block the local commit, send the COMMIT and wait until it gets blocked ---let $galera_sync_point = commit_monitor_enter_sync +--let $galera_sync_point = commit_monitor_master_enter_sync --source include/galera_set_sync_point.inc --connection node_1 @@ -75,12 +76,12 @@ INSERT INTO t1 VALUES (4, 4, 2); --connection node_1a # wait for the local commit to enter in commit monitor wait state ---let $galera_sync_point = apply_monitor_slave_enter_sync commit_monitor_enter_sync +--let $galera_sync_point = apply_monitor_slave_enter_sync commit_monitor_master_enter_sync --source include/galera_wait_sync_point.inc --source include/galera_clear_sync_point.inc # release the local transaction to continue with commit ---let $galera_sync_point = commit_monitor_enter_sync +--let $galera_sync_point = commit_monitor_master_enter_sync --source include/galera_signal_sync_point.inc --source include/galera_clear_sync_point.inc @@ -90,6 +91,11 @@ SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; SET GLOBAL debug_dbug = NULL; SET debug_sync='RESET'; +# wait for BF abort to happen and replaying begin +--let $wait_condition = SELECT VARIABLE_VALUE= $expected_wsrep_local_replays FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_replays'; +--let $wait_condition_on_error_output= SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_replays'; +--source include/wait_condition_with_debug.inc + # set another sync point for second applier SET GLOBAL DEBUG_DBUG = "d,sync.wsrep_apply_cb"; @@ -97,11 +103,11 @@ SET GLOBAL DEBUG_DBUG = "d,sync.wsrep_apply_cb"; --let $galera_sync_point = apply_monitor_slave_enter_sync --source include/galera_signal_sync_point.inc -# waiting until second applier is in wait +# waiting until second applier is in wait state SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_apply_cb_reached"; # stopping second applier before commit ---let $galera_sync_point = commit_monitor_enter_sync +--let $galera_sync_point = commit_monitor_slave_enter_sync --source include/galera_set_sync_point.inc --source include/galera_clear_sync_point.inc @@ -112,9 +118,9 @@ SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; SET GLOBAL debug_dbug = NULL; SET debug_sync='RESET'; -# with fixed version, second applier has reached commit monitor, and we can +# with fixed version, second applier has reached comit monitor, and we can # release it to complete ---let $galera_sync_point = commit_monitor_enter_sync +--let $galera_sync_point = commit_monitor_slave_enter_sync --source include/galera_signal_sync_point.inc --source include/galera_clear_sync_point.inc @@ -124,12 +130,6 @@ SET debug_sync='RESET'; SELECT * FROM t1; -# wsrep_local_replays has increased by 1 ---let $wsrep_local_replays_new = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_replays'` ---disable_query_log ---eval SELECT $wsrep_local_replays_new - $wsrep_local_replays_old = 1 AS wsrep_local_replays; ---enable_query_log - # returning original slave thread count SET GLOBAL wsrep_slave_threads = DEFAULT; @@ -140,9 +140,137 @@ SELECT * FROM t1; # original state in node 1 INSERT INTO t1 VALUES (7,7,7); INSERT INTO t1 VALUES (8,8,8); -SELECT * FROM t1; - ---connection node_1 -SELECT * FROM t1; + +DROP TABLE t1; + +################################################################################## +# test scenario 2 +# +# commit order is now: INSERT-1, local COMMIT, INSERT-2 +# while local trx is replaying, the latter applier has applied and is waiting +# for commit. +# The point in this scenario is to verify that replayer does not try to abort +# the latter applier +################################################################################# + +--echo test scenario 2 + +--connection node_1 +--let $expected_wsrep_local_replays = `SELECT VARIABLE_VALUE+1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_replays'` + +CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 int, f3 int, unique key keyj (f2)); +INSERT INTO t1 VALUES (1, 1, 0); +INSERT INTO t1 VALUES (3, 3, 0); +INSERT INTO t1 VALUES (10, 10, 0); + +# we will need 2 appliers threads for applyin two writes sets in parallel in node1 +# and 1 applier thread for handling replaying +SET GLOBAL wsrep_slave_threads = 3; + +# set sync point for the first INSERT applier +--let $galera_sync_point = apply_monitor_slave_enter_sync +--source include/galera_set_sync_point.inc + +--connection node_1 +# starting a transaction, which deletes and inserts the middle row in test table +# this will be victim of false positive conflict with appliers +SET SESSION wsrep_sync_wait=0; +START TRANSACTION; + +DELETE FROM t1 WHERE f2 = 3; +INSERT INTO t1 VALUES (3, 3, 1); + +# Control connection to manage sync points for appliers +--connection node_1a +SET SESSION wsrep_sync_wait=0; + +# send from node 2 first an INSERT transaction, which will conflict on GAP lock in node 1 +--connection node_2 +INSERT INTO t1 VALUES (5, 5, 2); + +--connection node_1a +# wait to see the INSERT in apply_cb sync point +--let $galera_sync_point = apply_monitor_slave_enter_sync +--source include/galera_wait_sync_point.inc +--source include/galera_clear_sync_point.inc + +# Block the local commit, send the COMMIT and wait until it gets blocked +--let $galera_sync_point = commit_monitor_master_enter_sync +--source include/galera_set_sync_point.inc + +--connection node_1 +--send COMMIT + +--connection node_1a +# wait for the local commit to enter in commit monitor wait state +--let $galera_sync_point = apply_monitor_slave_enter_sync commit_monitor_master_enter_sync +--source include/galera_wait_sync_point.inc +--source include/galera_clear_sync_point.inc + +# set sync point before replaying +SET GLOBAL DEBUG_DBUG = "d,sync.wsrep_replay_cb"; + +# release the local transaction to continue with commit +# it should advance and end up waiting in commit monitor for his turn +--let $galera_sync_point = commit_monitor_master_enter_sync +--source include/galera_signal_sync_point.inc +--source include/galera_clear_sync_point.inc + +# and now release the first applier, it should force local trx to abort +--let $galera_sync_point = apply_monitor_slave_enter_sync +--source include/galera_signal_sync_point.inc +--source include/galera_clear_sync_point.inc + +# wait for BF abort to happen and replaying begin +--let $wait_condition = SELECT VARIABLE_VALUE= $expected_wsrep_local_replays FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_replays'; +--let $wait_condition_on_error_output= SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_replays'; +--source include/wait_condition_with_debug.inc + +# replayer should now be in stopped in sync point +SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_replay_cb_reached"; + +# set sync point for the second INSERT +--let $galera_sync_point = commit_monitor_slave_enter_sync +--source include/galera_set_sync_point.inc + +--connection node_2 +# send second insert into same GAP in test table +INSERT INTO t1 VALUES (4, 4, 2); + +--connection node_1a +# wait for the second applier to enter in commit monitor wait state +--let $galera_sync_point = commit_monitor_slave_enter_sync +--source include/galera_wait_sync_point.inc +--source include/galera_clear_sync_point.inc + +# and, letting the second appier to move forward, it will stop naturally +# to wait for commit order after replayer's commit +--let $galera_sync_point = commit_monitor_slave_enter_sync +--source include/galera_signal_sync_point.inc +--source include/galera_clear_sync_point.inc + +# and now release the replayer, if all is good,it will commit before the second applier +SET GLOBAL DEBUG_DBUG = ""; +SET DEBUG_SYNC = "now SIGNAL signal.wsrep_replay_cb"; +SET GLOBAL debug_dbug = NULL; +SET debug_sync='RESET'; + +# local commit should succeed +--connection node_1 +--reap + +--let $wait_condition = SELECT COUNT(*)=5 FROM t1; +--source include/wait_condition.inc + +# returning original slave thread count +SET GLOBAL wsrep_slave_threads = DEFAULT; + +--connection node_2 +SELECT * FROM t1; + +# replicate some transactions, so that wsrep slave thread count can reach +# original state in node 1 +INSERT INTO t1 VALUES (7,7,7); +INSERT INTO t1 VALUES (8,8,8); DROP TABLE t1; diff --git a/sql/wsrep_high_priority_service.cc b/sql/wsrep_high_priority_service.cc index 1adbb312ac0..0da71c3eda5 100644 --- a/sql/wsrep_high_priority_service.cc +++ b/sql/wsrep_high_priority_service.cc @@ -673,6 +673,17 @@ int Wsrep_replayer_service::apply_write_set(const wsrep::ws_meta& ws_meta, DBUG_ASSERT(thd->wsrep_trx().active()); DBUG_ASSERT(thd->wsrep_trx().state() == wsrep::transaction::s_replaying); + /* Allow tests to block the replayer thread using the DBUG facilities */ + DBUG_EXECUTE_IF("sync.wsrep_replay_cb", + { + const char act[]= + "now " + "SIGNAL sync.wsrep_replay_cb_reached " + "WAIT_FOR signal.wsrep_replay_cb"; + DBUG_ASSERT(!debug_sync_set_action(thd, + STRING_WITH_LEN(act))); + };); + wsrep_setup_uk_and_fk_checks(thd); int ret= 0; From bac931303de9b2736ff85d98bf31e0bacfe10199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sun, 20 Dec 2020 23:00:00 +0200 Subject: [PATCH 4/9] Deb: Add Finnish and Vietnamese debconf translations Upstreamed from https://salsa.debian.org/mariadb-team/mariadb-10.5/-/tree/master/debian/po --- debian/po/fi.po | 105 ++++++++++++++++++++++++++++++++++++++++++++++ debian/po/vi.po | 109 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 214 insertions(+) create mode 100644 debian/po/fi.po create mode 100644 debian/po/vi.po diff --git a/debian/po/fi.po b/debian/po/fi.po new file mode 100644 index 00000000000..3a9dcc7f033 --- /dev/null +++ b/debian/po/fi.po @@ -0,0 +1,105 @@ +# Finnish translations for mariadb-10.5 package +# This file is distributed under the same license as the mariadb-10.5 package. +# Antti Järvinen , 2017. +# +msgid "" +msgstr "" +"Project-Id-Version: mariadb-10.5\n" +"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2017-03-15 22:36+0200\n" +"Last-Translator: antti.jarvinen@katiska.org\n" +"Language-Team: \n" +"Language: fi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.11\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: note +#. Description +#: ../mariadb-server-10.5.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "Vanha datahakemisto tullaan tallentamaan uuteen paikkaan" + +#. Type: note +#. Description +#: ../mariadb-server-10.5.templates:2001 +msgid "" +"A file named /var/lib/mysql/debian-*.flag exists on this system. The number " +"indicates a database binary format version that cannot automatically be " +"upgraded (or downgraded)." +msgstr "" +"Järjestelmässä on tiedosto /var/lib/mysql/debian-*.flag. Numero osoittaa " +"tietokantatiedoston binääriformaatin version, josta/johon päivittäminen ei " +"automaattisesti onnistu. " + +#. Type: note +#. Description +#: ../mariadb-server-10.5.templates:2001 +msgid "" +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." +msgstr "" +"Siksipä vanha datahakemisto tullaan siirtämään nimelle /var/lib/mysql-* ja " +"uudet tiedostot luodaan hakemistoon /var/lib/mysql." + +#. Type: note +#. Description +#: ../mariadb-server-10.5.templates:2001 +msgid "" +"Please manually export/import your data (e.g. with mysqldump) if needed." +msgstr "" +"Tarpeittesi mukaan tuo tai vie tietokannan sisältö käsipelillä, esim. " +"käyttäen mysqldump-ohjelmaa." + +#. Type: note +#. Description +#: ../mariadb-server-10.5.templates:3001 +msgid "Important note for NIS/YP users" +msgstr "Merkittävä huomio NIS/YP -käyttäjille" + +#. Type: note +#. Description +#: ../mariadb-server-10.5.templates:3001 +msgid "" +"Using MariaDB under NIS/YP requires a mysql user account to be added on the " +"local system with:" +msgstr "" +"MariaDB:n käyttäminen NIS/YP:n kanssa edellyttää, että järjestelmään luodaan " +"käyttäjätunnus mysql:" + +#. Type: note +#. Description +#: ../mariadb-server-10.5.templates:3001 +msgid "" +"You should also check the permissions and ownership of the /var/lib/mysql " +"directory:" +msgstr "Tarkista myös hakemiston /var/lib/mysql omistaja ja oikeudet:" + +#. Type: boolean +#. Description +#: ../mariadb-server-10.5.templates:4001 +msgid "Remove all MariaDB databases?" +msgstr "Poistetaanko kaikki MariaDB-tietokannat?" + +#. Type: boolean +#. Description +#: ../mariadb-server-10.5.templates:4001 +msgid "" +"The /var/lib/mysql directory which contains the MariaDB databases is about " +"to be removed." +msgstr "" +"MariaDB-tietokannat sisältävä hakemisto /var/lib/mysql ollaan poistamassa." + +#. Type: boolean +#. Description +#: ../mariadb-server-10.5.templates:4001 +msgid "" +"If you're removing the MariaDB package in order to later install a more " +"recent version or if a different mariadb-server package is already using it, " +"the data should be kept." +msgstr "" +"Jos poistat MariaDB-paketin asentaaksesi uudemman version tai jos joku muu " +"mariadb-server -paketti jo käyttää tietoja, tiedot tulisi säästää. " diff --git a/debian/po/vi.po b/debian/po/vi.po new file mode 100644 index 00000000000..2db592acdc2 --- /dev/null +++ b/debian/po/vi.po @@ -0,0 +1,109 @@ +# Vietnamese translations for mariadb-10.5 package +# Bản dịch Tiếng Việt dành cho gói mariadb-10.5. +# This file is distributed under the same license as the mariadb-10.5 package. +# Trần Ngọc Quân , 2017. +# +msgid "" +msgstr "" +"Project-Id-Version: mariadb-10.5\n" +"Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2017-03-18 13:32+0700\n" +"Last-Translator: Trần Ngọc Quân \n" +"Language-Team: Vietnamese \n" +"Language: vi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Gtranslator 2.91.7\n" + +#. Type: note +#. Description +#: ../mariadb-server-10.5.templates:2001 +msgid "The old data directory will be saved at new location" +msgstr "Thư mục dữ liệu cũ sẽ được lưu tại vị trí mới" + +#. Type: note +#. Description +#: ../mariadb-server-10.5.templates:2001 +msgid "" +"A file named /var/lib/mysql/debian-*.flag exists on this system. The number " +"indicates a database binary format version that cannot automatically be " +"upgraded (or downgraded)." +msgstr "" +"Một tập tin có tên /var/lib/mysql/debian-*.flag đã sẵn có trên hệ thống này. " +"Con số chỉ ra rằng một phiên bản định dạng cơ sở dữ liệu không thể tự động " +"nâng cấp (hoặc hạ cấp)." + +#. Type: note +#. Description +#: ../mariadb-server-10.5.templates:2001 +msgid "" +"Therefore the previous data directory will be renamed to /var/lib/mysql-* " +"and a new data directory will be initialized at /var/lib/mysql." +msgstr "" +"Do đó thư mục dữ liệu trước đây sẽ được đổi tên thành /var/lib/mysql-* và " +"thư mục dữ liệu mới sẽ được khởi tạo tại /var/lib/mysql." + +#. Type: note +#. Description +#: ../mariadb-server-10.5.templates:2001 +msgid "" +"Please manually export/import your data (e.g. with mysqldump) if needed." +msgstr "" +"Vui lòng xuất/nhập dữ liệu của bạn bằng tay nếu thấy cần (ví dụ bằng " +"mysqldump)." + +#. Type: note +#. Description +#: ../mariadb-server-10.5.templates:3001 +msgid "Important note for NIS/YP users" +msgstr "Chú ý quan trọng cho người dùng NIS/YP" + +#. Type: note +#. Description +#: ../mariadb-server-10.5.templates:3001 +msgid "" +"Using MariaDB under NIS/YP requires a mysql user account to be added on the " +"local system with:" +msgstr "" +"Dùng MariaDB dưới NIS/YP cần một tài khoản người dùng được thêm vào một hệ " +"thống nội bộ với:" + +#. Type: note +#. Description +#: ../mariadb-server-10.5.templates:3001 +msgid "" +"You should also check the permissions and ownership of the /var/lib/mysql " +"directory:" +msgstr "" +"Bạn cũng nên kiểm tra phân quyền và chủ sở hữu của thư mục /var/lib/mysql:" + +#. Type: boolean +#. Description +#: ../mariadb-server-10.5.templates:4001 +msgid "Remove all MariaDB databases?" +msgstr "Xóa bỏ mọi cơ sở dữ liệu MariaDB chứ?" + +#. Type: boolean +#. Description +#: ../mariadb-server-10.5.templates:4001 +msgid "" +"The /var/lib/mysql directory which contains the MariaDB databases is about " +"to be removed." +msgstr "" +"Thư mục /var/lib/mysql nơi mà chứa các cơ sở dữ liệu MariaDB chuẩn bị bị xóa " +"bỏ." + +#. Type: boolean +#. Description +#: ../mariadb-server-10.5.templates:4001 +msgid "" +"If you're removing the MariaDB package in order to later install a more " +"recent version or if a different mariadb-server package is already using it, " +"the data should be kept." +msgstr "" +"Nếu bạn gỡ bỏ gói cốt để mà sau này cài đặt gói máy phục vụ phiên bản gần " +"đây hoặc là một gói mariadb-server khác đang được dùng, dữ liệu nên được giữ " +"lại." From 7e3806ce24d81933c18ae37f8817a10c48d7c603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Mon, 21 Dec 2020 20:42:26 +0200 Subject: [PATCH 5/9] Deb: Sync updates to debconf templates and translations from downstream --- debian/mariadb-server-10.5.templates | 31 ------ debian/po/ar.po | 87 +--------------- debian/po/ca.po | 111 ++++++--------------- debian/po/cs.po | 105 +++----------------- debian/po/da.po | 135 +++++-------------------- debian/po/de.po | 126 ++++------------------- debian/po/es.po | 118 ++++------------------ debian/po/eu.po | 83 +--------------- debian/po/fr.po | 114 ++++----------------- debian/po/gl.po | 87 +--------------- debian/po/it.po | 114 ++++----------------- debian/po/ja.po | 100 +++---------------- debian/po/nb.po | 91 +---------------- debian/po/nl.po | 143 ++++++--------------------- debian/po/pt.po | 129 +++++------------------- debian/po/pt_BR.po | 128 +++++------------------- debian/po/ro.po | 91 +---------------- debian/po/ru.po | 107 +++----------------- debian/po/sv.po | 107 ++++---------------- debian/po/templates.pot | 71 +------------ debian/po/tr.po | 102 +++++-------------- 21 files changed, 303 insertions(+), 1877 deletions(-) diff --git a/debian/mariadb-server-10.5.templates b/debian/mariadb-server-10.5.templates index fde43a55706..7644d06bd44 100644 --- a/debian/mariadb-server-10.5.templates +++ b/debian/mariadb-server-10.5.templates @@ -43,34 +43,3 @@ _Description: Remove all MariaDB databases? If you're removing the MariaDB package in order to later install a more recent version or if a different mariadb-server package is already using it, the data should be kept. - -Template: mysql-server/root_password -Type: password -_Description: New password for the MariaDB "root" user: - While not mandatory, it is highly recommended that you set a password - for the MariaDB administrative "root" user. - . - If this field is left blank, the password will not be changed. - -Template: mysql-server/root_password_again -Type: password -_Description: Repeat password for the MariaDB "root" user: - -Template: mysql-server/error_setting_password -Type: error -_Description: Unable to set password for the MariaDB "root" user - An error occurred while setting the password for the MariaDB - administrative user. This may have happened because the account - already has a password, or because of a communication problem with - the MariaDB server. - . - You should check the account's password after the package installation. - . - Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file - for more information. - -Template: mysql-server/password_mismatch -Type: error -_Description: Password input error - The two passwords you entered were not the same. Please try again. - diff --git a/debian/po/ar.po b/debian/po/ar.po index f8469e448f9..a172e23b6db 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: templates\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2007-05-01 13:04+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -105,88 +105,3 @@ msgid "" msgstr "" "إن كنت تقوم بإزالة حزمة MariaDB كي تقوم لاحقاً بتثبيت نسخة أحدث أو إن كانت " "حزمة mariadb-server مختلفة تستخدمها، فيجب إبقاء البيانات." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص بـMariaDB:" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"مع أنه ليس إجبارياً، ولكن من المستحسن أن تقوم بتعيين كلمة مرور خاصة بمستخدم " -"MariaDB الإداري \"root\"." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "إن ترك الحقل فارغاً، فلن يتم تغيير كلمة المرور." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -#, fuzzy -#| msgid "New password for the MariaDB \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "كلمة المرور الجديدة لمستخد \"root\" الخاص بـMariaDB:" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "تعذر تعيين كلمة مرور للمستخدم \"root\" الخاص بـMariaDB." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"حدث خطأ أثناء تعيين كلمة المرور لمستخدم MariaDB الإداري. قد يكون هذا حدث " -"بسبب أن حساب المستخدم له كلمة مرور معيّنة مسبقاً، أو بسبب مشكلة في الاتصال مع " -"خادم MariaDB." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "You should check the account's password after tha package installation." -msgid "You should check the account's password after the package installation." -msgstr "يجب عليك التحقق من كلمة مرور الحساب عقب تثبيت الحزمة." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " -#| "more information." -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" -"الرجاء قراءة الملف /usr/share/doc/mariadb-server-10.5/README.Debian للمزيد " -"من المعلومات." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" diff --git a/debian/po/ca.po b/debian/po/ca.po index ea826909b53..8a966fdc348 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -1,25 +1,27 @@ -# mysql-dfsg (debconf) translation to Catalan. -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# mariadb (debconf) translation to Catalan. +# his file is distributed under the same license as the mariadb-10.5 package. # Aleix Badia i Bosch 2004 +# Innocent De Marchi 2017 # msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-4.1\n" +"Project-Id-Version: mariadb-10.5\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" -"PO-Revision-Date: 2004-01-31 19:20GMT\n" -"Last-Translator: Aleix Badia i Bosch \n" -"Language-Team: Debian L10n Catalan \n" -"Language: \n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2017-03-20 17:55+0100\n" +"Last-Translator: Innocent De Marchi \n" +"Language-Team: Debian l10n Catalan \n" +"Language: ca\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.11\n" #. Type: note #. Description #: ../mariadb-server-10.5.templates:2001 msgid "The old data directory will be saved at new location" -msgstr "" +msgstr "El directori de dades antigues es desarà a una nova localització" #. Type: note #. Description @@ -29,6 +31,9 @@ msgid "" "indicates a database binary format version that cannot automatically be " "upgraded (or downgraded)." msgstr "" +"Ja hi ha un fitxer amb el nom «/var/lib/mysql/debian-*.flag» en aquests " +"sistema. El número indica la versió de format binari de la base de dades que " +"no és possible actualitzar (o tornar a una versió anterior) automàticament." #. Type: note #. Description @@ -37,6 +42,8 @@ msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." msgstr "" +"En conseqüència, el directori de dades anterior serà renomenat a «/var/lib/" +"mysql-*» i s'iniciarà un nou directori de dades a «/var/lib/mysql»." #. Type: note #. Description @@ -44,14 +51,14 @@ msgstr "" msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" +"Si us plau, importau o exportau manualment les vostres dades (p. ex. amb " +"«mysqldump») si és necessari." #. Type: note #. Description #: ../mariadb-server-10.5.templates:3001 -#, fuzzy -#| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" -msgstr "Nota important pels usuaris de NIS/YP" +msgstr "Nota important pels usuaris de «NIS/YP»" #. Type: note #. Description @@ -60,6 +67,8 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" +"Fer servir MariaDB sota «NIS/YP» requereix afegir un compte d'usuari MySQL " +"al sistema local fent servir:" #. Type: note #. Description @@ -68,12 +77,14 @@ msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" msgstr "" +"També heu de comprovar els permisos i els propietaris del directori «/var/" +"lib/mysql»" #. Type: boolean #. Description #: ../mariadb-server-10.5.templates:4001 msgid "Remove all MariaDB databases?" -msgstr "" +msgstr "Eliminar totes les bases de dades MariaDB?" #. Type: boolean #. Description @@ -82,6 +93,8 @@ msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." msgstr "" +"El directori «/var/lib/mysql» que conté totes les bases de dades MariaDB " +"està a punt d'ésser eliminat." #. Type: boolean #. Description @@ -91,70 +104,6 @@ msgid "" "recent version or if a different mariadb-server package is already using it, " "the data should be kept." msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "If this field is left blank, the password will not be changed." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "You should check the account's password after the package installation." -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" +"Si estau des-instal·lant el paquet MariaDB amb la intenció d'instal·lar a " +"continuació una versió més recent o hi ha una versió diferent del paquet " +"«mariadb-server» que l'està fent servir, cal mantenir les dades." diff --git a/debian/po/cs.po b/debian/po/cs.po index f5f669ee4bd..6ca00c08d6f 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -13,10 +13,10 @@ # msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-5.1\n" +"Project-Id-Version: mariadb-10.5\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" -"PO-Revision-Date: 2007-05-01 13:01+0200\n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2020-10-18 17:13+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" "Language: cs\n" @@ -28,7 +28,7 @@ msgstr "" #. Description #: ../mariadb-server-10.5.templates:2001 msgid "The old data directory will be saved at new location" -msgstr "" +msgstr "Starý adresář s daty bude uložen na novém místě." #. Type: note #. Description @@ -38,6 +38,9 @@ msgid "" "indicates a database binary format version that cannot automatically be " "upgraded (or downgraded)." msgstr "" +"V systému existuje soubor /var/lib/mysql/debian-*.flag. Číslo znamená " +"verzi binárního formátu databáze, kterou nelze automaticky aktualizovat " +"(ani degradovat)." #. Type: note #. Description @@ -46,6 +49,8 @@ msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." msgstr "" +"Z tohoto důvodu bude původní adresář přejmenován na /var/lib/mysql-* " +"a ve /var/lib/mysql se inicializuje nové datové úložiště." #. Type: note #. Description @@ -53,6 +58,8 @@ msgstr "" msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" +"Pokud je to potřeba, vyexportujte/naimportujte data ručně (např. pomocí " +"mysqldump)." #. Type: note #. Description @@ -67,14 +74,12 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" +"Používání MariaDB pod NIS/YP vyžaduje, aby byl účet mysql uživatele přidán " +"na lokálním systému příkazem:" #. Type: note #. Description #: ../mariadb-server-10.5.templates:3001 -#, fuzzy -#| msgid "" -#| "You should also check the permissions and the owner of the /var/lib/mysql " -#| "directory:" msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -108,87 +113,3 @@ msgstr "" "Jestliže odstraňujete balík MariaDB za účelem instalace novější verze " "MariaDB, nebo pokud tato data souběžně využívá jiný balík mariadb-server, " "měli byste data ponechat." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nové heslo MariaDB uživatele \"root\":" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Přestože to není nezbytné, je silně doporučeno nastavit heslo u " -"správcovského MariaDB účtu \"root\"." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "Ponecháte-li pole prázdné, heslo se nezmění." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -#, fuzzy -#| msgid "New password for the MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Nové heslo MariaDB uživatele \"root\":" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Nelze nastavit heslo MariaDB uživatele \"root\"" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"Během nastavování hesla pro správcovského uživatele MariaDB se vyskytla " -"chyba. To se mohlo stát třeba proto, protože uživatel již měl heslo " -"nastaveno, nebo protože nastal problém v komunikaci s MariaDB serverem." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "You should check the account's password after tha package installation." -msgid "You should check the account's password after the package installation." -msgstr "Po instalaci balíku byste měli heslo ověřit." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " -#| "more information." -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" -"Více informací naleznete v /usr/share/doc/mariadb-server-10.5/README.Debian." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" diff --git a/debian/po/da.po b/debian/po/da.po index 780b893c328..c4fa4788d24 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -1,35 +1,27 @@ +# Danish translation mariadb-10.5. +# Copyright (C) 2014 mariadb-10.5 og nedenstående oversættere. +# This file is distributed under the same license as the mariadb-10.5 package. +# Claus Hindsgaul , 2005, 2006, 2007. +# Joe Hansen , 2014, 2016. # -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -# Developers do not need to manually edit POT or PO files. -# -# Claus Hindsgaul , 2005, 2006. -# Claus Hindsgaul , 2006, 2007. msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-4.1\n" +"Project-Id-Version: mariadb-10.5\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" -"PO-Revision-Date: 2007-05-30 22:41+0200\n" -"Last-Translator: Claus Hindsgaul \n" -"Language-Team: Danish\n" -"Language: \n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2016-07-09 22:41+0200\n" +"Last-Translator: Joe Hansen \n" +"Language-Team: Danish \n" +"Language: da\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" #. Type: note #. Description #: ../mariadb-server-10.5.templates:2001 msgid "The old data directory will be saved at new location" -msgstr "" +msgstr "Den gamle datamappe vil blive gemt på en ny placering" #. Type: note #. Description @@ -39,6 +31,9 @@ msgid "" "indicates a database binary format version that cannot automatically be " "upgraded (or downgraded)." msgstr "" +"En fil navngivet /var/lib/msyql/debian-*.flag findes på dette system. " +"Nummeret antyder en databaseversion i binært format, som ikke automatisk kan " +"opgraderes (eller nedgraderes)." #. Type: note #. Description @@ -47,6 +42,8 @@ msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." msgstr "" +"Derfor vil den tidligere datamappe blive omdøbt til /var/lib/mysql-* og en " +"ny datamappe vil blive initialiseret i /var/lib/msyql." #. Type: note #. Description @@ -54,6 +51,8 @@ msgstr "" msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" +"Eksporter/importer venligst manuelt dine data (f.eks. med mysqldump) hvis " +"krævet." #. Type: note #. Description @@ -68,19 +67,18 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" +"Brug af MariaDB under NIS/YP kræver, at en mysql-brugerkonto tilføjes på det " +"lokale system med:" #. Type: note #. Description #: ../mariadb-server-10.5.templates:3001 -#, fuzzy -#| msgid "" -#| "You should also check the permissions and the owner of the /var/lib/mysql " -#| "directory:" msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" msgstr "" -"Du br ogs tjekke filrettighederne og ejerskabet af mappen /var/lib/mysql:" +"Du bør også kontrollere filrettighederne og ejerskabet af mappen /var/lib/" +"mysql:" #. Type: boolean #. Description @@ -107,88 +105,5 @@ msgid "" "the data should be kept." msgstr "" "Hvis du fjerner MariaDB-pakken for senere at installere en nyere version, " -"eller hvis en anden mariadb-server-pakke allerede benytter den, br dataene " +"eller hvis en anden mariadb-server-pakke allerede benytter den, bør dataene " "bevares." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Selvom det ikke krves, anbefales det kraftigt, at du stter en adgangskode " -"for MariaDB's administrationsbruger \"root\"." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "Hvis du lader dette felt st tomt, vil adgangskoden ikke blive ndret." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -#, fuzzy -#| msgid "New password for the MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Ny adgangskode for MariaDB's \"root\"-bruger:" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Kunne ikke stte adgangskoden for MariaDB's \"root\"-bruger" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"Der opstod en fejl, da adgangskoden for MariaDB's administrationsbruger blev " -"forsgt ndret. Dette kan vre sket, fordi brugeren allerede har en " -"adgangskode, eller fordi der var problemer med at kommunikere med MariaDB-" -"serveren." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "You should check the account's password after the package installation." -msgstr "Du br tjekke kontoens adgangskode efter pakkeinstallationen." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " -#| "more information." -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" -"Se filen /usr/share/doc/mariadb-server-10.5/README.Debian for yderligere " -"oplysninger." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" diff --git a/debian/po/de.po b/debian/po/de.po index 253986ff9a5..23a0f6b3eb2 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -1,37 +1,27 @@ -# translation of mysql-dfsg-5.1_5.1.37-1_de.po to Deutsch -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -# Developers do not need to manually edit POT or PO files. -# +# German translation of mariadb-10.5 10.0.13-1 # Alwin Meschede , 2006, 2007. # Thomas Mueller , 2009. +# Chris Leick , 2014-2016. +# msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-5.1_5.1.37-1_de\n" +"Project-Id-Version: mariadb 10.0.25-1\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" -"PO-Revision-Date: 2009-08-27 22:41+0200\n" -"Last-Translator: Thomas Mueller \n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2016-05-12 22:39+0100\n" +"Last-Translator: Chris Leick \n" "Language-Team: german \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: note #. Description #: ../mariadb-server-10.5.templates:2001 msgid "The old data directory will be saved at new location" -msgstr "" +msgstr "Das alte Datenverzeichnis wird an einer neuen Stelle gespeichert" #. Type: note #. Description @@ -41,6 +31,9 @@ msgid "" "indicates a database binary format version that cannot automatically be " "upgraded (or downgraded)." msgstr "" +"Auf diesem System gibt es bereits eine Datei namens /var/lib/mysql/debian-*." +"flag. Die Zahl gibt eine Binärformatversion der Datenbank an, von der nicht " +"automatisch ein Upgrade (oder Downgrade) durchgeführt werden kann." #. Type: note #. Description @@ -49,6 +42,8 @@ msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." msgstr "" +"Daher wird das vorherige Datenverzeichnis in /var/lib/mysql-* umbenannt und " +"unter /var/lib/mysql wird ein neues Datenverzeichnis initialisiert." #. Type: note #. Description @@ -56,6 +51,8 @@ msgstr "" msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" +"Bitte exportieren/importieren Sie im Bedarfsfall Ihre Daten (z.B. mit " +"Mysqldump)." #. Type: note #. Description @@ -70,8 +67,8 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" -"Falls MariaDB mit NIS/YP genutzt wird, ist ein »mysql«-Benutzerkonto auf dem " -"lokalen System notwendig:" +"Falls MariaDB mit NIS/YP genutzt wird, muss ein »mysql«-Benutzerkonto auf " +"dem lokalen System hinzugefügt werden mit:" #. Type: note #. Description @@ -107,89 +104,6 @@ msgid "" "recent version or if a different mariadb-server package is already using it, " "the data should be kept." msgstr "" -"Falls geplant ist, nur eine höhere Version von MariaDB zu installieren oder " -"ein anderes mariadb-server-Paket dieses bereits benutzt, sollten die Daten " -"behalten werden." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Neues Passwort für den MariaDB »root«-Benutzer:" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Obwohl es nicht zwingend erforderlich ist, wird nachdrücklich empfohlen für " -"den administrativen MariaDB »root«-Benutzer ein Passwort zu setzen." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "If this field is left blank, the password will not be changed." -msgstr "Wenn dieses Feld freigelassen wird, wird das Passwort nicht geändert." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Wiederholen Sie das Passwort für den MariaDB-»root«-Benutzer:" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Konnte für den MariaDB-»root«-Benutzer kein Passwort setzen" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"Beim setzen des Passworts für den administrativen MariaDB-Benutzer ist ein " -"Fehler aufgetreten. Dies könnte daran liegen, dass der Benutzer bereits ein " -"Passwort hat oder dass es ein Problem mit der Kommunikation mit dem MariaDB-" -"Server gibt." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "You should check the account's password after the package installation." -msgstr "" -"Sie sollten das Passwort des administrativen Benutzers nach der " -"Paketinstallation prüfen." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-5.1/README.Debian file for " -#| "more information." -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" -"Für weitere Informationen lesen Sie /usr/share/doc/mariadb-server-5.1/README." -"Debian." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "Passwort-Eingabefehler" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" -"Die beiden von Ihnen eingegebenen Passwörter sind nicht identisch. Bitte " -"erneut versuchen." +"Falls geplant ist, das MariaDB-Paket zu entfernen, um lediglich eine höhere " +"Version zu installieren oder ein anderes mariadb-server-Paket die Daten " +"benutzt, sollten diese beibehalten werden." diff --git a/debian/po/es.po b/debian/po/es.po index 9e7e561693b..32f4d830106 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -1,12 +1,12 @@ -# mysql-dfsg-5 translation to spanish -# Copyright (C) 2005-2007 Software in the Public Interest, SPI Inc. -# This file is distributed under the same license as the XXXX package. +# mariadb translation to spanish +# Copyright (C) 2005-2016 Software in the Public Interest, SPI Inc. +# This file is distributed under the same license as the mariadb package. # # Changes: # - Initial translation # Jesus Aneiros, 2006 # - Updated -# Javier Fernandez-Sanguino, 2006-2007 +# Javier Fernandez-Sanguino, 2006-2007, 2012, 2016 # - Revision # Nacho Barrientos Arias # Fernando Cerezal @@ -16,7 +16,7 @@ # Javier Fernandez-Sanguino # # -# Traductores, si no conoce el formato PO, merece la pena leer la +# Traductores, si no conoce el formato PO, merece la pena leer la # documentación de gettext, especialmente las secciones dedicadas a este # formato, por ejemplo ejecutando: # info -n '(gettext)PO Files' @@ -41,20 +41,22 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1_5.0.24-3\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" -"PO-Revision-Date: 2007-05-28 22:21+0200\n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2016-04-30 21:26+0200\n" "Last-Translator: Javier Fernández-Sanguino \n" "Language-Team: Debian l10 Spanish \n" -"Language: \n" +"Language: Spanish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-POFile-SpellExtra: YP mariadb lib ej server flag mysqldump mysql var NIS\n" +"X-POFile-SpellExtra: MariaDB\n" #. Type: note #. Description #: ../mariadb-server-10.5.templates:2001 msgid "The old data directory will be saved at new location" -msgstr "" +msgstr "Se guardará el directorio antiguo de datos a la nueva ubicación" #. Type: note #. Description @@ -64,6 +66,9 @@ msgid "" "indicates a database binary format version that cannot automatically be " "upgraded (or downgraded)." msgstr "" +"Se ha encontrado un archivo «/var/lib/mysql/debian-*.flag» en el sistema. " +"Este número indica una versión de base de datos en formato binario que no " +"puede ser subirse (o bajarse) de versión automáticamente." #. Type: note #. Description @@ -72,6 +77,8 @@ msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." msgstr "" +"Por tanto, el archivo de datos anterior se renombrará a «/var/lib/mysql-*» y " +"se inicializará un nuevo directorio de datos en «/var/lib/mysql»." #. Type: note #. Description @@ -79,6 +86,8 @@ msgstr "" msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" +"Si lo necesita, tendrá que exportar e importar sus datos manualmente (p.ej. " +"con mysqldump)." #. Type: note #. Description @@ -93,14 +102,12 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" +"Para utilizar MariaDB bajo NIS/YP es necesario añadir una cuenta de usuario " +"mysql en el sistema local con:" #. Type: note #. Description #: ../mariadb-server-10.5.templates:3001 -#, fuzzy -#| msgid "" -#| "You should also check the permissions and the owner of the /var/lib/mysql " -#| "directory:" msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" @@ -135,88 +142,3 @@ msgstr "" "Debería mantener los datos si tiene planificado instalar una versión de " "MariaDB más reciente o si hay un paquete «mariadb-server» distinto que los " "está utilizando." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nueva contraseña para el usuario «root» de MariaDB:" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Se recomienda que configure una contraseña para el usuario " -"«root» (administrador) de MariaDB, aunque no es obligatorio." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "No se modificará la contraseña si deja el espacio en blanco." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -#, fuzzy -#| msgid "New password for the MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Nueva contraseña para el usuario «root» de MariaDB:" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "No se pudo fijar la contraseña para el usuario «root» de MariaDB" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"Se produjo un error mientras intentaba fijar la contraseña para el usuario " -"administrador de MariaDB. Esto puede haber sucedido porque la cuenta ya " -"tenía una contraseña o porque se produjo un error de comunicación con el " -"servidor MariaDB." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "You should check the account's password after the package installation." -msgstr "" -"Debería comprobar la contraseña de la cuenta después de la instalación del " -"paquete." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " -#| "more information." -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" -"Consulte /usr/share/doc/mariadb-server-10.5/README.Debian para más " -"información." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" diff --git a/debian/po/eu.po b/debian/po/eu.po index 49082c9059c..d13eb07c53a 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: eu\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2009-07-29 11:59+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -102,84 +102,3 @@ msgstr "" "MariaDB paketea beranduago bertsio berriago bat instalatzeko kentzen ari " "bazara, edo beste mariadb-server pakete bat berau erabiltzen ari bada, " "datuak mantendu egin beharko lirateke." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "MariaDB \"root\" erabiltzailearen pasahitz berria:" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Derrigorrezkoa ez denean, oso gomendagarria da MariaDB administratzaile " -"\"root\" erabiltzaileari pasahitz bat ezartzea." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "Eremua hau zurian utziaz gero ez da pasahitza aldatuko." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Errepikatu MariaDB \"root\" erabiltzailearen pasahitza:" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Ezin da MariaDB \"root\" erabiltzailearen pasahitza ezarri" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"Errore bat gertatu da MariaDB administratzaile kontuaren pasahitza " -"ezartzean. Hau erabiltzaileak dagoeneko pasahitz bat duelako edo MariaDB " -"zerbitzariarekiko konexioan erroreak daudelako gertatu daiteke." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "You should check the account's password after the package installation." -msgstr "" -"Kontuaren pasahitza egiaztatu beharko zenuke paketea instalatu aurretik." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -#| "more information." -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" -"Mesedez irakurri /usr/share/doc/mariadb-server-10.5/README.Debian fitxategia " -"xehetasun gehiagorako." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "Pasahitz sarrera errorea" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "Idatzi dituzun bi pasahitzak ez dira berdina. Mesedez saiatu berriz." diff --git a/debian/po/fr.po b/debian/po/fr.po index ef2e74058bd..9da3302a0e8 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -1,30 +1,31 @@ -# Translation of mysql-dfsg-* debconf templates to French -# Copyright (C) 2004-2009 Debian French l10n team -# This file is distributed under the same license as the mysql-dfsg-* packages. +# Translation of mariadb-10.5 debconf templates to French +# Copyright (C) 2004-2016 Debian French l10n team +# This file is distributed under the same license as the mariadb-10.5 packages. # # Translators: -# Christian Perrier , 2004, 2006, 2007, 2009. +# Christian Perrier , 2004, 2006, 2007, 2009, 2013. +# Baptiste Jammet , 2016. msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" -"PO-Revision-Date: 2009-08-08 14:56+0200\n" -"Last-Translator: Christian Perrier \n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2016-12-31 18:35+0100\n" +"Last-Translator: Baptiste Jammet \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "debian.org>\n" -"X-Generator: Lokalize 0.3\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" #. Type: note #. Description #: ../mariadb-server-10.5.templates:2001 msgid "The old data directory will be saved at new location" -msgstr "" +msgstr "L'ancien répertoire de données sera sauvegardé à un nouvel emplacement" #. Type: note #. Description @@ -34,6 +35,9 @@ msgid "" "indicates a database binary format version that cannot automatically be " "upgraded (or downgraded)." msgstr "" +"Un fichier nommé /var/lib/mysql/debian-*.flag existe déjà sur ce système. Le " +"numéro indique une version de base de données au format binaire qui ne peut " +"pas être mise à niveau (ou rétrogradée) automatiquement." #. Type: note #. Description @@ -42,6 +46,8 @@ msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." msgstr "" +"L'ancien répertoire sera renommé en /var/lib/mysql-* et un nouveau " +"répertoire de données sera initialisé à l'emplacement /var/lib/mysql." #. Type: note #. Description @@ -49,6 +55,8 @@ msgstr "" msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" +"Veuillez exporter puis importer vos données manuellement si besoin (par " +"exemple avec mysqldump)." #. Type: note #. Description @@ -100,88 +108,6 @@ msgid "" "recent version or if a different mariadb-server package is already using it, " "the data should be kept." msgstr "" -"Si vous prévoyez d'installer une version plus récente de MariaDB ou si un " -"autre paquet mariadb-server les utilise déjà, vous devriez les conserver." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nouveau mot de passe du superutilisateur de MariaDB :" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Il est très fortement recommandé d'établir un mot de passe pour le compte " -"d'administration de MariaDB (« root »)." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "If this field is left blank, the password will not be changed." -msgstr "Si ce champ est laissé vide, le mot de passe ne sera pas changé." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Confirmation du mot de passe du superutilisateur de MariaDB :" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "" -"Impossible de changer le mot de passe de l'utilisateur « root » de MariaDB" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"Une erreur s'est produite lors du changement de mot de passe du compte " -"d'administration. Un mot de passe existait peut-être déjà ou il n'a pas été " -"possible de communiquer avec le serveur MariaDB." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "You should check the account's password after the package installation." -msgstr "" -"Vous devriez vérifier le mot de passe de ce compte après l'installation du " -"paquet." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -#| "more information." -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" -"Veuillez consulter le fichier /usr/share/doc/mysql-server-10.5/README.Debian " -"pour plus d'informations." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "Erreur de saisie du mot de passe" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" -"Le mot de passe et sa confirmation ne sont pas identiques. Veuillez " -"recommencer." +"Si vous retirez le paquet MariaDB en vue d'en installer une version plus " +"récente ou si un autre paquet mariadb-server les utilise déjà, vous devriez " +"les conserver." diff --git a/debian/po/gl.po b/debian/po/gl.po index 8c309995001..0a6492eff19 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2007-04-20 09:44+0200\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -100,88 +100,3 @@ msgstr "" "Se está a eliminar o paquete MariaDB para instalar despois unha versión máis " "recente ou se xa hai un paquete mariadb-server diferente a empregalo, " "debería conservar os datos." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Aínda que non é obrigatorio, recoméndase encarecidamente que estableza un " -"contrasinal para o usuario administrativo \"root\" de MariaDB." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "Se deixa o campo en branco, non se ha cambiar o contrasinal." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -#, fuzzy -#| msgid "New password for the MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Novo contrasinal para o usuario \"root\" de MariaDB:" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Non se puido establecer o contrasinal do usuario \"root\" de MariaDB" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"Houbo un erro ao establecer o contrasinal do usuario administrativo de " -"MariaDB. Puido ocorrer porque o usuario xa teña un contrasinal ou debido a " -"un problema de comunicacións co servidor MariaDB." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "You should check the account's password after tha package installation." -msgid "You should check the account's password after the package installation." -msgstr "Debería comprobar o contrasinal da conta trala instalación do paquete." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " -#| "more information." -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" -"Consulte o ficheiro /usr/share/doc/mariadb-server-10.5/README.Debian para " -"máis información." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" diff --git a/debian/po/it.po b/debian/po/it.po index 255db97e902..9c35f834c05 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -1,14 +1,13 @@ -# 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 , 2006 - 2009. +# Italian (it) translation of debconf templates for mariadb-10.5 +# This file is distributed under the same license as the mariadb-10.5 package. +# Luca Monducci , 2006-2017. # msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-5.1 5.1.37 italian debconf templates\n" +"Project-Id-Version: mariadb-10.5 10.0.13 italian debconf templates\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" -"PO-Revision-Date: 2009-08-08 11:03+0200\n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2017-083-20 20:29+0100\n" "Last-Translator: Luca Monducci \n" "Language-Team: Italian \n" "Language: it\n" @@ -20,7 +19,7 @@ msgstr "" #. Description #: ../mariadb-server-10.5.templates:2001 msgid "The old data directory will be saved at new location" -msgstr "" +msgstr "La vecchia directory data verrà salvata in una nuova posizione" #. Type: note #. Description @@ -30,6 +29,9 @@ msgid "" "indicates a database binary format version that cannot automatically be " "upgraded (or downgraded)." msgstr "" +"Su questo sistema esiste già un file con nome /var/lib/mysql/debian-*.flag. " +"Il numero indica una versione del database in formato binario che non è " +"possibile promuovere (o retrocedere) a una nuova versione automaticamente." #. Type: note #. Description @@ -38,6 +40,8 @@ msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." msgstr "" +"Di conseguenza la precedene directory data verrà rinominata in /var/lib/" +"mysql-* e verrà preparata una nuova directory data in /var/lib/mysql." #. Type: note #. Description @@ -45,6 +49,8 @@ msgstr "" msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" +"Se necessario eseguire manualmente l'export/import (per esempio con " +"mysqldump) dei propri dati." #. Type: note #. Description @@ -59,8 +65,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 @@ -69,8 +75,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 @@ -85,8 +91,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 @@ -99,83 +105,3 @@ msgstr "" "Se si rimuove il pacchetto MariaDB per poi installare una versione più " "recente oppure se sono già in uso da un altro pacchetto mariadb-server, i " "dati non devono essere eliminati." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nuova password per l'utente «root» di MariaDB:" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -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 " -"l'utente d'amministrazione «root» di MariaDB." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "If this field is left blank, the password will not be changed." -msgstr "Se questo campo è lasciato vuoto, la password non viene cambiata." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Ripetere la password per l'utente «root» di MariaDB:" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Impossibile impostare la password per l'utente «root» di MariaDB" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"Si è verificato un errore durante l'impostazione della password per l'utente " -"d'amministrazione di MariaDB. Questo può essere accaduto perché l'utente ha " -"già una password oppure a causa di un problema di connessione con il server " -"MariaDB." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "You should check the account's password after the package installation." -msgstr "" -"Al termine dell'installazione si deve verificare la password dell'account." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -#| "more information." -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" -"Per maggiori informazioni si consulti il file /usr/share/doc/mariadb-" -"server-10.5/README.Debian." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "Errore di inserimento della password" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "Le due password inserite sono diverse. Riprovare." diff --git a/debian/po/ja.po b/debian/po/ja.po index 2f3c1359601..a39bdaf0594 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -10,26 +10,29 @@ # or http://www.debian.org/intl/l10n/po-debconf/README-trans # # Developers do not need to manually edit POT or PO files. -# +# Hideki Yamane (Debian-JP) , 2013. +# Takuma Yamada , 2016-2017. # msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n" +"Project-Id-Version: mariadb-10.5 10.0.32-1\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" -"PO-Revision-Date: 2009-09-01 08:25+0900\n" -"Last-Translator: Hideki Yamane (Debian-JP) \n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2016-05-01 11:27+0900\n" +"Last-Translator: Takuma Yamada \n" "Language-Team: Japanese \n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Gtranslator 2.91.6\n" #. Type: note #. Description #: ../mariadb-server-10.5.templates:2001 msgid "The old data directory will be saved at new location" -msgstr "" +msgstr "古いデータディレクトリは、新しい場所に保存されます" #. Type: note #. Description @@ -39,6 +42,9 @@ msgid "" "indicates a database binary format version that cannot automatically be " "upgraded (or downgraded)." msgstr "" +"/var/lib/mysql/debian-*.flag という名前のファイルがこのシステム上に存在しま" +"す。番号は、自動的にアップグレード (またはダウングレード) することができない" +"データベースバイナリフォーマットのバージョンを示します。" #. Type: note #. Description @@ -47,6 +53,8 @@ msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." msgstr "" +"そのため、以前のデータディレクトリは /var/lib/mysql-* にリネームされ、新しい" +"データディレクトリは /var/lib/mysql に初期化されます。" #. Type: note #. Description @@ -54,6 +62,8 @@ msgstr "" msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" +"必要に応じて、(例えば mysqldump で) データを手動でエクスポート/インポートして" +"ください。" #. Type: note #. Description @@ -106,81 +116,3 @@ msgstr "" "後でより新しいバージョンのものをインストールしようとするために MariaDB パッ" "ケージを削除しようとしている、あるいは別の mariadb-server パッケージを既に" "使っている場合、データは保持する必要があります。" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"強制ではありませんが、MariaDB を管理する \"root\" ユーザのパスワードを設定す" -"ることを強くお勧めします。" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "If this field is left blank, the password will not be changed." -msgstr "この値を空のままにしておいた場合は、パスワードは変更されません。" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "MariaDB の \"root\" ユーザに対する新しいパスワード:" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "MariaDB の \"root\" ユーザのパスワードを設定できません" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"MariaDB の管理者ユーザに対してパスワードを設定しようとした際、エラーが発生し" -"ました。これは既に管理者ユーザにパスワードが設定されていたか、MariaDB サーバ" -"との接続に問題があったためだと思われます。" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "You should check the account's password after the package installation." -msgstr "" -"パッケージのインストール後、アカウントのパスワードを確認する必要があります。" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -#| "more information." -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" -"詳細は /usr/share/doc/mariadb-server-10.5/README.Debian を参照してください。" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "パスワード入力エラー" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "入力された二つのパスワードが一致しません。再入力してください。" diff --git a/debian/po/nb.po b/debian/po/nb.po index 742b58dd944..d6d864d62d4 100644 --- a/debian/po/nb.po +++ b/debian/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mysql_nb\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2007-02-18 12:13+0100\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" @@ -101,92 +101,3 @@ msgstr "" "Dette skriptet skal til å fjerne data-mappa /var/lib/mysql. Denne mappa bør " "beholdes hvis det bare skal installeres en høyere MariaDB-versjon, eller " "hvis en annen mariadb-server-pakke allerede bruker den." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -#, fuzzy -#| msgid "New password for MySQL \"root\" user:" -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nytt passord for MariaDBs «root»-bruker:" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -#, fuzzy -#| msgid "" -#| "It is highly recommended that you set a password for the MySQL " -#| "administrative \"root\" user." -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Det anbefales sterkt at du oppgir et passord for den administrative «root»-" -"brukeren i MariaDB." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "If this field is left blank, the password will not be changed." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -#, fuzzy -#| msgid "New password for MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Nytt passord for MariaDBs «root»-bruker:" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "Unable to set password for MySQL \"root\" user" -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Klarer ikke angi passord for MariaDBs «root»-bruker" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "It seems an error occurred while setting the password for the MySQL " -#| "administrative user. This may have happened because the user already has " -#| "a password, or because there was a problem communicating with the MySQL " -#| "server." -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"Det ser ut til at det oppsto en feil mens det ble satt et passord for " -"MariaDBs administrative bruker. Dette kan være fordi brukeren allerede har " -"et passord, eller fordi det var et kommunikasjonsproblem med MariaDB-" -"tjeneren." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "You should check the account's password after the package installation." -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" diff --git a/debian/po/nl.po b/debian/po/nl.po index 6473df81055..93c4a88ef31 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -1,26 +1,29 @@ -# Dutch mysql-dfsg-5.1 po-debconf translation, +# Dutch mariadb-10 po-debconf translation, # Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the mysql-dfsg-5.1 package. +# This file is distributed under the same license as the mariadb-10.5 package. # Vincent Zweije , 2006. +# Frans Spiesschaert , 2014, 2016, 2018. # msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-5.1 5.0.30-1\n" +"Project-Id-Version: mariadb-10.2.7-1\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" -"PO-Revision-Date: 2006-02-19 10.50+0100\n" -"Last-Translator: Thijs Kinkhorst \n" -"Language-Team: Debian-Dutch \n" -"Language: \n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2018-03-29 21:25+0200\n" +"Last-Translator: Frans Spiesschaert \n" +"Language-Team: Debian Dutch l10n Team \n" +"Language: nl\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.7\n" #. Type: note #. Description #: ../mariadb-server-10.5.templates:2001 msgid "The old data directory will be saved at new location" -msgstr "" +msgstr "De oude data-map zal op een nieuwe locatie bewaard worden" #. Type: note #. Description @@ -30,6 +33,9 @@ msgid "" "indicates a database binary format version that cannot automatically be " "upgraded (or downgraded)." msgstr "" +"Er bestaat op dit systeem een bestand met als naam /var/lib/mysql/debian-*." +"flag. Het nummer duidt op een versie van het binair database-bestandsformaat " +"dat niet automatisch opgewaardeerd (of gedegradeerd) kan worden." #. Type: note #. Description @@ -38,6 +44,8 @@ msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." msgstr "" +"Daarom zal de vroegere data-map hernoemd worden naar /var/lib/mysql-* en zal " +"er een nieuwe data-map geïnitialiseerd worden op /var/lib/mysql." #. Type: note #. Description @@ -45,14 +53,14 @@ msgstr "" msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" +"Gelieve uw data zo nodig handmatig te exporteren/importeren (bijv. met " +"mysqldump)." #. Type: note #. Description #: ../mariadb-server-10.5.templates:3001 -#, fuzzy -#| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" -msgstr "Belangrijke opmerking voor gebruikers van NIS/YP!" +msgstr "Belangrijke opmerking voor gebruikers van NIS/YP" #. Type: note #. Description @@ -61,6 +69,8 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" +"Het gebruik van MariaDB onder NIS/YP vereist dat een mysql gebruikersaccount " +"wordt toegevoegd aan het lokale systeem met:" #. Type: note #. Description @@ -69,12 +79,14 @@ msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" msgstr "" +"U moet ook controleren wie eigenaar is en wat de gebruikersrechten zijn van " +"de map /var/lib/mysql:" #. Type: boolean #. Description #: ../mariadb-server-10.5.templates:4001 msgid "Remove all MariaDB databases?" -msgstr "" +msgstr "Wilt u alle MariaDB-databases verwijderen?" #. Type: boolean #. Description @@ -83,110 +95,17 @@ msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." msgstr "" +"De map /var/lib/mysql die de MariaDB-databases bevat staat op het punt om " +"verwijderd te worden." #. Type: boolean #. Description #: ../mariadb-server-10.5.templates:4001 -#, fuzzy -#| msgid "" -#| "The script is about to remove the data directory /var/lib/mysql. If it is " -#| "planned to just install a higher MySQL version or if a different mysql-" -#| "server package is already using it, the data should be kept." msgid "" "If you're removing the MariaDB package in order to later install a more " "recent version or if a different mariadb-server package is already using it, " "the data should be kept." msgstr "" -"Het script staat op het punt de datamap /var/lib/mysql te verwijderen. Als " -"het plan alleen maar is om een hogere MariaDB versie te installeren, of als " -"een ander mariadb-serverpakket de datamap al gebruikt, dan zou de data " -"moeten worden behouden." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -#, fuzzy -#| msgid "New password for MySQL \"root\" user:" -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -#, fuzzy -#| msgid "" -#| "It is highly recommended that you set a password for the MySQL " -#| "administrative \"root\" user." -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Het wordt sterk aangeraden een wachtwoord in te stellen voor de " -"administratieve MariaDB \"root\"-gebruiker." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "If this field is left blank, the password will not be changed." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -#, fuzzy -#| msgid "New password for MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Nieuw wachtwoord voor de MariaDB \"root\"-gebruiker:" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "Unable to set password for MySQL \"root\" user" -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Kan het wachtwoord voor de MariaDB \"root\"-gebruiker niet instellen" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "It seems an error occurred while setting the password for the MySQL " -#| "administrative user. This may have happened because the user already has " -#| "a password, or because there was a problem communicating with the MySQL " -#| "server." -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"Er lijkt een fout te zijn opgetreden bij het instellen van het wachtwoord " -"van de MariaDB administratieve gebruiker. Dat kan komen doordat de gebruiker " -"al een wachtwoord heeft, of omdat er een probleem was bij het communiceren " -"met de MariaDB server." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "You should check the account's password after the package installation." -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" +"Als u het MariaDB-pakket verwijdert om later een meer recente versie te " +"installeren of als een ander mariadb-serverpakket het al gebruikt, zou de " +"data behouden moeten worden." diff --git a/debian/po/pt.po b/debian/po/pt.po index b8f34f107c8..4141ad57182 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -1,26 +1,28 @@ # Portuguese translation for mysql-dfsg-5.1's debconf messages # Copyright (C) 2006 Miguel Figueiredo -# This file is distributed under the same license as the mysql-dfsg-5.1 package. -# Miguel Figueiredo +# This file is distributed under the same license as the mariadb package. +# Miguel Figueiredo , 2014 +# Rui Branco , 2017. # msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-5.1\n" +"Project-Id-Version: mariadb-10.5\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" -"PO-Revision-Date: 2007-05-05 21:01+0100\n" -"Last-Translator: Miguel Figueiredo \n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2017-08-06 10:00+0100\n" +"Last-Translator: Rui Branco \n" "Language-Team: Portuguese \n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: note #. Description #: ../mariadb-server-10.5.templates:2001 msgid "The old data directory will be saved at new location" -msgstr "" +msgstr "O antigo directório de data será guardado num novo local" #. Type: note #. Description @@ -30,6 +32,9 @@ msgid "" "indicates a database binary format version that cannot automatically be " "upgraded (or downgraded)." msgstr "" +"Já existe um ficheiro /var/lib/mysql/debian-*.flag no sistema. O número " +"indica uma base de dados de formato binário que não pode ser actualizada " +"automaticamente (ou baixar de versão)." #. Type: note #. Description @@ -38,6 +43,8 @@ msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." msgstr "" +"Assim o directório de dados anterior será renomeado para /var/lib/mysql-* e " +"um novo directório de dados será inicializado em /var/lib/mysql." #. Type: note #. Description @@ -45,12 +52,14 @@ msgstr "" msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" +"Por favor, se necessário, exporte/importe manualmente os seus dados (p.ex. " +"com mysqldump)." #. Type: note #. Description #: ../mariadb-server-10.5.templates:3001 msgid "Important note for NIS/YP users" -msgstr "Nota importante para utilizadores de NIS/YP" +msgstr "Nota importante para os utilizadores de NIS/YP" #. Type: note #. Description @@ -59,19 +68,17 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" +"Utilizar MariaDB com NIS/YP necessita de uma conta de utilizador de mysql " +"para ser acrescentada ao sistema local com:" #. Type: note #. Description #: ../mariadb-server-10.5.templates:3001 -#, fuzzy -#| msgid "" -#| "You should also check the permissions and the owner of the /var/lib/mysql " -#| "directory:" msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" msgstr "" -"Deve também verificar as permissões e o dono do directório /var/lib/mysql :" +"Deve também verificar as permissões e o dono do directório /var/lib/mysql:" #. Type: boolean #. Description @@ -97,96 +104,6 @@ msgid "" "recent version or if a different mariadb-server package is already using it, " "the data should be kept." msgstr "" -"Se está a remover o pacote MariaDB de modo a posteriormente instalar uma " -"versão mais recente ou se um pacote mariadb-server já está os está a " -"utilizar, os dados devem ser mantidos." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Embora não seja mandatório, É fortemente recomendado que defina uma palavra-" -"passe para o utilizador administrativo \"root\" do MariaDB." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "" -"Se esse campo for deixado em branco, a palavra-passe não irá ser alterada." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -#, fuzzy -#| msgid "New password for the MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Nova palavra-passe para o utilizador \"root\" do MariaDB:" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "" -"Não foi possível definir a palavra-passe para o utilizador \"root\" do " -"MariaDB" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"Ocorreu um erro enquanto era definida a palavra-passe para o utilizador " -"administrativo do MariaDB. Isto pode ter acontecido porque a cona já tem uma " -"palavra-passe, ou porque ocorreu um problema ao comunicação com o servidor " -"MariaDB." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "You should check the account's password after tha package installation." -msgid "You should check the account's password after the package installation." -msgstr "" -"Você deve verificar a palavra-passe da conta após a instalação do pacote." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " -#| "more information." -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" -"Para mais informação por favor leia o ficheiro /usr/share/doc/mariadb-" -"server-10.5/README.Debian." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" +"Se está a remover o pacote MariaDB de forma a posteriormente instalar uma " +"versão mais recente ou se um pacote mariadb-server já o está a utilizar, " +"então os dados devem ser mantidos." diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 7df742ca842..f644e9c30d1 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -1,29 +1,27 @@ -# Brazilian Portuguese (pt_BR) debconf template translation for -# Debian's mysql-dfsg source package. -# Debian-BR Project -# André Luís Lopes, , 2004 -# André Luís Lopes, , 2006 -# André Luís Lopes, , 2007 +# Debconf translations for mariadb-10.5. +# This file is distributed under the same license as the mariadb-10.5 package. +# André Luís Lopes, , 2005-2007. +# Adriano Rafael Gomes , 2015-2016. # msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-5.1\n" +"Project-Id-Version: mariadb-10.5\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" -"PO-Revision-Date: 2007-04-21 15:59-0300\n" -"Last-Translator: André Luís Lopes \n" -"Language-Team: Debian-BR Project \n" -"Language: \n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2016-04-30 16:16-0300\n" +"Last-Translator: Adriano Rafael Gomes \n" +"Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"pt_BR utf-8\n" #. Type: note #. Description #: ../mariadb-server-10.5.templates:2001 msgid "The old data directory will be saved at new location" -msgstr "" +msgstr "O diretório de dados antigo será salvo em novo local" #. Type: note #. Description @@ -33,6 +31,9 @@ msgid "" "indicates a database binary format version that cannot automatically be " "upgraded (or downgraded)." msgstr "" +"Um arquivo chamado /var/lib/mysql/debian-*.flag já existe nesse sistema. O " +"número indicou uma versão de formato binário de banco de dados que não pode " +"ser atualizada (ou rebaixada) automaticamente." #. Type: note #. Description @@ -41,6 +42,8 @@ msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." msgstr "" +"Portanto, o diretório de dados anterior será renomeado para /var/lib/mysql-* " +"e um novo diretório de dados será inicializado em /var/lib/mysql." #. Type: note #. Description @@ -48,6 +51,8 @@ msgstr "" msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" +"Por favor, exporte/importe manualmente seus dados (por exemplo, com " +"mysqldump) se necessário." #. Type: note #. Description @@ -62,19 +67,18 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" +"Usar o MariaDB sob NIS/YP requer que uma conta de usuário mysql seja " +"adicionada ao sistema local com:" #. Type: note #. Description #: ../mariadb-server-10.5.templates:3001 -#, fuzzy -#| msgid "" -#| "You should also check the permissions and the owner of the /var/lib/mysql " -#| "directory:" msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" msgstr "" -"Você deverá também checar as permissões e o dono do diretório /var/lib/mysql:" +"Você deverá também verificar as permissões e o dono do diretório /var/lib/" +"mysql:" #. Type: boolean #. Description @@ -103,89 +107,3 @@ msgstr "" "Caso você esteja removendo o pacote MariaDB para posteriormente instalar uma " "versão mais recente ou, caso uma versão diferente do pacote mariadb-server " "esteja sendo utilizada, os dados deverão ser mantidos." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nova senha para o usuário \"root\" do MariaDB:" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Apesar de não ser mandatório, é altamente recomendado que você defina uma " -"senha para o usuário administrativo \"root\" do MariaDB." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -#, fuzzy -#| msgid "If that field is left blank, the password will not be changed." -msgid "If this field is left blank, the password will not be changed." -msgstr "Caso este campo seja deixado em branco, a senha não sera mudada." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -#, fuzzy -#| msgid "New password for the MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Nova senha para o usuário \"root\" do MariaDB:" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Impossível definir senha para o usuário \"root\" do MariaDB" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"Um erro ocorreu durante a definição da senha para o usuário administrativo " -"do MariaDB. Isso pode ter acontecido devido a esse usuário já possuir uma " -"senha definida ou devido a ocorrência de um problema de comunicação com o " -"servidor MariaDB." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "You should check the account's password after tha package installation." -msgid "You should check the account's password after the package installation." -msgstr "Você deverá checar a senha dessa conta após a instalação deste pacote." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mysql-server-5.1/README.Debian file for " -#| "more information." -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" -"Por favor, leia o arquivo /usr/share/doc/mariadb-server-10.5/README.Debian " -"para maiores informações." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" diff --git a/debian/po/ro.po b/debian/po/ro.po index e54ed9ba6ba..a9a6a6b665d 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: po-debconf://mysql-dfsg\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: 2006-12-20 21:27+0200\n" "Last-Translator: stan ioan-eugen \n" "Language-Team: romanian \n" @@ -101,92 +101,3 @@ msgstr "" "Scriptul urmează să şteargă directorul de date /var/lib/mysql. Dacă plănuiţi " "doar să instalaţi o versiune nouă MariaDB sau datele sunt folosite de către " "un alt pachet mariadb-server, atunci ar trebui păstraţi datele." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -#, fuzzy -#| msgid "New password for MySQL \"root\" user:" -msgid "New password for the MariaDB \"root\" user:" -msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -#, fuzzy -#| msgid "" -#| "It is highly recommended that you set a password for the MySQL " -#| "administrative \"root\" user." -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Este recomandat să stabiliţi o parolă pentru utilizatorul administrativ " -"„root” al MariaDB." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "If this field is left blank, the password will not be changed." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -#, fuzzy -#| msgid "New password for MySQL \"root\" user:" -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Noua parolă pentru utilizatorul „root” al MariaDB:" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "Unable to set password for MySQL \"root\" user" -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Nu s-a putut stabili parola pentru utilizatorul „root” al MariaDB" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "It seems an error occurred while setting the password for the MySQL " -#| "administrative user. This may have happened because the user already has " -#| "a password, or because there was a problem communicating with the MySQL " -#| "server." -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"Se pare că a intervenit o eroare în stabilirea parolei pentru utilizatorul " -"administrativ al MariaDB. Acest lucru se poate întâmpla dacă utilizatorul " -"are deja o parolă, sau a existat o problemă în comunicarea cu serverul " -"MariaDB." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "You should check the account's password after the package installation." -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" diff --git a/debian/po/ru.po b/debian/po/ru.po index 6198b7425c8..6d5e145082d 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -1,32 +1,22 @@ # translation of ru.po to Russian -# Russian messages: -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry'# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -# Developers do not need to manually edit POT or PO files. # # Ilgiz Kalmetev , 2003. # Yuriy Talakan' , 2005, 2006. # Yuriy Talakan' , 2007. -# Yuri Kozlov , 2009. +# Yuri Kozlov , 2009, 2014, 2016. msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-5.1 5.1.37-1\n" +"Project-Id-Version: mariadb-10.5 10.0.25-1\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" -"PO-Revision-Date: 2009-08-06 20:27+0400\n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2016-05-04 18:56+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -34,7 +24,7 @@ msgstr "" #. Description #: ../mariadb-server-10.5.templates:2001 msgid "The old data directory will be saved at new location" -msgstr "" +msgstr "Каталог со старыми данными будет сохранён в новом месте" #. Type: note #. Description @@ -44,6 +34,9 @@ msgid "" "indicates a database binary format version that cannot automatically be " "upgraded (or downgraded)." msgstr "" +"В системе найден файл /var/lib/mysql/debian-*.flag. Число представляет " +"версию двоичного формата базы данных, которую невозможно обновить " +"автоматически (или откатить к старой версии)." #. Type: note #. Description @@ -52,6 +45,9 @@ msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." msgstr "" +"В следствии этого, предыдущий каталог с данными будет переименован в /var/" +"lib/mysql-*, а в /var/lib/mysql будет инициализирован каталог для новых " +"данных." #. Type: note #. Description @@ -59,6 +55,8 @@ msgstr "" msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" +"Если нужно, выполните экспорт/импорт данных вручную (например, с помощью " +"mysqldump)." #. Type: note #. Description @@ -110,80 +108,3 @@ msgstr "" "Если вы удаляете пакет MariaDB для установки более новой версии MariaDB, или " "есть другие пакеты mariadb-server, использующие этот каталог, то данные " "лучше сохранить." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Новый пароль для MariaDB пользователя \"root\":" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Хотя и необязательно, но настоятельно рекомендуется установить пароль для " -"административного пользователя MariaDB \"root\"." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "If this field is left blank, the password will not be changed." -msgstr "Если оставить поле пустым, то пароль изменён не будет." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Повторите ввод пароля для MariaDB пользователя \"root\":" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Невозможно задать пароль MariaDB пользователю \"root\"" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"В процессе задания пароля административного MariaDB пользователя произошла " -"ошибка. Это могло произойти, если у пользователя уже был задан пароль, или " -"из-за проблем соединения с сервером MariaDB." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "You should check the account's password after the package installation." -msgstr "Проверьте пароль учётной записи после установки пакета." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -#| "more information." -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" -"Подробности см. в файле /usr/share/doc/mariadb-server-10.5/README.Debian." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "Ошибка ввода пароля" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "Два введённых пароля не одинаковы. Повторите ввод." diff --git a/debian/po/sv.po b/debian/po/sv.po index 9b74e3300ab..574d473be52 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -1,29 +1,28 @@ -# Translation of mysql-dfsg-5.1 debconf template to Swedish -# Copyright (C) 2009 Martin Bagge -# This file is distributed under the same license as the mysql-dfsg-5.1 package. +# Translation of mariadb-10.5 debconf template to Swedish +# Copyright (C) 2017 Martin Bagge +# This file is distributed under the same license as the mariadb-10.5 package. # # Andreas Henriksson , 2007 -# Martin Bagge , 2009 +# Martin Bagge , 2009, 2015, 2017 msgid "" msgstr "" "Project-Id-Version: mysql-dfsg-5.1 5.0.21-3\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" -"PO-Revision-Date: 2009-09-08 21:42+0100\n" -"Last-Translator: Martin Bagge \n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2017-03-23 09:20+0100\n" +"Last-Translator: Martin Bagge / brother \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Swedish\n" -"X-Poedit-Country: Sweden\n" +"X-Generator: Poedit 1.8.11\n" #. Type: note #. Description #: ../mariadb-server-10.5.templates:2001 msgid "The old data directory will be saved at new location" -msgstr "" +msgstr "Den gamla data-katalogen kommer att sparas till en ny plats" #. Type: note #. Description @@ -33,6 +32,9 @@ msgid "" "indicates a database binary format version that cannot automatically be " "upgraded (or downgraded)." msgstr "" +"En fil med namn på formatet /var/lib/mysql/debian-*.flag hittades i " +"systemet. Siffran indikerar ett binärformat på databasen som inte kan " +"uppgraderas (eller nedgraderas)." #. Type: note #. Description @@ -41,6 +43,8 @@ msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." msgstr "" +"Därför kommer den gamla data-katalogen att byta namn till /var/lib/mysql-* " +"och en ny katalog kommer att initieras på /var/lib/mysql." #. Type: note #. Description @@ -48,6 +52,8 @@ msgstr "" msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." msgstr "" +"Exportera/importera din data manuellt (exempelvis med mysqldump) om detta är " +"nödvändigt." #. Type: note #. Description @@ -102,82 +108,3 @@ msgstr "" "Om avinstallationen av MariaDB-paketet görs för att senare kunna installera " "en nyare version eller om en annan mariadb-server redan använder filerna ska " "de inte raderas." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "Nytt lösenord för MariaDBs \"root\"-användare:" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" -"Det är inte obligatoriskt men starkt rekommenderat att du sätter ett " -"lösenord för MariaDBs administrativa \"root\"-användare." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "If this field is left blank, the password will not be changed." -msgstr "Om detta fält lämnas tom kommer lösenordet inte att ändras." - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "Repetera lösenordet för MariaDBs \"root\"-användare:" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "Kunde inte sätta lösenord för MariaDBs \"root\"-användare" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" -"Ett fel uppstod när det skulle sättas ett lösenord för MariaDBs " -"administrativa användare (\"root\"). Detta kan ha skett för att användaren " -"redan har ett lösenord satt, eller på grund av problem med att kommunicera " -"med MariaDB-servern." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "You should check the account's password after the package installation." -msgstr "Du bör kontrollera kontots lösenord efter installationen av paketet." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -#, fuzzy -#| msgid "" -#| "Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -#| "more information." -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" -"Läs filen /usr/share/doc/mariadb-server-10.5/README.Debian för mer " -"information." - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "Fel vid inmatning av lösenord" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "De två lösenorden du angav stämde inte överrens. Prova igen." diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 225818688b3..22da4290b90 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,6 +1,6 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the mariadb-10.5 package. # FIRST AUTHOR , YEAR. # #, fuzzy @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mariadb-10.5\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -91,70 +91,3 @@ msgid "" "recent version or if a different mariadb-server package is already using it, " "the data should be kept." msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "If this field is left blank, the password will not be changed." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "You should check the account's password after the package installation." -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" diff --git a/debian/po/tr.po b/debian/po/tr.po index a4249bfe9c6..51adf72573e 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -1,26 +1,28 @@ # Turkish translation of mariadb-server. # This file is distributed under the same license as the mariadb-server package. # Gürkan Aslan , 2004 +# Atila KOÇ , 2015, 2017 # msgid "" msgstr "" -"Project-Id-Version: mysql-dfsg-4.1\n" +"Project-Id-Version: mariadb-10.5\n" "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n" -"POT-Creation-Date: 2016-10-08 01:26+0300\n" -"PO-Revision-Date: 2004-06-05 08:53+0300\n" -"Last-Translator: Gürkan Aslan \n" +"POT-Creation-Date: 2019-07-23 19:16-0300\n" +"PO-Revision-Date: 2017-03-16 13:16+0300\n" +"Last-Translator: Atila KOÇ \n" "Language-Team: Turkish \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 1.8.7.1\n" #. Type: note #. Description #: ../mariadb-server-10.5.templates:2001 msgid "The old data directory will be saved at new location" -msgstr "" +msgstr "Eski veritabanı dizini yeni konumuna kaydedilecektir" #. Type: note #. Description @@ -30,6 +32,9 @@ msgid "" "indicates a database binary format version that cannot automatically be " "upgraded (or downgraded)." msgstr "" +"Bu sistemde /var/lib/mysql/debian-*.flag adlı bir dosya bulunmaktadır. " +"Belirtilen numara kendiliğinden yükseltilemeyecek ya da alçaltılamayacak bir " +"ikilik veritabanı biçimini işaret etmektedir." #. Type: note #. Description @@ -38,21 +43,21 @@ msgid "" "Therefore the previous data directory will be renamed to /var/lib/mysql-* " "and a new data directory will be initialized at /var/lib/mysql." msgstr "" +"Önceki veri dizini /var/lib/mysql-* olarak yeniden adlandırılacak ve yeni " +"veri dizini /var/lib/mysql konumunda hazırlanacaktır." #. Type: note #. Description #: ../mariadb-server-10.5.templates:2001 msgid "" "Please manually export/import your data (e.g. with mysqldump) if needed." -msgstr "" +msgstr "Gerektiğinde verinizi elle (ör. mysqldump ile) içe/dışa aktarın." #. Type: note #. Description #: ../mariadb-server-10.5.templates:3001 -#, fuzzy -#| msgid "Important note for NIS/YP users!" msgid "Important note for NIS/YP users" -msgstr "NIS/YP kullanıcıları için önemli not!" +msgstr "NIS/YP kullanıcıları için önemli not" #. Type: note #. Description @@ -61,6 +66,8 @@ msgid "" "Using MariaDB under NIS/YP requires a mysql user account to be added on the " "local system with:" msgstr "" +"MariaDB'nin NIS/YP ile kullanılması için yerel sisteme aşağıdaki komut " +"çalıştırılarak mysql kullanıcı hesabının eklenmesi gereklidir:" #. Type: note #. Description @@ -69,12 +76,14 @@ msgid "" "You should also check the permissions and ownership of the /var/lib/mysql " "directory:" msgstr "" +"/var/lib/mysql dizininin sahiplik ve izin ayarlarını da gözden " +"geçirmelisiniz:" #. Type: boolean #. Description #: ../mariadb-server-10.5.templates:4001 msgid "Remove all MariaDB databases?" -msgstr "" +msgstr "Tüm MariaDB veritabanları kaldırılsın mı?" #. Type: boolean #. Description @@ -83,6 +92,7 @@ msgid "" "The /var/lib/mysql directory which contains the MariaDB databases is about " "to be removed." msgstr "" +"MariaDB veritabanlarını barındıran /var/lib/mysql dizini kaldırılmak üzere" #. Type: boolean #. Description @@ -92,70 +102,6 @@ msgid "" "recent version or if a different mariadb-server package is already using it, " "the data should be kept." msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "New password for the MariaDB \"root\" user:" -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "" -"While not mandatory, it is highly recommended that you set a password for " -"the MariaDB administrative \"root\" user." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:5001 -msgid "If this field is left blank, the password will not be changed." -msgstr "" - -#. Type: password -#. Description -#: ../mariadb-server-10.5.templates:6001 -msgid "Repeat password for the MariaDB \"root\" user:" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "Unable to set password for the MariaDB \"root\" user" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"An error occurred while setting the password for the MariaDB administrative " -"user. This may have happened because the account already has a password, or " -"because of a communication problem with the MariaDB server." -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "You should check the account's password after the package installation." -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:7001 -msgid "" -"Please read the /usr/share/doc/mariadb-server-10.5/README.Debian file for " -"more information." -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "Password input error" -msgstr "" - -#. Type: error -#. Description -#: ../mariadb-server-10.5.templates:8001 -msgid "The two passwords you entered were not the same. Please try again." -msgstr "" +"Eğer MariaDB paketini daha sonra güncel bir sürümünü kurmak üzere " +"kaldırıyorsanız ya da veritabanlarınıza başka bir mariadb-server paketi ile " +"erişiyorsanız, veritabanlarınızı kaldırmamalısınız." From 9c7bd4f283b5d866e08566a3ffb6954413b0513f Mon Sep 17 00:00:00 2001 From: Sergei Petrunia Date: Wed, 17 Mar 2021 16:51:56 +0300 Subject: [PATCH 6/9] MDEV-25069: Assertion `root->weight >= ...' failed in SEL_ARG::tree_delete #2 Note they key_or() may call tree_delete(), which will cause the weight asserts to be checked. In order to avoid them from firing, update key1 tree's weight after we've changed key1->some_local_child->next_key_part. Having done that, do we still need this at the function end: /* Re-compute the result tree's weight. */ key1->update_weight_locally(); ? --- mysql-test/main/range_notembedded.result | 9 +++++++++ mysql-test/main/range_notembedded.test | 10 ++++++++++ sql/opt_range.cc | 6 ++++++ 3 files changed, 25 insertions(+) diff --git a/mysql-test/main/range_notembedded.result b/mysql-test/main/range_notembedded.result index 0ecf47c892e..eeab230e72f 100644 --- a/mysql-test/main/range_notembedded.result +++ b/mysql-test/main/range_notembedded.result @@ -239,3 +239,12 @@ insert into t1 values (1,1,1,1), (2,2,2,2), (3,3,3,3); id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range PRIMARY PRIMARY 2 NULL 3 Using where drop table t1; +# +# MDEV-25069: Assertion `root->weight >= ...' failed in SEL_ARG::tree_delete #2 +# +SELECT * +FROM mysql.help_relation +WHERE +(help_topic_id < '2' OR help_topic_id != 8 OR help_topic_id < 1) AND +help_keyword_id = help_topic_id; +help_topic_id help_keyword_id diff --git a/mysql-test/main/range_notembedded.test b/mysql-test/main/range_notembedded.test index 5f6a05e8d91..4e77d6a4810 100644 --- a/mysql-test/main/range_notembedded.test +++ b/mysql-test/main/range_notembedded.test @@ -140,3 +140,13 @@ WHERE --enable_query_log drop table t1; + +--echo # +--echo # MDEV-25069: Assertion `root->weight >= ...' failed in SEL_ARG::tree_delete #2 +--echo # + +SELECT * +FROM mysql.help_relation +WHERE + (help_topic_id < '2' OR help_topic_id != 8 OR help_topic_id < 1) AND + help_keyword_id = help_topic_id; diff --git a/sql/opt_range.cc b/sql/opt_range.cc index a02b6171a20..f1657b51bf3 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -10642,9 +10642,15 @@ key_or(RANGE_OPT_PARAM *param, SEL_ARG *key1,SEL_ARG *key2) */ tmp->maybe_flag|= key2_cpy.maybe_flag; key2_cpy.increment_use_count(key1->use_count+1); + + uint old_weight= tmp->next_key_part? tmp->next_key_part->weight: 0; + tmp->next_key_part= key_or(param, tmp->next_key_part, key2_cpy.next_key_part); + uint new_weight= tmp->next_key_part? tmp->next_key_part->weight: 0; + key1->weight += (new_weight - old_weight); + if (!cmp) break; // case b: done with this key2 range From 60d1461a28cb49e8d4e9e7c57963c5d0391d484d Mon Sep 17 00:00:00 2001 From: Etienne Guesnet Date: Fri, 26 Feb 2021 16:22:24 +0100 Subject: [PATCH 7/9] CRC32 on AIX --- mysys/CMakeLists.txt | 2 +- mysys/crc32/crc32c.cc | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index d73d1c68b52..c6d476c9fa4 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -129,7 +129,7 @@ ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") COMPILE_FLAGS "-march=armv8-a+crc+crypto") ENDIF() ENDIF() -ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64|powerpc64") +ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64|powerpc64" OR CMAKE_SYSTEM_NAME MATCHES AIX) SET(MYSYS_SOURCES ${MYSYS_SOURCES} crc32/crc32_ppc64.c crc32/crc32c_ppc.c) SET_SOURCE_FILES_PROPERTIES(crc32/crc32_ppc64.c crc32/crc32c_ppc.c PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -maltivec -mvsx -mpower8-vector -mcrypto -mpower8-vector") diff --git a/mysys/crc32/crc32c.cc b/mysys/crc32/crc32c.cc index f11a80fb5d8..8135c211d2e 100644 --- a/mysys/crc32/crc32c.cc +++ b/mysys/crc32/crc32c.cc @@ -491,6 +491,17 @@ static int arch_ppc_probe(void) { return arch_ppc_crc32; } +#elif _AIX +static int arch_ppc_probe(void) { + arch_ppc_crc32 = 0; + +#if defined(__powerpc64__) + // AIX 7.1+ has vector crypto features on all POWER 8+ + arch_ppc_crc32 = 1; +#endif /* __powerpc64__ */ + + return arch_ppc_crc32; +} #endif // __linux__ static bool isAltiVec() { From 5dbea46cfdc83f2455c7f4a43a4cc932192cfac6 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Tue, 16 Mar 2021 15:37:14 +1100 Subject: [PATCH 8/9] crc32c: Fix AIX compulation - ALIGN defined ALIGN was defined already: mysys/crc32/crc32c.cc:390: warning: "ALIGN" redefined #define ALIGN(n, m) ((n + ((1 << m) - 1)) & ~((1 << m) - 1)) In file included from /root/aix/build/include/my_global.h:543, from /root/aix/build/mysys/crc32/crc32c.cc:22: /opt/freeware/lib/gcc/powerpc-ibm-aix7.1.0.0/8/include-fixed/sys/socket.h:788: note: this is the location of the previous definition #define ALIGN(p) (ulong)((caddr_t)(p) + MACHINE_ALIGNMENT - 1 - \ --- mysys/crc32/crc32c.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mysys/crc32/crc32c.cc b/mysys/crc32/crc32c.cc index 8135c211d2e..b6c80886ec1 100644 --- a/mysys/crc32/crc32c.cc +++ b/mysys/crc32/crc32c.cc @@ -386,6 +386,10 @@ uint32_t ExtendImpl(uint32_t crc, const char* buf, size_t size) { const uint8_t *e = p + size; uint64_t l = crc ^ 0xffffffffu; +#ifdef ALIGN +#undef ALIGN +#endif + // Align n to (1 << m) byte boundary #define ALIGN(n, m) ((n + ((1 << m) - 1)) & ~((1 << m) - 1)) From 126725421e56293d7c8b816e066271606b59dcd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 18 Mar 2021 14:43:08 +0200 Subject: [PATCH 9/9] MDEV-25121: innodb_flush_method=O_DIRECT fails on compressed tables Tests with 4096-byte sector size confirm that it is safe to use O_DIRECT with page_compressed tables. That had been disabled on Linux, in an attempt to fix MDEV-21584 which had been filed for the O_DIRECT problems earlier. The fil_node_t::block_size was being set mostly correctly until commit 10dd290b4b8b8b235c8cf42e100f0a4415629e79 (MDEV-17380) introduced a regression in MariaDB Server 10.4.4. fil_node_open_file(): Only avoid setting O_DIRECT on ROW_FORMAT=COMPRESSED tables that use KEY_BLOCK_SIZE=1 or 2 (1024 or 2048 bytes). fil_ibd_create(): Avoid setting O_DIRECT on ROW_FORMAT=COMPRESSED tables that use KEY_BLOCK_SIZE=1 or 2 (1024 or 2048 bytes). fil_node_t::find_metadata(): Require fstat() to be always invoked outside Microsoft Windows, so that fil_node_t::block_size can be set. fil_node_t::read_page0(): Rely on find_metadata() to assign block_size. Thanks to Vladislav Vaintroub for testing this on Microsoft Windows using an old-fashioned rotational hard disk with 4KiB sector size. Reviewed by: Vladislav Vaintroub This is a port of commit 00f620b27e960c4b96a8392b27742fd5e41a69e3 and commit 6505662c23ba81331d91f65c18e06a759d6f148f from 10.2. --- storage/innobase/fil/fil0fil.cc | 41 ++++++++++++++++++------------ storage/innobase/include/fil0fil.h | 2 +- storage/innobase/os/os0file.cc | 29 +++++++++++---------- 3 files changed, 41 insertions(+), 31 deletions(-) diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc index a8b64f836cc..40a0744dd3d 100644 --- a/storage/innobase/fil/fil0fil.cc +++ b/storage/innobase/fil/fil0fil.cc @@ -488,12 +488,16 @@ static bool fil_node_open_file(fil_node_t* node) const bool first_time_open = node->size == 0; - bool o_direct_possible = !FSP_FLAGS_HAS_PAGE_COMPRESSION(space->flags); - if (const ulint ssize = FSP_FLAGS_GET_ZIP_SSIZE(space->flags)) { - compile_time_assert(((UNIV_ZIP_SIZE_MIN >> 1) << 3) == 4096); - if (ssize < 3) { - o_direct_possible = false; - } + ulint type; + static_assert(((UNIV_ZIP_SIZE_MIN >> 1) << 3) == 4096, + "compatibility"); + switch (FSP_FLAGS_GET_ZIP_SSIZE(space->flags)) { + case 1: + case 2: + type = OS_DATA_FILE_NO_O_DIRECT; + break; + default: + type = OS_DATA_FILE; } if (first_time_open @@ -514,9 +518,7 @@ retry: ? OS_FILE_OPEN_RAW | OS_FILE_ON_ERROR_NO_EXIT : OS_FILE_OPEN | OS_FILE_ON_ERROR_NO_EXIT, OS_FILE_AIO, - o_direct_possible - ? OS_DATA_FILE - : OS_DATA_FILE_NO_O_DIRECT, + type, read_only_mode, &success); @@ -556,9 +558,7 @@ fail: ? OS_FILE_OPEN_RAW | OS_FILE_ON_ERROR_NO_EXIT : OS_FILE_OPEN | OS_FILE_ON_ERROR_NO_EXIT, OS_FILE_AIO, - o_direct_possible - ? OS_DATA_FILE - : OS_DATA_FILE_NO_O_DIRECT, + type, read_only_mode, &success); } @@ -2904,13 +2904,22 @@ fil_ibd_create( return NULL; } + ulint type; + static_assert(((UNIV_ZIP_SIZE_MIN >> 1) << 3) == 4096, + "compatibility"); + switch (FSP_FLAGS_GET_ZIP_SSIZE(flags)) { + case 1: + case 2: + type = OS_DATA_FILE_NO_O_DIRECT; + break; + default: + type = OS_DATA_FILE; + } + file = os_file_create( innodb_data_file_key, path, OS_FILE_CREATE | OS_FILE_ON_ERROR_NO_EXIT, - OS_FILE_NORMAL, - OS_DATA_FILE, - srv_read_only_mode, - &success); + OS_FILE_NORMAL, type, srv_read_only_mode, &success); if (!success) { /* The following call will print an error message */ diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index 3001817a78c..873fcd67a3a 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -637,7 +637,7 @@ struct fil_node_t { /** Determine some file metadata when creating or reading the file. @param file the file that is being created, or OS_FILE_CLOSED */ void find_metadata(os_file_t file = OS_FILE_CLOSED -#ifdef UNIV_LINUX +#ifndef _WIN32 , struct stat* statbuf = NULL #endif ); diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index f96ff6b5171..bf38252578b 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -2,7 +2,7 @@ Copyright (c) 1995, 2019, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2009, Percona Inc. -Copyright (c) 2013, 2020, MariaDB Corporation. +Copyright (c) 2013, 2021, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Percona Inc.. Those modifications are @@ -4137,7 +4137,9 @@ os_file_create_func( case SRV_ALL_O_DIRECT_FSYNC: /*Traditional Windows behavior, no buffering for any files.*/ - attributes |= FILE_FLAG_NO_BUFFERING; + if (type != OS_DATA_FILE_NO_O_DIRECT) { + attributes |= FILE_FLAG_NO_BUFFERING; + } break; case SRV_FSYNC: @@ -7707,7 +7709,7 @@ static bool is_file_on_ssd(char *file_path) /** Determine some file metadata when creating or reading the file. @param file the file that is being created, or OS_FILE_CLOSED */ void fil_node_t::find_metadata(os_file_t file -#ifdef UNIV_LINUX +#ifndef _WIN32 , struct stat* statbuf #endif ) @@ -7747,18 +7749,18 @@ void fil_node_t::find_metadata(os_file_t file block_size = 512; } #else - on_ssd = space->atomic_write_supported; -# ifdef UNIV_LINUX - if (!on_ssd) { - struct stat sbuf; - if (!statbuf && !fstat(file, &sbuf)) { - statbuf = &sbuf; - } - if (statbuf && fil_system.is_ssd(statbuf->st_dev)) { - on_ssd = true; - } + struct stat sbuf; + if (!statbuf && !fstat(file, &sbuf)) { + statbuf = &sbuf; } + if (statbuf) { + block_size = statbuf->st_blksize; + } + on_ssd = space->atomic_write_supported +# ifdef UNIV_LINUX + || (statbuf && fil_system.is_ssd(statbuf->st_dev)) # endif + ; #endif if (!space->atomic_write_supported) { space->atomic_write_supported = atomic_write @@ -7794,7 +7796,6 @@ bool fil_node_t::read_page0(bool first) if (fstat(handle, &statbuf)) { return false; } - block_size = statbuf.st_blksize; os_offset_t size_bytes = statbuf.st_size; #else os_offset_t size_bytes = os_file_get_size(handle);