summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-30164 System variable for default collationsbb-10.11-bar-collationsAlexander Barkov2023-03-2153-97/+2098
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a way to override default collations (or "character set collations") for desired character sets. The SQL standard says: > Each collation known in an SQL-environment is applicable to one > or more character sets, and for each character set, one or more > collations are applicable to it, one of which is associated with > it as its character set collation. In MariaDB, character set collations has been hard-coded so far, e.g. utf8mb4_general_ci has been a hard-coded character set collation for utf8mb4. This patch allows to override (globally per server, or per session) character set collations, so for example, uca1400_ai_ci can be set as a character set collation for Unicode character sets (instead of compiled xxx_general_ci). The array of overridden character set collations is stored in a new (session and global) system variable @@character_set_collations and can be set as a comma separated list of charset=collation pairs, e.g.: SET @@character_set_collations='utf8mb3=uca1400_ai_ci,utf8mb4=uca1400_ai_ci'; The variable is empty by default, which mean use the hard-coded character set collations (e.g. utf8mb4_general_ci for utf8mb4). The variable can also be set globally by passing to the server startup command line, and/or in my.cnf.
* Fixes to mysql_install_dbMonty2023-03-102-17/+31
| | | | | | | | | | | | | | - Change to use 'mariadbd' instead of 'mysqld' in help texts and other visible places. - Start binary 'mariadbd' instead of 'mysqld'. This will remove a warning in 11.0 when running mysql_install_db. - Use my_print_defaults --mariadbd instead of --mysqld - Use --skip-log-error if the user don't have access to log-error file. This it needed to allow mysql_install_db to work silenty for users that has not write access to /var/log. Other things: - Updated my_print_defaults to support --mariadbd
* MDEV-30810 errmsg-utf8.txt no longer uses charsetsDaniel Black2023-03-103-23/+4
| | | | | | | | | | | | Charset names in the 'languages' line are not used any more. Removing to avoid confusion. All messages in errmsg-utf8.txt are in utf8 now. Charset names should have been removed in MySQL-5.5 during: https://dev.mysql.com/worklog/task/?id=751 Bump version number.
* Merge branch '10.10' into 10.11Sergei Golubchik2023-03-091-0/+0
|\
| * MCOL-5437 columnstore fails to compile to due old cs->casedn_multiply useSergei Golubchik2023-03-081-0/+0
| | | | | | | | update columnstore
* | MDEV-30789: Add Georgian error messages and localeEkaterine Papava2023-03-088-9/+89
| | | | | | | | | | | | Test case and minor fixes by Daniel Black Reviewer: Alexander Barkov
* | MDEV-30789 Add Georgian translation (error messages)EkaterinePapava2023-03-075-2/+817
| |
* | Merge 10.10 into 10.11Marko Mäkelä2023-03-0631-167/+240
|\ \ | |/
| * Merge 10.9 into 10.10Marko Mäkelä2023-03-0621-102/+175
| |\
| | * Merge 10.8 into 10.9Marko Mäkelä2023-03-0621-102/+175
| | |\
| | | * Merge 10.6 into 10.8Marko Mäkelä2023-03-0620-100/+172
| | | |\
| | | | * Merge 10.5 into 10.6Marko Mäkelä2023-03-061-1/+1
| | | | |\
| | | | | * Fix GCC 5.3.1 -Wsign-compareMarko Mäkelä2023-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes up commit 57c526ffb852fb027e25fdc77173d45bdc60b8a2
| | | | | * CONC-637 Build fails when specifying -DPLUGIN_AUTH_GSSAPI_CLIENT=OFFbb-10.5-sergSergei Golubchik2023-02-281-0/+0
| | | | | |
| | | | * | MDEV-30341 Reset check_foreigns, check_unique_secondary variablesThirunarayanan Balathandayuthapani2023-03-022-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - InnoDB fails to reset the check_foreigns and check_unique_secondary in trx_t::free(), trx_t::commit_cleanup(). This lead to bulk insert in internal innodb fts table operation.
| | | | * | Merge 10.5 into 10.6Marko Mäkelä2023-02-2818-102/+168
| | | | |\ \ | | | | | |/
| | | | | * MDEV-30753 Possible corruption due to trx_purge_free_segment()Marko Mäkelä2023-02-282-59/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with commit 0de3be8cfdfc26f5c236eaefe12d03c7b4af22c8 (MDEV-30671), the field TRX_UNDO_NEEDS_PURGE lost its previous meaning. The following scenario is possible: (1) InnoDB is killed at a point of time corresponding to the durable execution of some fseg_free_step_not_header() but not trx_purge_remove_log_hdr(). (2) After restart, the affected pages are allocated for something else. (3) Purge will attempt to access the newly reallocated pages when looking for some old undo log records. trx_purge_free_segment(): Invoke trx_purge_remove_log_hdr() as the first thing, to be safe. If the server is killed, some pages will never be freed. That is the lesser evil. Also, before each mtr.start(), invoke log_free_check() to prevent ib_logfile0 overrun.
| | | | | * Added detection of memory overwrite with multi_mallocbb-10.5-montyMonty2023-02-2718-58/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch also fixes some bugs detected by valgrind after this patch: - Not enough copy_func elements was allocated by Create_tmp_table() which causes an memory overwrite in Create_tmp_table::add_fields() I added an ASSERT() to be able to detect this also without valgrind. The bug was that TMP_TABLE_PARAM::copy_fields was not correctly set when calling create_tmp_table(). - Aria::empty_bits is not allocated if there is no varchar/char/blob fields in the table. Fixed code to take this into account. This cannot cause any issues as this is just a memory access into other Aria memory and the content of the memory would not be used. - Aria::last_key_buff was not allocated big enough. This may have caused issues with rtrees and ma_extra(HA_EXTRA_REMEMBER_POS) as they would use the same memory area. - Aria and MyISAM didn't take extended key parts into account, which caused problems when copying rec_per_key from engine to sql level. - Mark asan builds with 'asan' in version strihng to detect these in not_valgrind_build.inc. This is needed to not have main.sp-no-valgrind fail with asan.
| | | * | | MDEV-30752 Assertion `!index->is_ibuf()' failed aroundThirunarayanan Balathandayuthapani2023-03-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmp_dtuple_rec_with_match_bytes - InnoDB shouldn't use the adaptive hash index for change buffer indexes.
| * | | | | A cleanup for MDEV-30695 Refactor case folding data types in Asian collationsAlexander Barkov2023-03-0310-65/+65
| | | | | | | | | | | | | | | | | | | | | | | | Adding "const" qualifiers to casefold_info_st::page
* | | | | | MDEV-30311 system-wide max transaction id corrupted after changing the undo ↵Marko Mäkelä2023-03-031-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tablespaces This fixes a regression due to MDEV-19229. InnoDB would fail to maintain the maximum transaction ID when it changes and reinitializes the number of undo tablespaces. InnoDB should maintain the maximum transaction ID in TRX_RSEG_MAX_TRX_ID of system rollback segment header. srv_undo_tablespaces_reinit(): Preserve the system-wide maximum transaction identifier in the TRX_RSEG_MAX_TRX_ID field of the first rollback segment. If needed, upgrade the page to the MariaDB 10.3 format first. All this must be done in the same atomic mini-transaction that will reinitialize the TRX_SYS page. Before MariaDB Server 10.3, InnoDB persisted the maximum transaction identifier only in the TRX_SYS page. MariaDB 10.3 started to treat that page as a read-only directory of rollback segments, and the maximum transaction identifier will be recovered from TRX_RSEG_MAX_TRX_ID or from undo logs. Since a change of innodb_undo_tablespaces is only allowed when no undo log records exist, the only place to store the persistent maximum transaction identifier is in TRX_RSEG_MAX_TRX_ID of one of the rollback segment header pages. The bug was observed when the database was upgraded directly from MySQL 5.7 or earlier, or from MariaDB Server 10.2 or earlier, to multiple innodb_undo_tablespaces. On a restart of MariaDB after the upgrade, the transaction identifier would be reported to be smaller than during the upgrade: 2023-03-03 10:43:57 0 [Note] InnoDB: log sequence number 2762352; transaction id 1794 2023-03-03 10:44:17 0 [Note] InnoDB: log sequence number 2786076; transaction id 770
* | | | | | Merge 10.10 into 10.11Marko Mäkelä2023-02-28101-9033/+34470
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.9 into 10.10Marko Mäkelä2023-02-2865-229/+25507
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.8 into 10.9Marko Mäkelä2023-02-2865-229/+25507
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.6 into 10.8Marko Mäkelä2023-02-2826-228/+405
| | | |\ \ \ | | | | |/ /
| | | | * | Merge 10.5 into 10.6Marko Mäkelä2023-02-2716-214/+201
| | | | |\ \ | | | | | |/
| | | | | * MDEV-30671 InnoDB undo log truncation fails to wait for purge of historyMarko Mäkelä2023-02-2416-200/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not safe to invoke trx_purge_free_segment() or execute innodb_undo_log_truncate=ON before all undo log records in the rollback segment has been processed. A prominent failure that would occur due to premature freeing of undo log pages is that trx_undo_get_undo_rec() would crash when trying to copy an undo log record to fetch the previous version of a record. If trx_undo_get_undo_rec() was not invoked in the unlucky time frame, then the symptom would be that some committed transaction history is never removed. This would be detected by CHECK TABLE...EXTENDED that was impleented in commit ab0190101b0587e0e03b2d75a967050b9a85fd1b. Such a garbage collection leak should be possible even when using innodb_undo_log_truncate=OFF, just involving trx_purge_free_segment(). trx_rseg_t::needs_purge: Change the type from Boolean to a transaction identifier, noting the most recent non-purged transaction, or 0 if everything has been purged. On transaction start, we initialize this to 1 more than the transaction start ID. On recovery, the field may be adjusted to the transaction end ID (TRX_UNDO_TRX_NO) if it is larger. The field TRX_UNDO_NEEDS_PURGE becomes write-only; only some debug assertions that would validate the value. The field reflects the old inaccurate Boolean field trx_rseg_t::needs_purge. trx_undo_mem_create_at_db_start(), trx_undo_lists_init(), trx_rseg_mem_restore(): Remove the parameter max_trx_id. Instead, store the maximum in trx_rseg_t::needs_purge, where trx_rseg_array_init() will find it. trx_purge_free_segment(): Contiguously hold a lock on trx_rseg_t to prevent any concurrent allocation of undo log. trx_purge_truncate_rseg_history(): Only invoke trx_purge_free_segment() if the rollback segment is empty and there are no pending transactions associated with it. trx_purge_truncate_history(): Only proceed with innodb_undo_log_truncate=ON if trx_rseg_t::needs_purge indicates that all history has been purged. Tested by: Matthias Leich
| | | | * | MDEV-25984 Assertion `max_doc_id > 0' failed in fts_init_doc_id()Thirunarayanan Balathandayuthapani2023-02-224-5/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - rollback_inplace_alter_table() locks the fts internal tables. At the time, insert tries to fetch the doc id from config table, fails to lock the config table and returns doc id as 0. fts_cmp_set_sync_doc_id(): Retry to fetch the doc id again if it encounter DB_LOCK_WAIT_TIMEOUT error
| | | | * | MDEV-29871 innodb_fts.fulltext_misc unexpectedly reports a resultThirunarayanan Balathandayuthapani2023-02-212-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - match()+0 returns the floating result and converts into integer value and it leads to sporadic failure.
| | | | * | MDEV-27701 Race on trx->lock.wait_lock between lock_rec_move() and ↵Vlad Lesin2023-02-204-4/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lock_sys_t::cancel() The initial issue was in assertion failure, which checked the equality of lock to cancel with trx->lock.wait_lock in lock_sys_t::cancel(). If we analyze lock_sys_t::cancel() code from the perspective of trx->lock.wait_lock racing, we won't find the error there, except the cases when we need to reload it after the corresponding latches acquiring. So the fix is just to remove the assertion and reload trx->lock.wait_lock after acquiring necessary latches. Reviewed by: Marko Mäkelä <marko.makela@mariadb.com>
| | | * | | MDEV-30716 Wrong casefolding in xxx_unicode_520_ci for U+0700..U+07FFAlexander Barkov2023-02-2339-1/+25102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The array my_unicase_pages_unicode520[7] erroneously mapped to plane06 instead of plane07.
| * | | | | Fixed (non crtitial) memory segment overrunbb-10.10-montyMonty2023-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was discovered as part of adding a protected memory area between each area allocated by multi_alloc(). The patch that adds the protection will be pushed in 10.5. This patch adds fixes that are unique for 10.10
| * | | | | MDEV-30694: Cross building on x86_64 to arch i686 failsHelmut Grohne2023-02-222-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently cross compilation on x86_64 to arch i686 fails with error: > ctype-uca1400data.h /bin/sh: 1: uca-dump: not found Commit makes sure that uca-dump is treated correctly when cross compiling MariaDB to another architecture
| * | | | | MDEV-30695 Refactor case folding data types in Asian collationsAlexander Barkov2023-02-2120-7842/+8185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a non-functional change and should not change the server behavior. Casefolding information is now stored in items of a new data type MY_CASEFOLD_CHARACTER: typedef struct casefold_info_char_t { uint32 toupper; uint32 tolower; } MY_CASEFOLD_CHARACTER; Before this change, casefolding tables for Asian collations were stored in: typedef struct unicase_info_char_st { uint32 toupper; uint32 tolower; uint32 sort; } MY_UNICASE_CHARACTER; The "sort" member was not used in the code handling Asian collations, it only wasted space. (it's only used by Unicode _general_ci and _general_mysql500_ci collations). Unicode collations (at least UCA and _bin) should also be refactored later, but under terms of a separate task.
| * | | | | MDEV-30692 conf_to_src is not up to dateAlexander Barkov2023-02-212-253/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing conf_to_src.c according to changes made by a206658b985fe5e18fb5692fdb3698dad5aca70a Re-generating ctype-extra.c at once, to fix the indentation from manually edited to automatic.
| * | | | | MDEV-30661 UPPER() returns an empty string for U+0251 in uca1400 collations ↵Alexander Barkov2023-02-1735-706/+507
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for utf8 String length growth during upper/lower conversion in Unicode collations depends only on the underlying MY_UNICASE_INFO used in the collation. Maintaining a separate member CHARSET_INFO::caseup_multiply and CHARSET_INFO::casedn_multiply duplicated this information and caused bugs like this (when MY_UNICASE_INFO and case??_multiply when out of sync because of incomplete CHARSET_INFO initialization). Fix: Changing CHARSET_INFO::caseup_multiply and CHARSET_INFO::casedn_multiply from members to virtual functions. The virtual functions in Unicode collations calculate case conversion growth factors from the MY_UNICASE_INFO. This guarantees that the growth factors are always in sync with the MY_UNICASE_INFO.
* | | | | | bump the VERSIONDaniel Bartholomew2023-02-161-1/+1
| | | | | |
* | | | | | Merge 10.10 into 10.11Marko Mäkelä2023-02-16361-1939/+2938
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.9 into 10.10Marko Mäkelä2023-02-16326-1774/+2897
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.8 into 10.9Marko Mäkelä2023-02-16327-1771/+2896
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.6 into 10.8Marko Mäkelä2023-02-162-2/+11
| | | |\ \ \ | | | | |/ /
| | | | * | Merge 10.5 into 10.6Marko Mäkelä2023-02-162-2/+11
| | | | |\ \ | | | | | |/
| | | | | * MDEV-30552 fixup: Fix the test for non-debugMarko Mäkelä2023-02-162-2/+11
| | | | | |
| | | | | * Fix clang -Winconsistent-missing-overrideMarko Mäkelä2023-02-161-1/+1
| | | | | |
| | | * | | MDEV-27774 fixup: Correct a commentMarko Mäkelä2023-02-161-1/+1
| | | | | |
| | | * | | Merge 10.6 into 10.8Marko Mäkelä2023-02-1631-129/+340
| | | |\ \ \ | | | | |/ /
| | | | * | MDEV-30638 Deadlock between INSERT and InnoDB non-persistent statistics updateMarko Mäkelä2023-02-167-33/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a partial revert of commit 8b6a308e463f937eb8d2498b04967a222c83af90 (MDEV-29883) and a follow-up to the merge commit 394fc71f4fa8f8b1b6d24adfead0ec45121d271e (MDEV-24569). The latching order related to any operation that accesses the allocation metadata of an InnoDB index tree is as follows: 1. Acquire dict_index_t::lock in non-shared mode. 2. Acquire the index root page latch in non-shared mode. 3. Possibly acquire further index page latches. Unless an exclusive dict_index_t::lock is held, this must follow the root-to-leaf, left-to-right order. 4. Acquire a *non-shared* fil_space_t::latch. 5. Acquire latches on the allocation metadata pages. 6. Possibly allocate and write some pages, or free some pages. btr_get_size_and_reserved(), dict_stats_update_transient_for_index(), dict_stats_analyze_index(): Acquire an exclusive fil_space_t::latch in order to avoid a deadlock in fseg_n_reserved_pages() in case of concurrent access to multiple indexes sharing the same "inode page". fseg_page_is_allocated(): Acquire an exclusive fil_space_t::latch in order to avoid deadlocks. All callers are holding latches on a buffer pool page, or an index, or both. Before commit edbde4a11fd0b6437202f8019a79911441b6fb32 (MDEV-24167) a third mode was available that would not conflict with the shared fil_space_t::latch acquired by ha_innobase::info_low(), i_s_sys_tablespaces_fill_table(), or i_s_tablespaces_encryption_fill_table(). Because those calls should be rather rare, it makes sense to use the simple rw_lock with only shared and exclusive modes. fil_crypt_get_page_throttle(): Avoid invoking fseg_page_is_allocated() on an allocation bitmap page (which can never be freed), to avoid acquiring a shared latch on top of an exclusive one. mtr_t::s_lock_space(), MTR_MEMO_SPACE_S_LOCK: Remove.
| | | | * | MDEV-30134 Assertion failed in buf_page_t::unfix() in buf_pool_t::watch_unset()Marko Mäkelä2023-02-162-50/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buf_pool_t::watch_set(): Always buffer-fix a block if one was found, no matter if it is a watch sentinel or a buffer page. The type of the block descriptor will be rechecked in buf_page_t::watch_unset(). Do not expect the caller to acquire the page hash latch. Starting with commit bd5a6403cace36c6ed428cde62e35adcd3f7e7d0 it is safe to release buf_pool.mutex before acquiring a buf_pool.page_hash latch. buf_page_get_low(): Adjust to the changed buf_pool_t::watch_set(). This simplifies the logic and fixes a bug that was reproduced when using debug builds and the setting innodb_change_buffering_debug=1.
| | | | * | MDEV-30397: MariaDB crash due to DB_FAIL reported for a corrupted pageMarko Mäkelä2023-02-163-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buf_read_page_low(): Map the buf_page_t::read_complete() return value DB_FAIL to DB_PAGE_CORRUPTED. The purpose of the DB_FAIL return value is to avoid error log noise when read-ahead brings in an unused page that is typically filled with NUL bytes. If a synchronous read is bringing in a corrupted page where the page frame does not contain the expected tablespace identifier and page number, that must be treated as an attempt to read a corrupted page. The correct error code for this is DB_PAGE_CORRUPTED. The error code DB_FAIL is not handled by row_mysql_handle_errors(). This was missed in commit 0b47c126e31cddda1e94588799599e138400bcf8 (MDEV-13542).
| | | | * | Merge 10.5 into 10.6Marko Mäkelä2023-02-167-16/+120
| | | | |\ \ | | | | | |/