1. 21 Nov, 2017 1 commit
    • Alexander Barkov's avatar
      MDEV-14454 Binary protocol returns wrong collation ID for SP OUT parameters · 563f1d89
      Alexander Barkov authored
      Item_param::set_value() did not set Item::collation and
      Item_param::str_value_ptr.str_charset properly. So both
      metadata and data for OUT parameters were sent in a wrong
      way to the client.
      
      This patch removes the old implementation of Item_param::set_value()
      and rewrites it using Type_handler::Item_param_set_from_value(),
      so now setting IN and OUT parameters share the a lot of code.
      
      1. Item_param::set_str() now:
        - accepts two additional parameters fromcs, tocs
        - sets str_value_ptr, to make sure it's always in sync with str_value,
          even without Item_param::convert_str_value()
        - does collation.set(tocs, DERIVATION_COERCIBLE),
          to make sure that DTCollation is valid even without
          Item_param::convert_str_value()
      
      2. Item_param::set_value(), which is used to set OUT parameters,
         now reuses Type_handler::Item_param_set_from_value().
      
      3. Cleanup: moving Item_param::str_value_ptr to private,
         as it's not needed outside.
      
      4. Cleanup: adding a new virtual method
         Settable_routine_parameter::get_item_param()
         and using it a few new DBUG_ASSERTs, where
         Item_param cannot appear.
      
      After this change:
      1. Assigning of IN parameters works as before:
      a. Item_param::set_str() is called and sets the value as a binary string
      b. The original value is sent to the query used for binary/general logging
      c. Item_param::convert_str_value() converts the value from the client
         character set to the connection character set
      
      2. Assigning of OUT parameters works in the new way:
      a. Item_param::set_str() and sets the value
         using the source Item's collation, so both Item::collation
         and Item_param::str_value_ptr.str_charset are properly set.
      b. Protocol_binary::send_out_parameters() sends the
         value to the client correctly:
         - Protocol::send_result_set_metadata() uses Item::collation.collation
           (which is now properly set), to detect if conversion is needed,
           and sends a correct collation ID.
         - Protocol::send_result_set_row() calls Type_handler::Item_send_str(),
           which uses Item_param::str_value_ptr.str_charset
           (which is now properly set) to actually perform the conversion.
      563f1d89
  2. 20 Nov, 2017 1 commit
  3. 18 Nov, 2017 1 commit
  4. 17 Nov, 2017 1 commit
  5. 16 Nov, 2017 6 commits
    • Vladislav Vaintroub's avatar
      Fix rocksdb tests on Windows · 0d1e805a
      Vladislav Vaintroub authored
      0d1e805a
    • Vladislav Vaintroub's avatar
      MDEV-13852 - redefine WinWriteableFile such as IsSyncThreadSafe() · 689168be
      Vladislav Vaintroub authored
      is set to true, as it should.
      
      Copy and modify original io_win.h header file to a different location
      (as we cannot patch anything in submodule). Make sure modified header is
      used.
      689168be
    • Alexey Botchkov's avatar
      MDEV-14402 JSON_VALUE doesn't escape quote. · 842dce37
      Alexey Botchkov authored
              Result unescaping added.
      842dce37
    • Alexander Barkov's avatar
    • Jan Lindström's avatar
      MDEV-13206: INSERT ON DUPLICATE KEY UPDATE foreign key fail · 0c4d11e8
      Jan Lindström authored
      This is caused by following change:
      
      commit 95d29c99f01882ffcc2259f62b3163f9b0e80c75
      Author: Marko Mäkelä <marko.makela@oracle.com>
      Date:   Tue Nov 27 11:12:13 2012 +0200
      
          Bug#15920445 INNODB REPORTS ER_DUP_KEY BEFORE CREATE UNIQUE INDEX COMPLETED
      
          There is a phase during online secondary index creation where the index has
          been internally completed inside InnoDB, but does not 'officially' exist yet.
          We used to report ER_DUP_KEY in these situations, like this:
      
          ERROR 23000: Can't write; duplicate key in table 't1'
      
          What we should do is to let the 'offending' operation complete, but report an
          error to the
          ALTER TABLE t1 ADD UNIQUE KEY (c2):
      
          ERROR HY000: Index c2 is corrupted
          (This misleading error message should be fixed separately:
          Bug#15920713 CREATE UNIQUE INDEX REPORTS ER_INDEX_CORRUPT INSTEAD OF DUPLICATE)
      
          row_ins_sec_index_entry_low(): flag the index corrupted instead of
          reporting a duplicate, in case the index has not been published yet.
      
          rb:1614 approved by Jimmy Yang
      
      Problem is that after we have found duplicate key on primary key
      we continue to get necessary gap locks in secondary indexes to
      block concurrent transactions from inserting the searched records.
      However, search from unique index used in foreign key constraint
      could return DB_NO_REFERENCED_ROW if INSERT .. ON DUPLICATE KEY UPDATE
      does not contain value for foreign key column. In this case
      we should return the original DB_DUPLICATE_KEY error instead
      of DB_NO_REFERENCED_ROW.
      
      Consider as a example following:
      
      create table child(a int not null primary key,
      b int not null,
      c int,
      unique key (b),
      foreign key (b) references
      parent (id)) engine=innodb;
      
      insert into child values (1,1,2);
      
      insert into child(a) values (1) on duplicate key update c = 3;
      
      Now primary key value 1 naturally causes duplicate key error that will be
      stored on node->duplicate. If there was no duplicate key error, we should
      return the actual no referenced row error. As value for column b used in
      both unique key and foreign key is not provided, server uses 0 as a
      search value. This is naturally, not found leading to DB_NO_REFERENCED_ROW.
      But, we should update the row with primay key value 1 anyway as
      requested by on duplicate key update clause.
      0c4d11e8
    • Jun Su's avatar
      Support CRC32 SSE2 implementation under Windows · 2401d14e
      Jun Su authored
      2401d14e
  6. 15 Nov, 2017 6 commits
  7. 14 Nov, 2017 3 commits
  8. 13 Nov, 2017 8 commits
  9. 12 Nov, 2017 1 commit
  10. 11 Nov, 2017 1 commit
  11. 10 Nov, 2017 6 commits
  12. 09 Nov, 2017 5 commits
    • Marko Mäkelä's avatar
      MDEV-13795/MDEV-14332 Corruption during online table-rebuilding ALTER when VIRTUAL columns exist · 5d142f99
      Marko Mäkelä authored
      When MySQL 5.7 introduced indexed virtual columns, it introduced
      several bugs into the online table-rebuilding ALTER, that is,
      the row_log_table_apply() family of functions.
      
      The online_log format that was introduced for online table-rebuilding
      ALTER in MySQL 5.6 should be sufficient. Ideally, any indexed virtual
      column values would be evaluated based on the log records in the temporary
      file. There is no need to log virtual column values.
      
      (For ADD INDEX, that is row_log_apply(), we always must log the values of
      the keys, no matter if the columns are virtual.)
      
      Because omitting the virtual column values removes any chance of
      row_log_table_apply() working with indexed virtual columns, we
      will for now refuse LOCK=NONE in table-rebuilding ALTER operations
      when indexes on virtual columns exist. This restriction would be
      lifted in MDEV-14341.
      
      innobase_indexed_virtual_exist(): New predicate, to determine if
      indexed virtual columns exist in a table definition.
      
      ha_innobase::check_if_supported_inplace_alter(): Refuse online rebuild
      if indexed virtual columns exist.
      
      rec_get_converted_size_temp_v(), rec_convert_dtuple_to_temp_v(): Remove.
      
      row_log_table_delete(), row_log_table_update(, row_log_table_insert():
      Remove parameters for virtual columns.
      
      trx_undo_read_v_rows(): Remove the col_map parameter.
      
      row_log_table_apply(): Do not deal with virtual columns.
      5d142f99
    • Monty's avatar
      Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext · 0bb0d522
      Monty authored
      Conflicts:
      	mysql-test/r/cte_recursive.result
      	mysql-test/r/derived_cond_pushdown.result
      	mysql-test/t/cte_recursive.test
      	mysql-test/t/derived_cond_pushdown.test
      	sql/datadict.cc
      	sql/handler.cc
      0bb0d522
    • Sergei Petrunia's avatar
    • Monty's avatar
      d40c2357
    • Marko Mäkelä's avatar
      Merge 10.1 into 10.2 · 761cf492
      Marko Mäkelä authored
      761cf492