diff options
| author | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-11-01 12:34:42 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-11-01 12:34:42 +0400 |
| commit | 9ba0d4da21b0074bfe554d27050f291f9b27efce (patch) | |
| tree | afe5c175ca691d1a9eb503e21a41da2a092cc412 /BitKeeper | |
| parent | b38f6f0afda8ccbf8bf52d33b2d743628e7c70e7 (diff) | |
| parent | 74a628183e4acbbc34c34f228a373e2f9dac26cf (diff) | |
| download | mariadb-git-9ba0d4da21b0074bfe554d27050f291f9b27efce.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into mysql.com:/usr/home/bar/mysql-5.0.b22877
BitKeeper/etc/collapsed:
auto-union
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/collapsed | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 224b77be41b..dd7fddf1de3 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -8,3 +8,4 @@ 4519a6c5BVUxEHTf5iJnjZkixMBs8g 451ab499rgdjXyOnUDqHu-wBDoS-OQ 452c6c6dAjuNghfc1ObZ_UQ5SCl85g +4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg |