diff options
| author | unknown <monty@mishka.local> | 2004-04-27 15:33:40 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-04-27 15:33:40 +0300 |
| commit | a3828081cde644ab551c21a621b8e6ab69923e6a (patch) | |
| tree | 4b29146428c84ab3e10e4007d26e3c0b4b2b1074 /innobase/include/ut0mem.h | |
| parent | 1065f2bbd66ac4b1161f5c188171a54cbad5b422 (diff) | |
| download | mariadb-git-a3828081cde644ab551c21a621b8e6ab69923e6a.tar.gz | |
After merge fixes
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'
client/client_priv.h:
Added option 'create_options' for mysqldump
client/mysqldump.c:
Changed '--all' to '--create-options' as the old name was meaningless
innobase/buf/buf0buf.c:
After merge fixes
innobase/buf/buf0lru.c:
After merge fixes
innobase/buf/buf0rea.c:
After merge fixes
innobase/dict/dict0load.c:
After merge fixes
innobase/fil/fil0fil.c:
After merge fixes
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/include/fil0fil.h:
After merge fixes
innobase/include/row0mysql.h:
After merge fixes
innobase/include/ut0mem.h:
After merge fixes
innobase/log/log0recv.c:
After merge fixes
innobase/row/row0mysql.c:
After merge fixes
innobase/row/row0sel.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
innobase/sync/sync0rw.c:
After merge fixes
innobase/sync/sync0sync.c:
After merge fixes
myisam/ft_boolean_search.c:
After merge fixes
myisam/ft_nlq_search.c:
After merge fixes
mysql-test/r/mysqldump.result:
After merge fixes
mysql-test/t/mysqldump.test:
Make result file smaller
Some new tests
sql/ha_innodb.cc:
After merge fixes
sql/set_var.cc:
Removed compiler warning
sql/slave.cc:
After merge fixes
sql/slave.h:
After merge fixes
sql/sql_show.cc:
Type -> Engine
Diffstat (limited to 'innobase/include/ut0mem.h')
| -rw-r--r-- | innobase/include/ut0mem.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/innobase/include/ut0mem.h b/innobase/include/ut0mem.h index 7ca2c26e840..b208fac8691 100644 --- a/innobase/include/ut0mem.h +++ b/innobase/include/ut0mem.h @@ -128,6 +128,8 @@ ut_str_catenate( /* out, own: catenated null-terminated string */ char* str1, /* in: null-terminated string */ char* str2); /* in: null-terminated string */ + +/************************************************************************** Return a copy of the given string. The returned string must be freed using mem_free. */ @@ -136,7 +138,6 @@ ut_strdup( /*======*/ /* out, own: cnull-terminated string */ char* str); /* in: null-terminated string */ -/************************************************************************** #ifndef UNIV_NONINL #include "ut0mem.ic" |