mirror of
https://github.com/MariaDB/server.git
synced 2025-11-22 17:44:29 +03:00
Fixed compiler warnings
Fixed compile-pentium64 scripts Fixed wrong estimate of update_with_key_prefix in sql-bench Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1 Fixed unsafe define of uint4korr() Fixed that --extern works with mysql-test-run.pl Small trivial cleanups This also fixes a bug in counting number of rows that are updated when we have many simultanous queries Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc Split handle_one_connection() into reusable sub functions. Split create_new_thread() into reusable sub functions. Added thread_scheduler; Preliminary interface code for future thread_handling code. Use 'my_thread_id' for internal thread id's Make thr_alarm_kill() to depend on thread_id instead of thread Make thr_abort_locks_for_thread() depend on thread_id instead of thread In store_globals(), set my_thread_var->id to be thd->thread_id. Use my_thread_var->id as basis for my_thread_name() The above changes makes the connection we have between THD and threads more soft. Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions Fixed compiler warnings Fixed core dumps when running with --debug Removed setting of signal masks (was never used) Made event code call pthread_exit() (portability fix) Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called. Made handling of thread_id and thd->variables.pseudo_thread_id uniform. Removed one common 'not freed memory' warning from mysqltest Fixed a couple of usage of not initialized warnings (unlikely cases) Suppress compiler warnings from bdb and (for the moment) warnings from ndb
This commit is contained in:
@@ -932,7 +932,6 @@ typedef unsigned long long my_size_t;
|
||||
#define my_offsetof(TYPE, MEMBER) \
|
||||
((size_t)((char *)&(((TYPE *)0x10)->MEMBER) - (char*)0x10))
|
||||
|
||||
|
||||
#define NullS (char *) 0
|
||||
/* Nowdays we do not support MessyDos */
|
||||
#ifndef NEAR
|
||||
@@ -1171,7 +1170,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) +\
|
||||
@@ -1285,17 +1284,19 @@ do { doubleget_union _tmp; \
|
||||
*(((char *)(T))+1)=(char) (((A) >> 8));\
|
||||
*(((char *)(T))+2)=(char) (((A) >> 16));\
|
||||
*(((char *)(T))+3)=(char) (((A) >> 24)); } while(0)
|
||||
#define int5store(T,A) do { *((char *)(T))=((A));\
|
||||
*(((char *)(T))+1)=(((A) >> 8));\
|
||||
*(((char *)(T))+2)=(((A) >> 16));\
|
||||
*(((char *)(T))+3)=(((A) >> 24)); \
|
||||
*(((char *)(T))+4)=(((A) >> 32)); } while(0)
|
||||
#define int6store(T,A) do { *((char *)(T))=((A));\
|
||||
*(((char *)(T))+1)=(((A) >> 8)); \
|
||||
*(((char *)(T))+2)=(((A) >> 16)); \
|
||||
*(((char *)(T))+3)=(((A) >> 24)); \
|
||||
*(((char *)(T))+4)=(((A) >> 32)); \
|
||||
*(((char *)(T))+5)=(((A) >> 40)); } while(0)
|
||||
#define int5store(T,A) do { *((char *)(T))= (char)((A)); \
|
||||
*(((char *)(T))+1)= (char)(((A) >> 8)); \
|
||||
*(((char *)(T))+2)= (char)(((A) >> 16)); \
|
||||
*(((char *)(T))+3)= (char)(((A) >> 24)); \
|
||||
*(((char *)(T))+4)= (char)(((A) >> 32)); \
|
||||
} while(0)
|
||||
#define int6store(T,A) do { *((char *)(T))= (char)((A)); \
|
||||
*(((char *)(T))+1)= (char)(((A) >> 8)); \
|
||||
*(((char *)(T))+2)= (char)(((A) >> 16)); \
|
||||
*(((char *)(T))+3)= (char)(((A) >> 24)); \
|
||||
*(((char *)(T))+4)= (char)(((A) >> 32)); \
|
||||
*(((char *)(T))+5)= (char)(((A) >> 40)); \
|
||||
} while(0)
|
||||
#define int8store(T,A) do { uint def_temp= (uint) (A), def_temp2= (uint) ((A) >> 32); \
|
||||
int4store((T),def_temp); \
|
||||
int4store((T+4),def_temp2); } while(0)
|
||||
|
||||
Reference in New Issue
Block a user