diff options
| author | unknown <msvensson@shellback.(none)> | 2006-11-29 19:32:36 +0100 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-11-29 19:32:36 +0100 |
| commit | dbe85caf8e467af3cfb207628d5ebe482175938e (patch) | |
| tree | d8855be8fb2db8bd825a1ecd45138fb02655ddc5 /mysql-test/ndb | |
| parent | 74ff94ec316d4338823089de61fbbb7e929e7329 (diff) | |
| parent | 8f71610f9cd13fafdfd764da5554532b2624e215 (diff) | |
| download | mariadb-git-dbe85caf8e467af3cfb207628d5ebe482175938e.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
client/mysql_upgrade.c:
Auto merged
configure.in:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_parse.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
include/my_sys.h:
Manual merge - my_getpagesize defined further down separate from HAVE_SYS_MMAN_H
Diffstat (limited to 'mysql-test/ndb')
0 files changed, 0 insertions, 0 deletions