Uploaded image for project: 'MariaDB Server'
  1. MariaDB Server
  2. MDEV-19478

10.4.5 merge

Details

    • Task
    • Status: Closed (View Workflow)
    • Blocker
    • Resolution: Fixed
    • 10.4.5
    • OTHER
    • None

    Description

      5.5→10.1→10.2→10.3 (serg)
      10.3→10.4
      re-enable e6bdf77e4be48750c4808a09af197ed91fd69a61 assertion

      Attachments

        Activity

          Ascending order - Click to sort in descending order
          sanja Oleksandr Byelkin created issue -
          marko Marko Mäkelä made changes -
          Field Original Value New Value
          Description 10.2→10.3 (/) (Made by Marko)
          5.5→10.1→10.2→10.3
          10.3→10.4           		10.2→10.3 (/) (Made by Marko)
          5.5→10.1→10.2→10.3 (/) (already up to date)
          10.3→10.4
          sanja Oleksandr Byelkin made changes -
          Description 10.2→10.3 (/) (Made by Marko)
          5.5→10.1→10.2→10.3 (/) (already up to date)
          10.3→10.4           		10.2→10.3 (/) (Made by Marko)
          5.5→10.1→10.2→10.3 (/) Nothing to do
          10.3→10.4
          sanja Oleksandr Byelkin made changes -
          Description 10.2→10.3 (/) (Made by Marko)
          5.5→10.1→10.2→10.3 (/) Nothing to do
          10.3→10.4           		10.2→10.3 (/) (Made by Marko)
          5.5→10.1→10.2→10.3 (to pickup Varun patch)
          10.3→10.4
          sanja Oleksandr Byelkin made changes -
          Description 10.2→10.3 (/) (Made by Marko)
          5.5→10.1→10.2→10.3 (to pickup Varun patch)
          10.3→10.4           		10.2→10.3 (/) (Made by Marko)
          10.3→10.4
          5.5→10.1→10.2→10.3 (to pickup Varun patch)
          re-enable e6bdf77e4be48750c4808a09af197ed91fd69a61 assertion
          sanja Oleksandr Byelkin added a comment -

          The assert

          diff --cc sql/sql_statistics.cc
          		 
          index 944fa5dc176,c751b079147..e4cc00f45ba
          		 
          --- a/sql/sql_statistics.cc
          		 
          +++ b/sql/sql_statistics.cc
          		 
          @@@ -4148,6 -4084,7 +4151,9 @@@ bool is_eits_usable(Field *field
          		 
                     partition list of a table. We assume the selecticivity for
          		 
                     such columns would be handled during partition pruning.
          		 
              */
          		 
          ++#if 0 /* Work around MDEV-19334 */
          		 
          +   DBUG_ASSERT(field->table->stats_is_read);
          		 
          ++#endif
          		 
              Column_statistics* col_stats= field->read_stats;
          		 
              return col_stats && !col_stats->no_stat_values_provided() &&        //(1)
          		 
                field->type() != MYSQL_TYPE_GEOMETRY &&                           //(2)

          sanja Oleksandr Byelkin added a comment - The assert diff --cc sql/sql_statistics.cc index 944fa5dc176,c751b079147..e4cc00f45ba --- a/sql/sql_statistics.cc +++ b/sql/sql_statistics.cc @@@ -4148,6 -4084,7 +4151,9 @@@ bool is_eits_usable(Field *field partition list of a table. We assume the selecticivity for such columns would be handled during partition pruning. */ ++#if 0 /* Work around MDEV-19334 */ + DBUG_ASSERT(field->table->stats_is_read); ++#endif Column_statistics* col_stats= field->read_stats; return col_stats && !col_stats->no_stat_values_provided() && //(1) field->type() != MYSQL_TYPE_GEOMETRY && //(2)
          marko Marko Mäkelä made changes -
          Description 10.2→10.3 (/) (Made by Marko)
          10.3→10.4
          5.5→10.1→10.2→10.3 (to pickup Varun patch)
          re-enable e6bdf77e4be48750c4808a09af197ed91fd69a61 assertion
          		10.2→10.3 (/) (Made by Marko)
          5.5→10.1→10.2→10.3 (waiting for the MDEV-19407 fix to be pushed to 10.1)
          10.3→10.4
          serg Sergei Golubchik made changes -
          Description 10.2→10.3 (/) (Made by Marko)
          5.5→10.1→10.2→10.3 (waiting for the MDEV-19407 fix to be pushed to 10.1)
          10.3→10.4           		10.2→10.3 (/) (Made by Marko)
          5.5→10.1→10.2→10.3 (waiting for the MDEV-19407 fix to be pushed to 10.1)
          10.3→10.4
          C/C 3.1.1
          sanja Oleksandr Byelkin made changes -
          Description 10.2→10.3 (/) (Made by Marko)
          5.5→10.1→10.2→10.3 (waiting for the MDEV-19407 fix to be pushed to 10.1)
          10.3→10.4
          C/C 3.1.1           		10.2→10.3 (/) (Made by Marko)
          10.3→10.4
          5.5→10.1→10.2→10.3 (to pickup Varuns & Igors patch)
          re-enable e6bdf77e4be48750c4808a09af197ed91fd69a61 assertion
          marko Marko Mäkelä made changes -
          Description 10.2→10.3 (/) (Made by Marko)
          10.3→10.4
          5.5→10.1→10.2→10.3 (to pickup Varuns & Igors patch)
          re-enable e6bdf77e4be48750c4808a09af197ed91fd69a61 assertion
          		5.5→10.1→10.2→10.3 (/)
          10.3→10.4
          re-enable e6bdf77e4be48750c4808a09af197ed91fd69a61 assertion
          marko Marko Mäkelä made changes -
          Description 5.5→10.1→10.2→10.3 (/)
          10.3→10.4
          re-enable e6bdf77e4be48750c4808a09af197ed91fd69a61 assertion           		5.5→10.1→10.2→10.3 ([~serg])
          10.3→10.4
          re-enable e6bdf77e4be48750c4808a09af197ed91fd69a61 assertion
          sanja Oleksandr Byelkin made changes -
          Description 5.5→10.1→10.2→10.3 ([~serg])
          10.3→10.4
          re-enable e6bdf77e4be48750c4808a09af197ed91fd69a61 assertion           		5.5→10.1→10.2→10.3 ([~serg])
          10.3→10.4 (/)
          re-enable e6bdf77e4be48750c4808a09af197ed91fd69a61 assertion (/)
          sanja Oleksandr Byelkin made changes -
          Component/s OTHER [ 10125 ]
          Resolution Fixed [ 1 ]
          Status Open [ 1 ] Closed [ 6 ]
          serg Sergei Golubchik made changes -
          Workflow MariaDB v3 [ 96750 ] MariaDB v4 [ 133955 ]

          People

            sanja Oleksandr Byelkin
            sanja Oleksandr Byelkin
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved:

              Git Integration

                Error rendering 'com.xiplink.jira.git.jira_git_plugin:git-issue-webpanel'. Please contact your Jira administrators.