Some (b472f401) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		@@ -70,3 +70,4 @@ zak@linux.local
		salle@geopard.(none)
		walrus@mysql.com
		zgreant@mysql.com
		salle@geopard.online.bg

include/config-os2.h

+28 −28

Original line number	Diff line number	Diff line
		@@ -64,10 +64,10 @@
		#define NO_FCNTL_NONBLOCK

		#define EFBIG E2BIG
		//#define ENFILE EMFILE
		//#define ENAMETOOLONG (EOS2ERR+2)
		//#define ETIMEDOUT 145
		//#define EPIPE 146
		/#define ENFILE EMFILE /
		/#define ENAMETOOLONG (EOS2ERR+2) /
		/#define ETIMEDOUT 145 /
		/#define EPIPE 146 /
		#define EROFS 147

		#define sleep(A) DosSleep((A)*1000)
		@@ -129,7 +129,7 @@ typedef unsigned long long os_off_t;
		#define HAVE_ALLOCA 1

		/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
		//#define HAVE_ALLOCA_H 1
		/* #define HAVE_ALLOCA_H 1 */

		/* Define if you don't have vprintf but do have _doprnt. */
		/* #undef HAVE_DOPRNT */
		@@ -145,7 +145,7 @@ typedef unsigned long long os_off_t;
		#define HAVE_ST_RDEV 1

		/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
		//#define HAVE_SYS_WAIT_H 1
		/* #define HAVE_SYS_WAIT_H 1 */

		/* Define if you don't have tm_zone but do have the external array
		tzname. */
		@@ -216,7 +216,7 @@ typedef unsigned long long os_off_t;
		#define HAVE_BOOL 1

		/* Have berkeley db installed */
		//#define HAVE_BERKELEY_DB 1
		/* #define HAVE_BERKELEY_DB 1 */

		/* DSB style signals ? */
		/* #undef HAVE_BSD_SIGNALS */
		@@ -395,7 +395,7 @@ typedef unsigned long long os_off_t;
		#define HAVE_CHSIZE 1

		/* Define if you have the cuserid function. */
		//#define HAVE_CUSERID 1
		/* #define HAVE_CUSERID 1 */

		/* Define if you have the dlerror function. */
		#define HAVE_DLERROR 1
		@@ -407,7 +407,7 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_FCHMOD */

		/* Define if you have the fcntl function. */
		//#define HAVE_FCNTL 1
		/* #define HAVE_FCNTL 1 */

		/* Define if you have the fconvert function. */
		/* #undef HAVE_FCONVERT */
		@@ -425,7 +425,7 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_FSEEKO */

		/* Define if you have the ftruncate function. */
		//#define HAVE_FTRUNCATE 1
		/* #define HAVE_FTRUNCATE 1 */

		/* Define if you have the getcwd function. */
		#define HAVE_GETCWD 1
		@@ -440,16 +440,16 @@ typedef unsigned long long os_off_t;
		#define HAVE_GETPAGESIZE 1

		/* Define if you have the getpass function. */
		//#define HAVE_GETPASS 1
		/#define HAVE_GETPASS 1 /

		/* Define if you have the getpassphrase function. */
		/* #undef HAVE_GETPASSPHRASE */

		/* Define if you have the getpwnam function. */
		//#define HAVE_GETPWNAM 1
		/* #define HAVE_GETPWNAM 1 */

		/* Define if you have the getpwuid function. */
		//#define HAVE_GETPWUID 1
		/* #define HAVE_GETPWUID 1 */

		/* Define if you have the getrlimit function. */
		/* #undef HAVE_GETRLIMIT */
		@@ -491,7 +491,7 @@ typedef unsigned long long os_off_t;
		#define HAVE_MEMMOVE 1

		/* Define if you have the mkstemp function. */
		//#define HAVE_MKSTEMP 1
		/* #define HAVE_MKSTEMP 1 */

		/* Define if you have the mlockall function. */
		/* #undef HAVE_MLOCKALL */
		@@ -581,7 +581,7 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_SIGTHREADMASK */

		/* Define if you have the snprintf function. */
		//#define HAVE_SNPRINTF 1
		/* #define HAVE_SNPRINTF 1 */

		/* Define if you have the socket function. */
		#define HAVE_SOCKET 1
		@@ -635,7 +635,7 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_VIDATTR */

		/* Define if you have the <alloca.h> header file. */
		//#define HAVE_ALLOCA_H 1
		/* #define HAVE_ALLOCA_H 1 */

		/* Define if you have the <arpa/inet.h> header file. */
		#define HAVE_ARPA_INET_H 1
		@@ -647,10 +647,10 @@ typedef unsigned long long os_off_t;
		#define HAVE_CRYPT_H 1

		/* Define if you have the <curses.h> header file. */
		//#define HAVE_CURSES_H 1
		/* #define HAVE_CURSES_H 1 */

		/* Define if you have the <dirent.h> header file. */
		//#define HAVE_DIRENT_H 1
		/* #define HAVE_DIRENT_H 1 */

		/* Define if you have the <fcntl.h> header file. */
		#define HAVE_FCNTL_H 1
		@@ -662,7 +662,7 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_FLOATINGPOINT_H */

		/* Define if you have the <grp.h> header file. */
		//#define HAVE_GRP_H 1
		/* #define HAVE_GRP_H 1 */

		/* Define if you have the <ieeefp.h> header file. */
		/* #undef HAVE_IEEEFP_H */
		@@ -686,7 +686,7 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_PATHS_H */

		/* Define if you have the <pwd.h> header file. */
		//#define HAVE_PWD_H 1
		/* #define HAVE_PWD_H 1 */

		/* Define if you have the <sched.h> header file. */
		/* #undef HAVE_SCHED_H */
		@@ -707,16 +707,16 @@ typedef unsigned long long os_off_t;
		#define HAVE_STRING_H 1

		/* Define if you have the <strings.h> header file. */
		//#define HAVE_STRINGS_H 1
		/* #define HAVE_STRINGS_H 1 */

		/* Define if you have the <synch.h> header file. */
		/* #undef HAVE_SYNCH_H */

		/* Define if you have the <sys/dir.h> header file. */
		//#define HAVE_SYS_DIR_H 1
		/* #define HAVE_SYS_DIR_H 1 */

		/* Define if you have the <sys/file.h> header file. */
		//#define HAVE_SYS_FILE_H 1
		/* #define HAVE_SYS_FILE_H 1 */

		/* Define if you have the <sys/ioctl.h> header file. */
		#define HAVE_SYS_IOCTL_H 1
		@@ -758,7 +758,7 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_SYS_VADVISE_H */

		/* Define if you have the <sys/wait.h> header file. */
		//#define HAVE_SYS_WAIT_H 1
		/* #define HAVE_SYS_WAIT_H 1 */

		/* Define if you have the <term.h> header file. */
		/* #undef HAVE_TERM_H */
		@@ -767,13 +767,13 @@ typedef unsigned long long os_off_t;
		/* #undef HAVE_TERMBITS_H */

		/* Define if you have the <termcap.h> header file. */
		//#define HAVE_TERMCAP_H 1
		/* #define HAVE_TERMCAP_H 1 */

		/* Define if you have the <termio.h> header file. */
		//#define HAVE_TERMIO_H 1
		/* /#define HAVE_TERMIO_H 1 */

		/* Define if you have the <termios.h> header file. */
		//#define HAVE_TERMIOS_H 1
		/* #define HAVE_TERMIOS_H 1 */

		/* Define if you have the <unistd.h> header file. */
		#define HAVE_UNISTD_H 1
		@@ -826,4 +826,4 @@ typedef unsigned long long os_off_t;
		/* Define for large files, on AIX-style hosts. */
		/* #undef _LARGE_FILES */

		#endif // __CONFIG_OS2_H__
		#endif /* __CONFIG_OS2_H__ */

include/sslopt-case.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@
		break;
		case OPT_SSL_KEY:
		opt_use_ssl = 1; /* true */
		//QQ to be removed??? my_free(opt_ssl_key, MYF(MY_ALLOW_ZERO_PTR));
		//QQ to be removed??? opt_ssl_key = my_strdup(optarg, MYF(0));
		/* QQ to be removed??? my_free(opt_ssl_key, MYF(MY_ALLOW_ZERO_PTR)); */
		/* QQ to be removed??? opt_ssl_key = my_strdup(optarg, MYF(0)); */
		break;
		case OPT_SSL_CERT:
		opt_use_ssl = 1; /* true */

mysys/mf_tempfile.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -122,10 +122,10 @@ File create_temp_file(char to, const char dir, const char *prefix,
		dir=to;
		}
		#ifdef OS2
		// changing environ variable doesn't work with VACPP
		/* changing environ variable doesn't work with VACPP */
		char buffer[256];
		sprintf( buffer, "TMP=%s", dir);
		// remove ending backslash
		/* remove ending backslash */
		if (buffer[strlen(buffer)-1] == '\\')
		buffer[strlen(buffer)-1] = '\0';
		putenv( buffer);

sql/field.h

+35 −34

Original line number	Diff line number	Diff line
		@@ -37,20 +37,20 @@ class Field {
		static void operator new(size_t size) {return (void) sql_alloc((uint) size); }
		static void operator delete(void ptr_arg, size_t size) {} /lint -e715 */

		char *ptr; // Position to field in record
		uchar *null_ptr; // Byte where null_bit is
		struct st_table *table; // Pointer for table
		char ptr; / Position to field in record */
		uchar null_ptr; / Byte where null_bit is */
		struct st_table table; / Pointer for table */
		const char table_name,field_name;
		ulong query_id; // For quick test of used fields
		// Field is part of the following keys
		ulong query_id; /* For quick test of used fields */
		/* Field is part of the following keys */
		key_map key_start,part_of_key,part_of_sortkey;
		enum utype { NONE,DATE,SHIELD,NOEMPTY,CASEUP,PNR,BGNR,PGNR,YES,NO,REL,
		CHECK,EMPTY,UNKNOWN_FIELD,CASEDN,NEXT_NUMBER,INTERVAL_FIELD,
		BIT_FIELD, TIMESTAMP_FIELD,CAPITALIZE,BLOB_FIELD};
		utype unireg_check;
		uint32 field_length; // Length of field
		uint32 field_length; /* Length of field */
		uint16 flags;
		uchar null_bit; // Bit used to test null bit
		uchar null_bit; /* Bit used to test null bit */

		Field(char ptr_arg,uint32 length_arg,uchar null_ptr_arg,uchar null_bit_arg,
		utype unireg_check_arg, const char *field_name_arg,
		@@ -90,11 +90,12 @@ class Field {
		{ return cmp(ptr,(char*) str); }
		virtual uint decimals() const { return 0; }
		virtual void sql_type(String &str) const =0;
		// Caller beware: sql_type can change str.Ptr, so check
		// ptr() to see if it changed if you are using your own buffer
		// in str and restore it with set() if needed

		virtual uint size_of() const =0; // For new field
		/*
		Caller beware: sql_type can change str.Ptr, so check
		ptr() to see if it changed if you are using your own buffer
		in str and restore it with set() if needed
		*/
		virtual uint size_of() const =0; /* For new field */
		inline bool is_null(uint row_offset=0)
		{ return null_ptr ? (null_ptr[row_offset] & null_bit ? 1 : 0) : table->null_row; }
		inline bool is_real_null(uint row_offset=0)
		@@ -186,7 +187,7 @@ class Field {
		{ return cmp(a,b); }
		virtual int pack_cmp(const char *b, uint key_length_arg)
		{ return cmp(ptr,b); }
		uint offset(); // Should be inline ...
		uint offset(); /* Should be inline ... */
		void copy_from_tmp(int offset);
		uint fill_cache_field(struct st_cache_field *copy);
		virtual bool get_date(TIME *ltime,bool fuzzydate);
		@@ -211,7 +212,7 @@ class Field {
		class Field_num :public Field {
		public:
		const uint8 dec;
		bool zerofill,unsigned_flag; // Purify cannot handle bit fields
		bool zerofill,unsigned_flag; /* Purify cannot handle bit fields */
		Field_num(char ptr_arg,uint32 len_arg, uchar null_ptr_arg,
		uchar null_bit_arg, utype unireg_check_arg,
		const char *field_name_arg,
		@@ -823,7 +824,7 @@ class Field_varstring :public Field_str {

		class Field_blob :public Field_str {
		uint packlength;
		String value; // For temporaries
		String value; /* For temporaries */
		bool binary_flag;
		public:
		Field_blob(char ptr_arg, uchar null_ptr_arg, uchar null_bit_arg,
		@@ -975,23 +976,23 @@ class Field_set :public Field_enum {


		/*
		** Create field class for CREATE TABLE
		Create field class for CREATE TABLE
		*/

		class create_field :public Sql_alloc {
		public:
		const char *field_name;
		const char *change; // If done with alter table
		const char *after; // Put column after this one
		Item *def; // Default value
		const char change; / If done with alter table */
		const char after; / Put column after this one */
		Item def; / Default value */
		enum enum_field_types sql_type;
		uint32 length;
		uint decimals,flags,pack_length;
		Field::utype unireg_check;
		TYPELIB *interval; // Which interval to use
		Field *field; // For alter table
		TYPELIB interval; / Which interval to use */
		Field field; / For alter table */

		uint8 row,col,sc_length,interval_id; // For rea_create_table
		uint8 row,col,sc_length,interval_id; /* For rea_create_table */
		uint offset,pack_flag;
		create_field() :after(0) {}
		create_field(Field field, Field orig_field);
		@@ -999,7 +1000,7 @@ class create_field :public Sql_alloc {


		/*
		** A class for sending info to the client
		A class for sending info to the client
		*/

		class Send_field {
		@@ -1024,14 +1025,14 @@ class Copy_field :public Sql_alloc {
		uint from_bit,to_bit;
		uint from_length,to_length;
		Field from_field,to_field;
		String tmp; // For items
		String tmp; /* For items */

		Copy_field() {}
		~Copy_field() {}
		void set(Field to,Field from,bool save); // Field to field
		void set(char to,Field from); // Field to string
		void set(Field to,Field from,bool save); /* Field to field */
		void set(char to,Field from); /* Field to string */
		void (do_copy)(Copy_field );
		void (do_copy2)(Copy_field ); // Used to handle null values
		void (do_copy2)(Copy_field ); /* Used to handle null values */
		};


		@@ -1052,18 +1053,18 @@ bool test_if_int(const char *str,int length);
		*/

		#define FIELDFLAG_DECIMAL 1
		#define FIELDFLAG_BINARY 1 // Shares same flag
		#define FIELDFLAG_BINARY 1 /Shares same flag /
		#define FIELDFLAG_NUMBER 2
		#define FIELDFLAG_ZEROFILL 4
		#define FIELDFLAG_PACK 120 // Bits used for packing
		#define FIELDFLAG_PACK 120 /* Bits used for packing */
		#define FIELDFLAG_INTERVAL 256
		#define FIELDFLAG_BITFIELD 512 // mangled with dec!
		#define FIELDFLAG_BLOB 1024 // mangled with dec!
		#define FIELDFLAG_BITFIELD 512 /* mangled with dec! */
		#define FIELDFLAG_BLOB 1024 /* mangled with dec! */
		#define FIELDFLAG_LEFT_FULLSCREEN 8192
		#define FIELDFLAG_RIGHT_FULLSCREEN 16384
		#define FIELDFLAG_FORMAT_NUMBER 16384 // predit: ###,,## in output
		#define FIELDFLAG_SUM ((uint) 32768)// predit: +#fieldflag
		#define FIELDFLAG_MAYBE_NULL ((uint) 32768)// sql
		#define FIELDFLAG_FORMAT_NUMBER 16384 /* predit: ###,,## in output */
		#define FIELDFLAG_SUM ((uint) 32768)/* predit: +#fieldflag */
		#define FIELDFLAG_MAYBE_NULL ((uint) 32768)/* sql */
		#define FIELDFLAG_PACK_SHIFT 3
		#define FIELDFLAG_DEC_SHIFT 8
		#define FIELDFLAG_MAX_DEC 31