diff options
author | unknown <igor@rurik.mysql.com> | 2006-04-05 14:00:54 -0700 |
---|---|---|
committer | unknown <igor@rurik.mysql.com> | 2006-04-05 14:00:54 -0700 |
commit | ef4309284d0124e4b5cb76a379da1571cd8ce464 (patch) | |
tree | 5478f3804bd93ddefb8eb77c1029c4f84fe48570 /mysys/my_access.c | |
parent | fb559d433f33dc457de061bb666c6f13cc4a4336 (diff) | |
parent | e77888f53075d283d1e8d2c719ef91896b93e15e (diff) | |
download | mariadb-git-ef4309284d0124e4b5cb76a379da1571cd8ce464.tar.gz |
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/opt_sum.cc:
Auto merged
Diffstat (limited to 'mysys/my_access.c')
0 files changed, 0 insertions, 0 deletions