database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2014-02-01 00:54:03 +01:00
parent ce02738d7f 6b6d40fa6c
commit 59d9d08e2b
304 changed files with 12473 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/partition_info.cc
View File

@@ -1330,7 +1330,7 @@ end:
RETURN VALUES
*/
void partition_info::print_no_partition_found(TABLE *table_arg)
void partition_info::print_no_partition_found(TABLE *table_arg, myf errflag)
{
char buf[100];
char *buf_ptr= (char*)&buf;
@@ -1344,7 +1344,7 @@ void partition_info::print_no_partition_found(TABLE *table_arg)
SELECT_ACL, &table_list, TRUE))
{
my_message(ER_NO_PARTITION_FOR_GIVEN_VALUE,
ER(ER_NO_PARTITION_FOR_GIVEN_VALUE_SILENT), MYF(0));
ER(ER_NO_PARTITION_FOR_GIVEN_VALUE_SILENT), errflag);
}
else
{
@@ -1360,7 +1360,7 @@ void partition_info::print_no_partition_found(TABLE *table_arg)
part_expr->unsigned_flag ? 10 : -10);
dbug_tmp_restore_column_map(table_arg->read_set, old_map);
}
my_error(ER_NO_PARTITION_FOR_GIVEN_VALUE, MYF(0), buf_ptr);
my_error(ER_NO_PARTITION_FOR_GIVEN_VALUE, errflag, buf_ptr);
}
}