diff options
author | unknown <aivanov@mysql.com> | 2005-07-26 20:48:43 +0400 |
---|---|---|
committer | unknown <aivanov@mysql.com> | 2005-07-26 20:48:43 +0400 |
commit | 15a35982e42b27c81a4217b75427eab7d71aa307 (patch) | |
tree | 6131066978bc267385b76984dcec83b4c9fe3ccf /ndb/config | |
parent | 08216d3abf6a66dc1d58449d2b0e60d028cd26f1 (diff) | |
parent | 0d9ab525692ecc50c7c30cc4c365d3af6dcba29e (diff) | |
download | mariadb-git-15a35982e42b27c81a4217b75427eab7d71aa307.tar.gz |
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/alexi/mysql-4.1-bug1
sql/item_strfunc.cc:
test merge attempt, please ignore
Diffstat (limited to 'ndb/config')
0 files changed, 0 insertions, 0 deletions