diff options
author | unknown <msvensson@neptunus.(none)> | 2006-12-04 18:44:14 +0100 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-12-04 18:44:14 +0100 |
commit | 23b2d1d2c62b3a3fd94ea17e4728da82b0b2dc0a (patch) | |
tree | afc6b76a00eff09ccafd07c2dcc598257c9db220 /sql-common | |
parent | bfee156a8b9ef5679fc7b4751ac6b1cffb8f7e39 (diff) | |
parent | 64a70ab70210e32ad331347edd9105bfd5ad42fc (diff) | |
download | mariadb-git-23b2d1d2c62b3a3fd94ea17e4728da82b0b2dc0a.tar.gz |
Merge bk-internal:/home/bk/mysql-5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
Diffstat (limited to 'sql-common')
0 files changed, 0 insertions, 0 deletions