mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-30 04:26:45 +03:00 
			
		
		
		
	Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler) Added a lot of 'version_xxx' strings to 'show variables' Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris) Fixed problem with printing sub selects to debug log Docs/mysqld_error.txt: Updated error messages Makefile.am: Added missing SSL library (Should be in source distribution) configure.in: Added missing SSL library include/sql_common.h: Move duplicated prototypes innobase/os/os0file.c: Added comment for line that could be removed innobase/srv/srv0srv.c: Added comment for line that could be removed innobase/srv/srv0start.c: Added comment for line that could be removed innobase/trx/trx0sys.c: Added cast to remove compiler warning isam/isamchk.c: Fixed compiler warning libmysql/conf_to_src.c: Include files in proper order myisam/mi_check.c: Removed else part that caused compiler warning myisam/mi_delete.c: Added cast myisam/mi_page.c: Added cast myisam/mi_preload.c: Added cast myisam/mi_write.c: Added cast myisam/myisampack.c: changed 'byte' to 'current_byte' to avoid compiler warnings mysql-test/mysql-test-run.sh: Removed start-from as test '<' is not portable and this can easily be done from command line mysys/hash.c: Added cast mysys/mf_wcomp.c: Removed not reached line mysys/my_append.c: Fixed include file order to get this more portable mysys/my_copy.c: Fixed include file order to get this more portable mysys/my_redel.c: Fixed include file order to get this more portable sql-common/client.c: More DBUG_PRINT sql-common/pack.c: Added casts becasue Fortre compiler apparently compares (ulonglong) < (longlong) as signed sql/ha_heap.cc: Changed variable names to not cause hidden variables sql/ha_innodb.cc: Changed variable names to not cause hidden variables sql/item.cc: Changed variable names to not cause hidden variables sql/item.h: Changed variable names to not cause hidden variables sql/item_cmpfunc.h: Changed variable names to not cause hidden variables sql/item_func.cc: Changed variable names to not cause hidden variables sql/item_subselect.cc: Changed variable names to not cause hidden variables sql/item_subselect.h: Changed variable names to not cause hidden variables sql/item_sum.cc: Changed variable names to not cause hidden variables sql/item_timefunc.cc: Changed variable names to not cause hidden variables sql/log.cc: Changed variable names to not cause hidden variables sql/protocol.cc: Changed variable names to not cause hidden variables sql/protocol.h: Changed variable names to not cause hidden variables Remove function not declared in protocol.cc sql/protocol_cursor.cc: Changed variable names to not cause hidden variables sql/set_var.cc: Added a lot of 'version_xxx' strings Changed 'bdb_version' to 'version_bdb' sql/sql_class.cc: Changed variable names to not cause hidden variables Add TMP_TABLE_PARAM::init() to allow one to initialize structure several times sql/sql_class.h: Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris) sql/sql_derived.cc: Avoid copying TMP_TABLE_PARAM (Use class version instead) sql/sql_error.cc: More DBUG sql/sql_help.cc: Fixed compiler warning sql/sql_lex.cc: Changed variable names to not cause hidden variables sql/sql_list.h: Changed variable names to not cause hidden variables sql/sql_parse.cc: Changed variable names to not cause hidden variables sql/sql_select.cc: Changed variable names to not cause hidden variables Ensure that you don't send NULL to printf() for %s Fixed problem with printing sub selects to debug log sql/sql_select.h: Changed variable names to not cause hidden variables sql/sql_union.cc: Changed variable names to not cause hidden variables Don't use local copy of TMP_TABLE_PARAM (Caused core dump on Solaris) sql/sql_update.cc: Indentation cleanup sql/sql_yacc.yy: Remove warning strings/conf_to_src.c: Fixed include file order
		
			
				
	
	
		
			125 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			125 lines
		
	
	
		
			2.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* Copyright (C) 2000-2003 MySQL AB
 | |
| 
 | |
|    This program is free software; you can redistribute it and/or modify
 | |
|    it under the terms of the GNU General Public License as published by
 | |
|    the Free Software Foundation; either version 2 of the License, or
 | |
|    (at your option) any later version.
 | |
| 
 | |
|    This program is distributed in the hope that it will be useful,
 | |
|    but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | |
|    GNU General Public License for more details.
 | |
| 
 | |
|    You should have received a copy of the GNU General Public License
 | |
|    along with this program; if not, write to the Free Software
 | |
|    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 | |
| 
 | |
| #include <my_global.h>
 | |
| #include <mysql_com.h>
 | |
| #include <mysql.h>
 | |
| 
 | |
| /* Get the length of next field. Change parameter to point at fieldstart */
 | |
| ulong STDCALL net_field_length(uchar **packet)
 | |
| {
 | |
|   reg1 uchar *pos= (uchar *)*packet;
 | |
|   if (*pos < 251)
 | |
|   {
 | |
|     (*packet)++;
 | |
|     return (ulong) *pos;
 | |
|   }
 | |
|   if (*pos == 251)
 | |
|   {
 | |
|     (*packet)++;
 | |
|     return NULL_LENGTH;
 | |
|   }
 | |
|   if (*pos == 252)
 | |
|   {
 | |
|     (*packet)+=3;
 | |
|     return (ulong) uint2korr(pos+1);
 | |
|   }
 | |
|   if (*pos == 253)
 | |
|   {
 | |
|     (*packet)+=4;
 | |
|     return (ulong) uint3korr(pos+1);
 | |
|   }
 | |
|   (*packet)+=9;					/* Must be 254 when here */
 | |
|   return (ulong) uint4korr(pos+1);
 | |
| }
 | |
| 
 | |
| /* The same as above but returns longlong */
 | |
| my_ulonglong net_field_length_ll(uchar **packet)
 | |
| {
 | |
|   reg1 uchar *pos= *packet;
 | |
|   if (*pos < 251)
 | |
|   {
 | |
|     (*packet)++;
 | |
|     return (my_ulonglong) *pos;
 | |
|   }
 | |
|   if (*pos == 251)
 | |
|   {
 | |
|     (*packet)++;
 | |
|     return (my_ulonglong) NULL_LENGTH;
 | |
|   }
 | |
|   if (*pos == 252)
 | |
|   {
 | |
|     (*packet)+=3;
 | |
|     return (my_ulonglong) uint2korr(pos+1);
 | |
|   }
 | |
|   if (*pos == 253)
 | |
|   {
 | |
|     (*packet)+=4;
 | |
|     return (my_ulonglong) uint3korr(pos+1);
 | |
|   }
 | |
|   (*packet)+=9;					/* Must be 254 when here */
 | |
| #ifdef NO_CLIENT_LONGLONG
 | |
|   return (my_ulonglong) uint4korr(pos+1);
 | |
| #else
 | |
|   return (my_ulonglong) uint8korr(pos+1);
 | |
| #endif
 | |
| }
 | |
| 
 | |
| /*
 | |
|   Store an integer with simple packing into a output package
 | |
| 
 | |
|   SYNOPSIS
 | |
|     net_store_length()
 | |
|     pkg			Store the packed integer here
 | |
|     length		integers to store
 | |
| 
 | |
|   NOTES
 | |
|     This is mostly used to store lengths of strings.
 | |
|     We have to cast the result for the LL() becasue of a bug in Forte CC
 | |
|     compiler.
 | |
| 
 | |
|   RETURN
 | |
|    Position in 'pkg' after the packed length
 | |
| */
 | |
| 
 | |
| char *
 | |
| net_store_length(char *pkg, ulonglong length)
 | |
| {
 | |
|   uchar *packet=(uchar*) pkg;
 | |
|   if (length < (ulonglong) LL(251))
 | |
|   {
 | |
|     *packet=(uchar) length;
 | |
|     return (char*) packet+1;
 | |
|   }
 | |
|   /* 251 is reserved for NULL */
 | |
|   if (length < (ulonglong) LL(65536))
 | |
|   {
 | |
|     *packet++=252;
 | |
|     int2store(packet,(uint) length);
 | |
|     return (char*) packet+2;
 | |
|   }
 | |
|   if (length < (ulonglong) LL(16777216))
 | |
|   {
 | |
|     *packet++=253;
 | |
|     int3store(packet,(ulong) length);
 | |
|     return (char*) packet+3;
 | |
|   }
 | |
|   *packet++=254;
 | |
|   int8store(packet,length);
 | |
|   return (char*) packet+8;
 | |
| }
 | |
| 
 |