summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <dlenev@mysql.com>2005-03-21 11:39:47 +0300
committerunknown <dlenev@mysql.com>2005-03-21 11:39:47 +0300
commit47e4ce28729dd89d7196208d8921a51bb2244e35 (patch)
tree8ac553656af27c618e0ad07896c6795b92bebac5 /include
parentb450786c8871299715f35d6a8af3ebf4d00a0cd9 (diff)
parent8d669c5524a2d9150ee33e4d3239779e387002a6 (diff)
downloadmariadb-git-47e4ce28729dd89d7196208d8921a51bb2244e35.tar.gz
Manual merge of csets from -build tree into main 5.0 tree.
innobase/include/data0type.ic: Auto merged mysql-test/r/endspace.result: Auto merged sql/item_sum.cc: Auto merged sql/sql_select.cc: Auto merged support-files/mysql.spec.sh: Manual merge.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions