diff options
author | unknown <ramil@mysql.com> | 2005-12-02 11:57:26 +0400 |
---|---|---|
committer | unknown <ramil@mysql.com> | 2005-12-02 11:57:26 +0400 |
commit | 858eef452fd1c32bbbf672720043ddcedf6095ce (patch) | |
tree | 8ed6511351668d1941fe065b7e07e20354935a23 /ndb | |
parent | 025d8c14f64c9df4e5942de963234516adf7ffea (diff) | |
parent | 490a1e2855078d661b584ef690a05ca4defceebd (diff) | |
download | mariadb-git-858eef452fd1c32bbbf672720043ddcedf6095ce.tar.gz |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b12956
mysql-test/r/ps.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'ndb')
0 files changed, 0 insertions, 0 deletions