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

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into mysql.com:/home/psergey/mysql-5.1-ppruning-r5
This commit is contained in:
unknown
2006-01-18 21:35:44 +03:00
parent 5a6285c5f7 4475baa253
commit 9d6f47eb93
6 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/ndb_alter_table_row.result
View File

@@ -8,8 +8,6 @@ a b c
2 two two 2 two two
alter table t1 drop index c; alter table t1 drop index c;
select * from t1 where c = 'two'; select * from t1 where c = 'two';
ERROR HY000: Table definition has changed, please retry transaction
select * from t1 where c = 'two';
a b c a b c
2 two two 2 two two
drop table t1; drop table t1;

1
mysql-test/t/disabled.def
View File

@@ -26,6 +26,5 @@ rpl_ndb_basic : Bug#16228
rpl_sp : Bug #16456 rpl_sp : Bug #16456
ndb_autodiscover : Needs to be fixed w.r.t binlog ndb_autodiscover : Needs to be fixed w.r.t binlog
ndb_autodiscover2 : Needs to be fixed w.r.t binlog ndb_autodiscover2 : Needs to be fixed w.r.t binlog
ndb_alter_table_row : dbug assert in RBR mode when executing test suite
ndb_condition_pushdown: Bug #16596: Crash in mysql_unpack_partition ndb_condition_pushdown: Bug #16596: Crash in mysql_unpack_partition
ndb_index_ordered : Bug #16596: Crash in mysql_unpack_partition ndb_index_ordered : Bug #16596: Crash in mysql_unpack_partition

2
mysql-test/t/ndb_alter_table_row.test
View File

@@ -17,8 +17,6 @@ select * from t1 where c = 'two';
connection server1; connection server1;
alter table t1 drop index c; alter table t1 drop index c;
connection server2; connection server2;
--error 1412
select * from t1 where c = 'two';
select * from t1 where c = 'two'; select * from t1 where c = 'two';
connection server1; connection server1;
drop table t1; drop table t1;

1
sql/ha_ndbcluster.cc
View File

@@ -9161,6 +9161,7 @@ uint ha_ndbcluster::set_up_partition_info(partition_info *part_info,
bool ha_ndbcluster::check_if_incompatible_data(HA_CREATE_INFO *info, bool ha_ndbcluster::check_if_incompatible_data(HA_CREATE_INFO *info,
uint table_changes) uint table_changes)
{ {
return COMPATIBLE_DATA_NO; // Disable fast add/drop index
if (table_changes != IS_EQUAL_YES) if (table_changes != IS_EQUAL_YES)
return COMPATIBLE_DATA_NO; return COMPATIBLE_DATA_NO;

5
sql/ha_partition.cc
View File

@@ -5009,8 +5009,11 @@ void ha_partition::print_error(int error, myf errflag)
DBUG_PRINT("enter", ("error = %d", error)); DBUG_PRINT("enter", ("error = %d", error));
if (error == HA_ERR_NO_PARTITION_FOUND) if (error == HA_ERR_NO_PARTITION_FOUND)
{
char buf[100];
my_error(ER_NO_PARTITION_FOR_GIVEN_VALUE, MYF(0), my_error(ER_NO_PARTITION_FOR_GIVEN_VALUE, MYF(0),
m_part_info->part_expr->val_int()); llstr(m_part_info->part_expr->val_int(), buf));
}
else else
m_file[0]->print_error(error, errflag); m_file[0]->print_error(error, errflag);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;

2
sql/share/errmsg.txt
View File

@@ -5738,7 +5738,7 @@ ER_PLUGIN_IS_NOT_LOADED
ER_WRONG_VALUE ER_WRONG_VALUE
eng "Incorrect %-.32s value: '%-.128s'" eng "Incorrect %-.32s value: '%-.128s'"
ER_NO_PARTITION_FOR_GIVEN_VALUE ER_NO_PARTITION_FOR_GIVEN_VALUE
eng "Table has no partition for value %ld" eng "Table has no partition for value %-.64s"
ER_TABLESPACE_OPTION_ONLY_ONCE ER_TABLESPACE_OPTION_ONLY_ONCE
eng "It is not allowed to specify %s more than once" eng "It is not allowed to specify %s more than once"
ER_CREATE_TABLESPACE_FAILED ER_CREATE_TABLESPACE_FAILED