diff options
| author | unknown <kostja@bodhi.(none)> | 2008-04-19 14:37:20 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2008-04-19 14:37:20 +0400 |
| commit | f74a78b8eb43b67e6376e8ffafec557687c2e77f (patch) | |
| tree | d45e65eb7b3c91ac492f651592c763f36836e04f /include | |
| parent | c481f6b3cf80f471321d2ef4e7c68fe9e6e5d0ca (diff) | |
| parent | 642b4c27c5920da3285d2f68fd77090057e84b57 (diff) | |
| download | mariadb-git-f74a78b8eb43b67e6376e8ffafec557687c2e77f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.(none):/opt/local/work/mysql-5.1-27430
include/my_global.h:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
storage/myisam/mi_create.c:
Auto merged
tests/mysql_client_test.c:
Auto merged
sql/share/errmsg.txt:
Manual merge.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index a9e381ee66f..6cfc4d67305 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -570,7 +570,7 @@ typedef unsigned short ushort; #define CMP_NUM(a,b) (((a) < (b)) ? -1 : ((a) == (b)) ? 0 : 1) #define sgn(a) (((a) < 0) ? -1 : ((a) > 0) ? 1 : 0) -#define swap_variables(t, a, b) { register t dummy; dummy= a; a= b; b= dummy; } +#define swap_variables(t, a, b) { t dummy; dummy= a; a= b; b= dummy; } #define test(a) ((a) ? 1 : 0) #define set_if_bigger(a,b) do { if ((a) < (b)) (a)=(b); } while(0) #define set_if_smaller(a,b) do { if ((a) > (b)) (a)=(b); } while(0) |