diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-01-18 09:53:07 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-01-18 09:53:07 -0500 |
| commit | 98d31c694dc4d16420f0cc79c012c2ce13600883 (patch) | |
| tree | fdfb5b7440beb04eadc9217ed76e87790cf94060 /BitKeeper | |
| parent | 384b21216816181a26591ef269fd9f53c826c128 (diff) | |
| parent | 83d06868b8a56e823cd7058faa6649c071ab319c (diff) | |
| download | mariadb-git-98d31c694dc4d16420f0cc79c012c2ce13600883.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-community
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/collapsed | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index e754ac133ea..43292906ddd 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -32,3 +32,5 @@ 459c03b9N_mqF2XJKK6DwSrIt7e6_g 459c1965_BQMBzBO8S_gVqjTHYQrmw 459c2098XoAUsUn8N07IVRDD6CTM-A +459ea845XenN-uWqEM5LFvUT60tW_A +45af88c9RIIJWPfBxs3o7zekI-ELPQ |