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

into  linux.site:/home/reggie/work/mysql-5.1


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
This commit is contained in:
unknown 2006-03-07 14:52:51 -06:00
commit 49b926adb0
178 changed files with 3466 additions and 2308 deletions

View file

@ -5127,6 +5127,7 @@ void ha_partition::print_error(int error, myf errflag)
{
char buf[100];
my_error(ER_NO_PARTITION_FOR_GIVEN_VALUE, MYF(0),
m_part_info->part_expr->null_value ? "NULL" :
llstr(m_part_info->part_expr->val_int(), buf));
}
else