Merge pull request #72 from SequoiaDBTeam/master

Revision: 35050

SequoiaDB/engine/include/ossVer_Autogen.h

@@ -6,7 +6,7 @@
 #define SDB_ENGINE_INCLUDE_AUTOGEN_RELATIVE_PATH "../../SequoiaDB/engine/include/"
 #define SDB_ENGINE_OSSVER_FILE_RELATIVE_PATH SDB_ENGINE_INCLUDE_AUTOGEN_RELATIVE_PATH SDB_ENGINE_OSSVER_FILE
 
-#define SDB_ENGINE_RELEASE_CURRENT 35048
+#define SDB_ENGINE_RELEASE_CURRENT 35050
 #define SDB_ENGINE_BUILD_FORMAT "%04d-%02d-%02d-%02d.%02d.%02d"
 #define SDB_ENGINE_BUILD_CURRENT "0000-00-00-00.00.00"
 

driver/mysql/ha_sdb.cc

@@ -1307,6 +1307,8 @@ bool ha_sdb::inplace_alter_table( TABLE *altered_table,
 {
    THD *thd = current_thd ;
    bool rs = false ;
+   int rc = 0 ;
+
    Alter_inplace_info::HA_ALTER_FLAGS inplace_online_addidx
       = Alter_inplace_info::ADD_INDEX
       | Alter_inplace_info::ADD_UNIQUE_INDEX
@@ -1319,16 +1321,20 @@ bool ha_sdb::inplace_alter_table( TABLE *altered_table,
 
    if ( ha_alter_info->handler_flags & inplace_online_addidx )
    {
-      if ( 0 != create_index( ha_alter_info ) )
+      rc = create_index( ha_alter_info ) ;
+      if ( 0 != rc )
       {
+         my_error( ER_GET_ERRNO, MYF(0), rc );
          rs = true ;
          goto error ;
       }
    }
    if ( ha_alter_info->handler_flags & inplace_online_dropidx )
    {
-      if ( 0 != drop_index( ha_alter_info ) )
+      rc = drop_index( ha_alter_info ) ;
+      if ( 0 != rc )
       {
+         my_error( ER_GET_ERRNO, MYF(0), rc );
          rs = true ;
          goto error ;
       }

driver/mysql/sdb_item.cc

@@ -317,7 +317,7 @@ int sdb_func_item::get_item_val( const char *field_name,
                                 bson::BSONArrayBuilder *arr_builder )
 {
    int rc = SDB_ERR_OK ;
-   char buff[MAX_FIELD_WIDTH];
+   char buff[MAX_FIELD_WIDTH] = {0};
    
    if ( NULL == item_val )
    {