Bug 26654978: WL#10980 Multithreaded XAPI compilation error in Windows using VS 2015

Author: Bogdan Degtyariov

include/mysql_xapi.h

@@ -444,9 +444,9 @@ typedef enum mysqlx_view_check_option_enum
 */
 typedef enum mysqlx_row_locking_enum
 {
-  LOCK_NONE = 0,       /**< No locking */
-  LOCK_SHARED = 1,     /**< Locking in Shared mode */
-  LOCK_EXCLUSIVE = 2   /**< Locking in Exclusive mode */
+  ROW_LOCK_NONE = 0,       /**< No locking */
+  ROW_LOCK_SHARED = 1,     /**< Locking in Shared mode */
+  ROW_LOCK_EXCLUSIVE = 2   /**< Locking in Exclusive mode */
 } mysqlx_row_locking_t;
 
 /*

xapi/crud.cc

@@ -876,13 +876,13 @@ void mysqlx_stmt_t::set_row_locking(mysqlx_row_locking_t row_locking)
     case OP_FIND:
       switch (row_locking)
       {
-        case LOCK_NONE:
+        case ROW_LOCK_NONE:
           m_row_locking = cdk::Lock_mode_value::NONE;
           break;
-        case LOCK_SHARED:
+        case ROW_LOCK_SHARED:
           m_row_locking = cdk::Lock_mode_value::SHARED;
           break;
-        case LOCK_EXCLUSIVE:
+        case ROW_LOCK_EXCLUSIVE:
           m_row_locking = cdk::Lock_mode_value::EXCLUSIVE;
           break;
         default:

xapi/tests/xapi_crud-t.cc

@@ -70,7 +70,7 @@ TEST_F(xapi, test_row_locking)
 
   EXPECT_EQ(RESULT_OK, mysqlx_transaction_begin(get_session()));
   stmt = mysqlx_table_select_new(table);
-  EXPECT_EQ(RESULT_OK, mysqlx_set_select_row_locking(stmt, LOCK_EXCLUSIVE));
+  EXPECT_EQ(RESULT_OK, mysqlx_set_select_row_locking(stmt, ROW_LOCK_EXCLUSIVE));
   CRUD_CHECK(res = mysqlx_execute(stmt), stmt);
 
   printf("\nRows data:");