diff options
author | unknown <bar@mysql.com> | 2005-08-29 22:17:13 +0500 |
---|---|---|
committer | unknown <bar@mysql.com> | 2005-08-29 22:17:13 +0500 |
commit | 2338c1ea38bee633415eccb7e8d7b08590090eb7 (patch) | |
tree | d31df02fc37c6c6880f9daa9b49d3d7b9dc8680e /server-tools/instance-manager/user_map.cc | |
parent | 7e128939011785e3f6cc1feb297e21a07e79af48 (diff) | |
parent | f68520c975996f40281066674a8b05471f24170b (diff) | |
download | mariadb-git-2338c1ea38bee633415eccb7e8d7b08590090eb7.tar.gz |
Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
sql/item.h:
don't merge bug#12371 fix into 5.0.
It's correct only for 4.1.
Diffstat (limited to 'server-tools/instance-manager/user_map.cc')
0 files changed, 0 insertions, 0 deletions