database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge with 5.2.

Browse Source 
no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
This commit is contained in:
Michael Widenius
2011-12-11 11:34:44 +02:00
parent 3e2cb35e11 701c0f822a
commit 6d4224a31c
1166 changed files with 25635 additions and 15193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_plugin.cc
View File

@ -1,4 +1,5 @@
/* Copyright (C) 2005 MySQL AB, 2009 Sun Microsystems, Inc.
/*
Copyright (c) 2005, 2011, Oracle and/or its affiliates.
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
@ -11,7 +12,8 @@
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 */
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "mysql_priv.h"
#include <my_pthread.h>
@ -479,7 +481,7 @@ static my_bool read_mysql_plugin_info(struct st_plugin_dl *plugin_dl,
if (!cur)
{
free_plugin_mem(plugin_dl);
report_error(report, ER_OUTOFMEMORY, plugin_dl->dl.length);
report_error(report, ER_OUTOFMEMORY, (int) plugin_dl->dl.length);
DBUG_RETURN(TRUE);
}
/*
@ -604,7 +606,7 @@ static my_bool read_maria_plugin_info(struct st_plugin_dl *plugin_dl,
if (!cur)
{
free_plugin_mem(plugin_dl);
report_error(report, ER_OUTOFMEMORY, plugin_dl->dl.length);
report_error(report, ER_OUTOFMEMORY, (int) plugin_dl->dl.length);
DBUG_RETURN(TRUE);
}
/*
@ -718,7 +720,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
if (! (plugin_dl.dl.str= (char*) my_malloc(plugin_dl.dl.length, MYF(0))))
{
free_plugin_mem(&plugin_dl);
report_error(report, ER_OUTOFMEMORY, plugin_dl.dl.length);
report_error(report, ER_OUTOFMEMORY, (int) plugin_dl.dl.length);
DBUG_RETURN(0);
}
plugin_dl.dl.length= copy_and_convert(plugin_dl.dl.str, plugin_dl.dl.length,
@ -729,7 +731,7 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
if (! (tmp= plugin_dl_insert_or_reuse(&plugin_dl)))
{
free_plugin_mem(&plugin_dl);
report_error(report, ER_OUTOFMEMORY, sizeof(struct st_plugin_dl));
report_error(report, ER_OUTOFMEMORY, (int) sizeof(struct st_plugin_dl));
DBUG_RETURN(0);
}
DBUG_RETURN(tmp);