diff options
| author | unknown <serg@janus.mylan> | 2007-12-28 00:15:29 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-12-28 00:15:29 +0100 |
| commit | 4140f76f4e50a0497c8d325fef7e255bb5cf4e68 (patch) | |
| tree | ad7653284333477b8b2d0bcb4d2582cbbcb0e47e /mysys | |
| parent | 7fdbc4230e68171e17e0dd4f6ae2d3fe3acb7549 (diff) | |
| download | mariadb-git-4140f76f4e50a0497c8d325fef7e255bb5cf4e68.tar.gz | |
after merge
include/mysql/plugin.h:
move declarations after merge
mysql-test/r/change_user.result:
more tests
mysql-test/t/change_user.test:
more tests
mysys/my_getopt.c:
remove wrong code
BitKeeper/etc/ignore:
Added libmysqld/sql_profile.cc to the ignore list
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_getopt.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 63ef57300fa..61716eae2c6 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -892,8 +892,6 @@ ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp, num= ((ulonglong) ULONG_MAX); adjusted= TRUE; } -#else - num= min(num, LONG_MAX); #endif break; default: |