summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-11-22 03:45:02 +0200
committermonty@donna.mysql.com <>2000-11-22 03:45:02 +0200
commite049538cb02c000e7c62d5662429b7db02941844 (patch)
tree86a351dd4dd65b86a54c5a4cf62c8500e6ae110b /sql/sql_table.cc
parent4f91d5b5fe1349c5bdf6be567dece52cc632d8e7 (diff)
downloadmariadb-git-e049538cb02c000e7c62d5662429b7db02941844.tar.gz
Split error message for crashed table to 3 different error messages.
Fixes for Windows
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 68b5d90217c..d1be84b4143 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -650,8 +650,8 @@ TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
(Item_result_field***) 0, &tmp_field,0,0);
if (!field ||
!(cr_field=new create_field(field,(item->type() == Item::FIELD_ITEM ?
- ((Item_field *)item)->field : NULL)
- )))
+ ((Item_field *)item)->field :
+ (Field*) 0))))
DBUG_RETURN(0);
extra_fields->push_back(cr_field);
}