mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-24 17:25:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

Browse source 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


include/my_global.h:
  Auto merged
mysql-test/t/ndb_autodiscover.test:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Merge
This commit is contained in:
unknown 2005-07-12 10:57:01 +02:00
commit 15ff7fd838
3 changed files with 15 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/my_global.h
View file

@ -396,10 +396,7 @@ int __void__;
#endif
/* Define some useful general macros */
#if defined(__cplusplus) && defined(__GNUC__)
#define max(a, b) ((a) >? (b))
#define min(a, b) ((a) <? (b))
#elif !defined(max)
#if !defined(max)
#define max(a, b) ((a) > (b) ? (a) : (b))
#define min(a, b) ((a) < (b) ? (a) : (b))
#endif