This reverts commit 49de9567.

A trivial fix

This .result file is not a statement of which storage engine
should be used for any particular table in mysql database.

This is just a check that a query against I_S doesn't crash.

Most tests use CREATE TABLE ... ENGINE=ROCKSB, but there are some
exceptions: rpl_savepoint, rpl_row_stats.
In order to avoid any "oh we are using the wrong storage engine"
surprises, set the default for the whole testsuite.

The test runs $MYSQLD_BOOTSTRAP_CMD but that command does not include
arguments for loading ha_rocksdb.so plugin. Add them.

The mssages are caused by log_warnings=2.
Set log_warnings=1 for the rocksdb test suite.

This reverts commit 38919f68.

Temporary revert to be able to see other failures until builders are
updated.

Add a suppression

- Disable rocksdb.show_enge
- Disable rocksdb.rpl_row_not_found

- Run rocksdb.blind_delete_without_tx_api only with binlog_format=row
  (like its .cnf file specifies)

These are not expected to work yet.

The default value of 1 causes many tests to time out (primary reason is
that many tests populate tables with one-row INSERT statements that
run with autocommit=1).

\include\mysql/psi/psi.h(1267): error C2061: syntax error:
identifier 'pthread_t' (compiling source file D:\win32-debug\build\src
\storage\rocksdb\rdb_psi.cc)\include\mysql/psi/psi.h(1267):
error C2061: syntax error: identifier 'pthread_t' (compiling source
file D:\win32-debug\build\src\storage\rocksdb\rdb_psi.cc)

This is a second such fix, the first was wiped out in a merge.

Manually resolved a few conflicts

Compatibility links ended up looking like this:
libmysqlclient.so.18 -> /tmp/buildd/mariadb-10.2-10.2.0/debian/tmp/usr/lib/i386-linux-gnu/libmariadb.so.3

This change fixes ln syntax to create links with correct target paths.

commit ba00e640f658ad8d0a4dff09a497a51b8a4de935
Author: Herman Lee <herman@fb.com>
Date:   Wed Feb 22 06:30:06 2017 -0800

    Improve add_index_alter_cardinality test

    Summary:
    Split add_index_inplace_cardinality test out and add a debug_sync point
    to it so that the flush of the memtable occurs while the alter is
    running.
    Closes https://github.com/facebook/mysql-5.6/pull/539

    Reviewed By: alxyang

    Differential Revision: D4597887

    Pulled By: hermanlee

    fbshipit-source-id: faedda2

Reason : after running sysbench tests (rw,update_no_index), in all cases
the throughout was considerably (approx 15%) better with the patch removed.

Reverted commit info
commit 8dc03bee3ade2edcc53a3a257346f4a0a9f0b44c
Author: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
Date:   Wed Nov 20 17:02:24 2013 +0900

Bug #17824101 : WL#7050 CAUSES RW PERFORMANCE REGRESSION AT SOME WINDOWS ENVIRONMENT

#define __STDC_FORMAT_MACROS. Unfortunately there is no single location
that would be #includ'ed before everything else. Have to put the #define
into each .cc file

InnoDB undo logs currently always use the innodb_page_size,
whether they are stored in the system tablespace, in a
dedicated undo tablespace, or in the temporary tablespace.
Remove redundant page_size parameters.

TrxUndoRsegsIterator::set_next(): return bool instead of page_size.

trx_rseg_mem_create(): Remove the parameter rseg_array.
Update trx_sys->rseg_array directly.

TrxUndoRsegsIterator::m_purge_sys: Remove. There is only one purge_sys.

purge_sys_t: Renamed from trx_purge_t. Define a constructor and
destructor. Allocate rseg_iter, purge_queue inline.

purge_sys->trx: Remove. Use purge_sys->sess->trx instead.

purge_sys->view_active: Remove. Access to purge_sys->view is always
protected by purge_sys->latch.

trx_purge_sys_create(): Replaced by purge_sys_t::purge_sys_t().

trx_purge_sys_close(): Replaced by purge_sys_t::~purge_sys_t().

Also in log_checkpoint(), where fil_flush_file_spaces() was
not done on Windows, it is not done.

 Remove srv_win_file_flush_method

- Rename srv_unix_file_flush_method to srv_file_flush_method, and
  rename constants to remove UNIX from them, i.e SRV_UNIX_FSYNC=>SRV_FSYNC

- Add SRV_ALL_O_DIRECT_FSYNC corresponding to current Windows default
(no buffering for either log or data, flush on both log and data)

- change os_file_open on Windows to behave identically to Unix wrt
O_DIRECT and O_DSYNC settings. map O_DIRECT to FILE_FLAG_NO_BUFFERING and
O_DSYNC to FILE_FLAG_WRITE_THROUGH

- remove various #ifdef _WIN32