diff options
author | unknown <monty@hundin.mysql.fi> | 2001-09-17 00:32:45 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-09-17 00:32:45 +0300 |
commit | 5810866b69ab1ef14b26305fa45943686377da2b (patch) | |
tree | 667c6b8bf135f8c3fe9c4fccd1bb8ec99d08b795 /sql/sql_handler.cc | |
parent | 482735b566a10c4331aa84059612489d89d77e88 (diff) | |
download | mariadb-git-5810866b69ab1ef14b26305fa45943686377da2b.tar.gz |
Portability fixes
client/Makefile.am:
Cleanup
sql/Makefile.am:
Cleanup
sql/share/dutch/errmsg.txt:
Added missing error messages
sql/share/ukrainian/errmsg.txt:
Added missing error messages
sql/sql_handler.cc:
Portability fix
tools/Makefile.am:
Portability fix
Diffstat (limited to 'sql/sql_handler.cc')
-rw-r--r-- | sql/sql_handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 98cc523dc9b..668c5f07839 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -159,7 +159,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, item->save_in_field(key_part->field); key_len+=key_part->store_length; } - if (!(key=sql_calloc(ALIGN_SIZE(key_len)))) + if (!(key= (byte*) sql_calloc(ALIGN_SIZE(key_len)))) { send_error(&thd->net,ER_OUTOFMEMORY); goto err; |