diff options
| author | unknown <reggie@linux.site> | 2006-03-07 14:52:51 -0600 |
|---|---|---|
| committer | unknown <reggie@linux.site> | 2006-03-07 14:52:51 -0600 |
| commit | 49b926adb0bc50d12bc1fed0c0510137a4dec0d9 (patch) | |
| tree | 0e097da07cb83336f1aad5ab5fa399dbbd835d61 /sql/ha_partition.cc | |
| parent | 5c3a119d9155a879edab7617b95d3516fb0c2a13 (diff) | |
| parent | 217fdd8896fe73e7261c517f9e237d261c876c15 (diff) | |
| download | mariadb-git-49b926adb0bc50d12bc1fed0c0510137a4dec0d9.tar.gz | |
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
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 21ad0aa6a2c..14fa9f0393c 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -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 |