mirror of
				https://github.com/MariaDB/server.git
				synced 2025-11-03 14:33:32 +03:00 
			
		
		
		
	This is the non-ndb part of the patch. The return value of mysql_bin_log.write was ignored by most callers, which may lead to inconsistent on master and slave if the transaction was committed while the binlog was not correctly written. If my_error() is call in mysql_bin_log.write, this could also lead to assertion issue if my_ok() or my_error() is called after. This fixed the problem by let the caller to check and handle the return value of mysql_bin_log.write. This patch only adresses the simple cases.
		
			
				
	
	
		
			72 lines
		
	
	
		
			2.3 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			72 lines
		
	
	
		
			2.3 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
/* Copyright (C) 2000-2004 MySQL AB
 | 
						|
 | 
						|
   This program is free software; you can redistribute it and/or modify
 | 
						|
   it under the terms of the GNU General Public License as published by
 | 
						|
   the Free Software Foundation; version 2 of the License.
 | 
						|
 | 
						|
   This program is distributed in the hope that it will be useful,
 | 
						|
   but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
   GNU General Public License for more details.
 | 
						|
 | 
						|
   You should have received a copy of the GNU General Public License
 | 
						|
   along with this program; if not, write to the Free Software
 | 
						|
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 | 
						|
 | 
						|
/* drop and alter of tablespaces */
 | 
						|
 | 
						|
#include "mysql_priv.h"
 | 
						|
 | 
						|
int mysql_alter_tablespace(THD *thd, st_alter_tablespace *ts_info)
 | 
						|
{
 | 
						|
  int error= HA_ADMIN_NOT_IMPLEMENTED;
 | 
						|
  handlerton *hton= ts_info->storage_engine;
 | 
						|
 | 
						|
  DBUG_ENTER("mysql_alter_tablespace");
 | 
						|
  /*
 | 
						|
    If the user haven't defined an engine, this will fallback to using the
 | 
						|
    default storage engine.
 | 
						|
  */
 | 
						|
  if (hton == NULL || hton->state != SHOW_OPTION_YES)
 | 
						|
  {
 | 
						|
    hton= ha_default_handlerton(thd);
 | 
						|
    if (ts_info->storage_engine != 0)
 | 
						|
      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 | 
						|
                          ER_WARN_USING_OTHER_HANDLER,
 | 
						|
                          ER(ER_WARN_USING_OTHER_HANDLER),
 | 
						|
                          ha_resolve_storage_engine_name(hton),
 | 
						|
                          ts_info->tablespace_name ? ts_info->tablespace_name
 | 
						|
                                                : ts_info->logfile_group_name);
 | 
						|
  }
 | 
						|
 | 
						|
  if (hton->alter_tablespace)
 | 
						|
  {
 | 
						|
    if ((error= hton->alter_tablespace(hton, thd, ts_info)))
 | 
						|
    {
 | 
						|
      if (error == HA_ADMIN_NOT_IMPLEMENTED)
 | 
						|
      {
 | 
						|
        my_error(ER_CHECK_NOT_IMPLEMENTED, MYF(0), "");
 | 
						|
      }
 | 
						|
      else if (error == 1)
 | 
						|
      {
 | 
						|
        DBUG_RETURN(1);
 | 
						|
      }
 | 
						|
      else
 | 
						|
      {
 | 
						|
        my_error(error, MYF(0));
 | 
						|
      }
 | 
						|
      DBUG_RETURN(error);
 | 
						|
    }
 | 
						|
  }
 | 
						|
  else
 | 
						|
  {
 | 
						|
    push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
 | 
						|
                        ER_ILLEGAL_HA_CREATE_OPTION,
 | 
						|
                        ER(ER_ILLEGAL_HA_CREATE_OPTION),
 | 
						|
                        ha_resolve_storage_engine_name(hton),
 | 
						|
                        "TABLESPACE or LOGFILE GROUP");
 | 
						|
  }
 | 
						|
  error= write_bin_log(thd, FALSE, thd->query(), thd->query_length());
 | 
						|
  DBUG_RETURN(error);
 | 
						|
}
 |