diff options
| author | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-11-03 10:29:44 +0400 |
|---|---|---|
| committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-11-03 10:29:44 +0400 |
| commit | 33dfb4ea39fa9d56f90c976f1dcf1fd711513c9f (patch) | |
| tree | ff19959abc0e07bddc35e7501eb6079757331ce7 /BitKeeper | |
| parent | 3ff009860c7b597d8305daffaf9e337a868abbf4 (diff) | |
| parent | fff7e9199d9f0c150d35b54c3b81dfc9ec0b75c0 (diff) | |
| download | mariadb-git-33dfb4ea39fa9d56f90c976f1dcf1fd711513c9f.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0-rpl
into mysql.com:/usr/home/bar/mysql-5.1-rpl
BitKeeper/etc/collapsed:
auto-union
include/m_ctype.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
sql/field.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_string.cc:
Auto merged
storage/myisam/mi_open.c:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-mb.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
mysql-test/t/rpl_ignore_table.test:
After merge fix.
sql/slave.cc:
After merge fix
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 |