diff options
| author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-03-05 12:04:37 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-03-05 12:04:37 +0400 |
| commit | a6c2de6067fd27b479a284c1b5fecfbd527155aa (patch) | |
| tree | d2584464ee7467773e52bba65f5ae4063f6a9daa /mysql-test/t/bdb-alter-table-2-master.opt | |
| parent | 81c3505967461a0848fb3c06a12b3bf1371a4f2f (diff) | |
| parent | 7fc2a2a765f976bd0ee7a5c965d33b429aba1a52 (diff) | |
| download | mariadb-git-a6c2de6067fd27b479a284c1b5fecfbd527155aa.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/home/ram/work/b23616/b23616.5.0
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql-common/my_time.c:
Auto merged
Diffstat (limited to 'mysql-test/t/bdb-alter-table-2-master.opt')
0 files changed, 0 insertions, 0 deletions