diff options
| author | unknown <kostja@bodhi.local> | 2006-07-07 22:09:43 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-07-07 22:09:43 +0400 |
| commit | f5340f8c7d3798f4cef7bbc3f7dd1173151ef1d0 (patch) | |
| tree | 9baffd6140dc110806fd9c5531adf2e4f85fb6d0 /.bzrignore | |
| parent | 5ac016a8147602703aae069c076e6b75a3ab5723 (diff) | |
| parent | 685ccf85d40b39e690e99ef735ce202c876468c3 (diff) | |
| download | mariadb-git-f5340f8c7d3798f4cef7bbc3f7dd1173151ef1d0.tar.gz | |
Merge bodhi.local:/opt/local/work/mysql-5.0-root
into bodhi.local:/opt/local/work/mysql-5.0-runtime
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_update.cc:
Manual merge.
Diffstat (limited to '.bzrignore')
0 files changed, 0 insertions, 0 deletions