mirror of
https://github.com/MariaDB/server.git
synced 2025-11-09 11:41:36 +03:00
Merge branch '11.8' into 12.0
main/statistics_json.result is updated forf8ba5ced55(MDEV-36099) The test uses 'delete from t1' in many places and then populates the table again. The natural order of rows in a MyISAM table is well defined and the test was implicitly relying on that. beforef8ba5ced55delete was deleting rows one by one, using ha_myisam::delete_row() because the connection was stuck in rbr mode. This caused rows to be shown in the reverse insertion order (because of the delete link list). MDEV-36099 fixes this bug and the server now correctly uses ha_myisam::delete_all_rows(). This makes rows to be shown in the insertion order as expected.
This commit is contained in:
@@ -57,11 +57,13 @@ enum enum_explain_filename_mode
|
||||
/* depends on errmsg.txt Database `db`, Table `t` ... */
|
||||
#define EXPLAIN_FILENAME_MAX_EXTRA_LENGTH 63
|
||||
|
||||
/* See mysql_write_frm function comment for explanations of these flags */
|
||||
#define WFRM_WRITE_SHADOW 1
|
||||
#define WFRM_INSTALL_SHADOW 2
|
||||
#define WFRM_KEEP_SHARE 4
|
||||
#define WFRM_WRITE_CONVERTED_TO 8
|
||||
#define WFRM_BACKUP_ORIGINAL 16
|
||||
#define WFRM_ALTER_INFO_PREPARED 32
|
||||
|
||||
/* Flags for conversion functions. */
|
||||
static constexpr uint FN_FROM_IS_TMP= 1 << 0;
|
||||
|
||||
Reference in New Issue
Block a user