diff options
| author | unknown <mhansson@dl145s.mysql.com> | 2007-12-04 11:32:11 +0100 |
|---|---|---|
| committer | unknown <mhansson@dl145s.mysql.com> | 2007-12-04 11:32:11 +0100 |
| commit | 0f9d3835f88fb858631997b356e85417d42bc667 (patch) | |
| tree | 9ea78cb66b6db0ee915812507016c0227692a057 /sql/sql_manager.h | |
| parent | 6a72267d05ba24953345b9fe516d6bff2f77e8eb (diff) | |
| parent | b4a146a6ebe0ad14d40f241c0a37c9a43c7fd7f3 (diff) | |
| download | mariadb-git-0f9d3835f88fb858631997b356e85417d42bc667.tar.gz | |
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into dl145s.mysql.com:/data0/mhansson/my50-bug30234
sql/sql_yacc.yy:
Auto merged
mysql-test/r/delete.result:
SCCS merged
mysql-test/t/delete.test:
SCCS merged
Diffstat (limited to 'sql/sql_manager.h')
0 files changed, 0 insertions, 0 deletions