diff options
| author | unknown <tulin@dl145b.mysql.com> | 2005-06-08 10:23:46 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145b.mysql.com> | 2005-06-08 10:23:46 +0200 |
| commit | ad34f7db24c6d1397336edf56ea39f360d414efb (patch) | |
| tree | c02756a5bcce97e6ac2d9205956135c9eeccb11c /storage/ndb/test/ndbapi/testDict.cpp | |
| parent | 354fa7b997ce7b33e5f3e8630ad9cdc48d839a01 (diff) | |
| parent | 46b323bcb0f6f5ab6307132bb052ba6ef1306fd5 (diff) | |
| download | mariadb-git-ad34f7db24c6d1397336edf56ea39f360d414efb.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
Diffstat (limited to 'storage/ndb/test/ndbapi/testDict.cpp')
0 files changed, 0 insertions, 0 deletions