diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-21 13:02:57 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-21 13:02:57 +0200 |
| commit | 2f3a17b63e4e207ae8796d953ba611a593e3ee2c (patch) | |
| tree | a5373ac33cc100031b219da1e424961b585d3947 /include/my_global.h | |
| parent | 1b72f3618b901f017fc4f5db5dbaad72ca79243a (diff) | |
| download | mariadb-git-2f3a17b63e4e207ae8796d953ba611a593e3ee2c.tar.gz | |
Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
include/my_global.h:
Fixed unsafe define of uint4korr()
mysql-test/lib/mtr_report.pl:
Removed wrong messages when using --extern
mysql-test/mysql-test-run.pl:
Fixed that --extern works
Print help on stdout instead of stderr (make it easier to pipe it to less)
mysql-test/t/ndb_lock.test:
Added other possible error code
sql/sql_prepare.cc:
Removed not needed casts
Diffstat (limited to 'include/my_global.h')
| -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 d53dee23e17..23fe71caa8d 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1078,7 +1078,7 @@ typedef char bool; /* Ordinary boolean values 0 1 */ */ #define uint3korr(A) (long) (*((unsigned int *) (A)) & 0xFFFFFF) #endif -#define uint4korr(A) (*((unsigned long *) (A))) +#define uint4korr(A) (*((uint32 *) (A))) #define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\ (((uint32) ((uchar) (A)[1])) << 8) +\ (((uint32) ((uchar) (A)[2])) << 16) +\ |