diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2006-12-31 12:41:42 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2006-12-31 12:41:42 +0400 |
| commit | cbff25d04ae0d72c2a42d78aea33764d0818808e (patch) | |
| tree | 141237cc110455e8b067a8fc14d520bdf40aa4bf /BitKeeper | |
| parent | d73b5b8e83c1ae52e35e73d0338c296b9383e2b4 (diff) | |
| parent | a2fc58745115a17a8e12a9c46c9631e6d9576551 (diff) | |
| download | mariadb-git-cbff25d04ae0d72c2a42d78aea33764d0818808e.tar.gz | |
Merge mysql.com:/d2/hf/clean/my51-clean
into mysql.com:/d2/hf/common/my51-common
libmysqld/Makefile.am:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_insert.cc:
Auto merged
BitKeeper/deleted/.del-ps_not_windows.test:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/gone | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/gone b/BitKeeper/etc/gone index 5964232680e..80830a01906 100644 --- a/BitKeeper/etc/gone +++ b/BitKeeper/etc/gone @@ -456,6 +456,8 @@ arjen@fred.bitbike.com|scripts/mysql_fix_extensions.sh|20020516001337|12363|f104 ccarkner@nslinuxw10.bedford.progress.com|mysql-test/r/isolation.result|20010327145543|25059|4da11e109a3d93a9 ccarkner@nslinuxw10.bedford.progress.com|mysql-test/t/isolation.test|20010327145543|39049|6a39e4138dd4a456 fs +holyfoot/hf@mysql.com/deer.(none)|mysql-test/r/bdb_notembedded.result|20061113160642|60022|276fa5181da9a588 +holyfoot/hf@mysql.com/deer.(none)|mysql-test/t/bdb_notembedded.test|20061113160642|06094|6ef2ea4713496614 jani@hynda.mysql.fi|client/mysqlcheck|20010419221207|26716|363e3278166d84ec jcole@tetra.bedford.progress.com|BitKeeper/etc/logging_ok|20001004201211|30554 jimw@mysql.com|mysql-test/t/ndb_alter_table.disabled|20050311230559|27526|411e026940e7a0aa |