diff options
| author | unknown <monty@mysql.com> | 2004-10-22 18:44:51 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-22 18:44:51 +0300 |
| commit | bc6652db9b1f5f302648c3a920fb1fa25449a6d8 (patch) | |
| tree | 6faefd7a2f197f4031ef94eb74fc71f8f2936185 /sql/item.h | |
| parent | cfcca61a177eecacdc2c525c1ba4fea082b1b1c4 (diff) | |
| download | mariadb-git-bc6652db9b1f5f302648c3a920fb1fa25449a6d8.tar.gz | |
Fix compiler warnings (detected by Intel's C++ compiler)
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)
client/mysql.cc:
Fix compiler warnings
client/mysqltest.c:
Fix wrong counting of lines
Remove compiler warnings
heap/hp_hash.c:
Fix compiler warnings
innobase/dict/dict0load.c:
Fix compiler warnings
innobase/include/mem0mem.h:
Fix compiler warnings
libmysql/client_settings.h:
Fix compiler warnings
myisam/ft_nlq_search.c:
Add comments about compiler warnings
myisam/rt_index.c:
Add comments about compiler warnings
myisam/rt_mbr.c:
Add comments about compiler warnings
mysql-test/r/ps.result:
Test case for bug#6094
mysql-test/t/ps.test:
Test case for bug#6094
mysys/hash.c:
Fix compiler warnings
mysys/my_handler.c:
Add comments about compiler warnings
mysys/my_thr_init.c:
Add comments about compiler warnings
ndb/include/mgmapi/mgmapi.h:
Fix compiler warnings
regex/main.c:
Fix compiler warnings
sql/item.h:
Fix compiler warnings
sql/item_func.h:
Add comments about compiler warnings
sql/spatial.h:
Add comments about compiler warnings
sql/sql_lex.h:
Fix compiler warning
sql/sql_list.h:
Fix compiler warning
sql/sql_parse.cc:
Move testing of access rights of tables in CREATE ... SELECT to create_table_precheck() to fix privilege checking in CREATE ... SELECT
(Bug #6094)
sql/sql_prepare.cc:
Remove not needed empty line
sql/sql_string.h:
Fix compiler warnings
strings/ctype-mb.c:
Fix compiler warnings
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index b3142ec4b06..0bf12794404 100644 --- a/sql/item.h +++ b/sql/item.h @@ -97,7 +97,8 @@ public: static void *operator new(size_t size) {return (void*) sql_alloc((uint) size); } static void *operator new(size_t size, MEM_ROOT *mem_root) { return (void*) alloc_root(mem_root, (uint) size); } - static void operator delete(void *ptr,size_t size) {} /*lint -e715 */ + static void operator delete(void *ptr,size_t size) {} + static void operator delete(void *ptr,size_t size, MEM_ROOT *mem_root) {} enum Type {FIELD_ITEM, FUNC_ITEM, SUM_FUNC_ITEM, STRING_ITEM, INT_ITEM, REAL_ITEM, NULL_ITEM, VARBIN_ITEM, |