diff options
author | unknown <gshchepa/uchum@gleb.loc> | 2007-11-18 16:54:47 +0400 |
---|---|---|
committer | unknown <gshchepa/uchum@gleb.loc> | 2007-11-18 16:54:47 +0400 |
commit | e316f813d922f8666c4ad3dec684939f19aeebca (patch) | |
tree | 201f7442552a68e656b68ed9bbec8fc3bdc0f54a /sql/table.cc | |
parent | 6bb3c8ee4748bb39ad13a81c71d0a3877a1b4359 (diff) | |
parent | 99054db64c8a41acbe570756e286a8d78811197c (diff) | |
download | mariadb-git-e316f813d922f8666c4ad3dec684939f19aeebca.tar.gz |
Merge gleb.loc:/work/bk/PA/5.0-opt-32335
into gleb.loc:/work/bk/5.1-opt
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/item_cmpfunc.cc:
Merge with 5.0-opt.
Diffstat (limited to 'sql/table.cc')
0 files changed, 0 insertions, 0 deletions