1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-merge mysql-5.1->mysql-5.5

Browse Source
This commit is contained in:
Georgi Kodinov 2011-11-04 14:33:38 +02:00
commit 019be175f6
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/sql_string.cc
View File

@ -188,7 +188,8 @@ end:
#else #else
#ifdef HAVE_SNPRINTF #ifdef HAVE_SNPRINTF
buff[sizeof(buff)-1]=0; // Safety buff[sizeof(buff)-1]=0; // Safety
int num_chars= snprintf(buff, sizeof(buff)-1, "%.*f",(int) decimals, num); IF_DBUG(int num_chars= )
snprintf(buff, sizeof(buff)-1, "%.*f",(int) decimals, num);
DBUG_ASSERT(num_chars > 0); DBUG_ASSERT(num_chars > 0);
DBUG_ASSERT(num_chars < (int) sizeof(buff)); DBUG_ASSERT(num_chars < (int) sizeof(buff));
#else #else

3
sql/sql_string.cc
View File

@ -200,7 +200,8 @@ end:
#else #else
#ifdef HAVE_SNPRINTF #ifdef HAVE_SNPRINTF
buff[sizeof(buff)-1]=0; // Safety buff[sizeof(buff)-1]=0; // Safety
int num_chars= snprintf(buff, sizeof(buff)-1, "%.*f",(int) decimals, num); IF_DBUG(int num_chars= )
snprintf(buff, sizeof(buff)-1, "%.*f",(int) decimals, num);
DBUG_ASSERT(num_chars > 0); DBUG_ASSERT(num_chars > 0);
DBUG_ASSERT(num_chars < (int) sizeof(buff)); DBUG_ASSERT(num_chars < (int) sizeof(buff));
#else #else

2
sql/sql_table.cc
View File

@ -6985,7 +6985,7 @@ view_err:
need_copy_table= ALTER_TABLE_DATA_CHANGED; need_copy_table= ALTER_TABLE_DATA_CHANGED;
else else
{ {
enum_alter_table_change_level need_copy_table_res; enum_alter_table_change_level need_copy_table_res=ALTER_TABLE_METADATA_ONLY;
/* Check how much the tables differ. */ /* Check how much the tables differ. */
if (compare_tables(table, alter_info, if (compare_tables(table, alter_info,
create_info, order_num, create_info, order_num,

5
storage/innodb_plugin/ChangeLog
View File

@ -1,3 +1,8 @@
2011-10-27 The InnoDB Team
* row/row0mysql.c:
Fix Bug #12884631 62146: TABLES ARE LOST FOR DDL
2011-10-25 The InnoDB Team 2011-10-25 The InnoDB Team
* handler/ha_innodb.cc, row/row0ins.c: * handler/ha_innodb.cc, row/row0ins.c:

3
storage/innodb_plugin/row/row0mysql.c
View File

@ -1,6 +1,6 @@
/***************************************************************************** /*****************************************************************************
Copyright (c) 2000, 2010, Innobase Oy. All Rights Reserved. Copyright (c) 2000, 2011, Oracle and/or its affiliates. All Rights Reserved.
This program is free software; you can redistribute it and/or modify it under 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 the terms of the GNU General Public License as published by the Free Software
@ -3971,6 +3971,7 @@ end:
trx->error_state = DB_SUCCESS; trx->error_state = DB_SUCCESS;
trx_general_rollback_for_mysql(trx, NULL); trx_general_rollback_for_mysql(trx, NULL);
trx->error_state = DB_SUCCESS; trx->error_state = DB_SUCCESS;
err = DB_ERROR;
goto funct_exit; goto funct_exit;
} }