diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-02-26 01:03:47 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-02-26 01:03:47 +0200 |
| commit | d7802546f38fce0cd24050770b825b2be9bf28be (patch) | |
| tree | c9b14451b3f66dc4b11dc35d49edd35f23787e07 /sql/sql_analyse.h | |
| parent | bf6615cfa8a0e95c73daa704a2f60b968e9ca0d2 (diff) | |
| parent | e9ba6bb4a67aa9349b6bf0966eaa78a102b74f36 (diff) | |
| download | mariadb-git-d7802546f38fce0cd24050770b825b2be9bf28be.tar.gz | |
Merge with 4.0.11
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/FINISH.sh:
Auto merged
client/mysqldump.c:
Auto merged
include/my_base.h:
Auto merged
include/my_pthread.h:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/ut/ut0mem.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/handler.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/innodb_handler.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/bigint.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/innodb_handler.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/sql_analyse.h')
| -rw-r--r-- | sql/sql_analyse.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_analyse.h b/sql/sql_analyse.h index 5f0058c3ad9..d40811a2911 100644 --- a/sql/sql_analyse.h +++ b/sql/sql_analyse.h @@ -312,8 +312,10 @@ public: ~analyse() { if (f_info) + { for (field_info **f=f_info; f != f_end; f++) delete (*f); + } } virtual void add() {} virtual bool change_columns(List<Item> &fields); |