transactd 1.1.2 → 1.2.0

data/source/bzs/db/protocol/tdap/myDateTime.cpp

@@ -226,9 +226,9 @@ public:
 	inline char* toStr(char* p)
 	{
 		if (m_dec)
-			sprintf(p, time_format_ms, hh, nn, ss, m_dec, ms);
+			sprintf(p, time_format_ms, (int)hh, (int)nn, (int)ss, m_dec, (int)ms);
 		else
-			sprintf(p, time_format, hh, nn, ss);
+			sprintf(p, time_format, (int)hh, (int)nn, (int)ss);
 		return p;
 	}
 	
@@ -236,9 +236,9 @@ public:
 	inline wchar_t* toStr(wchar_t* p)
 	{
 		if (m_dec)
-			swprintf_s(p, 17, wtime_format_ms, hh, nn, ss, ms);
+			swprintf_s(p, 17, wtime_format_ms, (int)hh, (int)nn, (int)ss, (int)ms);
 		else
-			swprintf_s(p, 9, wtime_format, hh, nn, ss);
+			swprintf_s(p, 9, wtime_format, (int)hh, (int)nn, (int)ss);
 		return p;
 	}
 #endif
@@ -328,9 +328,9 @@ public:
 	inline char* toStr(char* p)
 	{
 		if (m_dec)
-			sprintf(p, datetime_format_ms ,yymm/13,yymm%13, dd, hh, nn, ss, ms);
+			sprintf(p, datetime_format_ms ,(int)(yymm/13),(int)(yymm%13), (int)dd, (int)hh, (int)nn, (int)ss,(int) ms);
 		else
-			sprintf(p, datetime_format, yymm/13,yymm%13, dd, hh, nn, ss);
+			sprintf(p, datetime_format, (int)(yymm/13),(int)(yymm%13), (int)dd, (int)hh, (int)nn, (int)ss);
 		return p;
 	}
 	
@@ -338,9 +338,9 @@ public:
 	inline wchar_t* toStr(wchar_t* p)
 	{
 		if (m_dec)
-			swprintf_s(p, 26, wdatetime_format_ms, yymm/13, yymm%13, dd, hh, nn, ss, ms);
+			swprintf_s(p, 26, wdatetime_format_ms, (int)(yymm/13), (int)(yymm%13), (int)dd, (int)hh, (int)nn, (int)ss, (int)ms);
 		else
-			swprintf_s(p, 20, wdatetime_format, yymm/13, yymm%13, dd, hh, nn, ss);
+			swprintf_s(p, 20, wdatetime_format, (int)(yymm/13), (int)(yymm%13), (int)dd, (int)hh, (int)nn, (int)ss);
 		return p;
 	}
 #endif

data/source/bzs/db/protocol/tdap/mysql/databaseSchema.cpp

@@ -98,7 +98,7 @@ uchar_td convFieldType(enum enum_field_types type, uint flags, bool binary, bool
 	case MYSQL_TYPE_YEAR:
 	case MYSQL_TYPE_INT24:
 		if (flags & AUTO_INCREMENT_FLAG)
-			return ft_autoinc;
+			return (flags & UNSIGNED_FLAG) ? ft_autoIncUnsigned : ft_autoinc;
 		if ((flags & UNSIGNED_FLAG) || (type == MYSQL_TYPE_YEAR))
 			return ft_uinteger;
 		return ft_integer;
@@ -159,8 +159,8 @@ short schemaBuilder::insertMetaRecord(table* mtb, table* src, int id)
 		tdef.fixedRecordLen = (ushort_td)src->recordLenCl();
 	tdef.maxRecordLen = (ushort_td)src->recordLenCl();
 	tdef.pageSize = 2048;
-	tdef.optionFlags.bitA = (src->recordFormatType() & RF_VALIABLE_LEN);
-	tdef.optionFlags.bitB = src->blobFields()!=0;
+	tdef.optionFlags.bitA = ((src->recordFormatType() & RF_VALIABLE_LEN)!= 0);
+	tdef.optionFlags.bitB = (src->blobFields()!=0);
 	
 	datalen+=sizeof(tabledef);
 	tdef.fieldDefs = (fielddef*)(rec.get() + datalen);
@@ -217,11 +217,6 @@ short schemaBuilder::insertMetaRecord(table* mtb, table* src, int id)
 					fd.keylen = ks.length;
 					
 				}
-				if (sg.fieldNum == tdef.fieldCount-1)
-				{
-					tdef.flags.bit0 = 0; //NOT valiable length
-					tdef.optionFlags.bitA = 0;//NOT RF_VALIABLE_LEN
-				}
 				++segNum;
 			}
 		}
@@ -238,6 +233,9 @@ bool isFrmFile(const std::string& name)
 	size_t pos = name.find(TRANSACTD_SCHEMANAME);
 	if (pos != std::string::npos)
 		return false;
+	//First of name is '#' that is alter table temp file.
+	if (name.size() && name[0] == '#')
+		return false;
 	pos = name.find(".frm");
 	if (pos != std::string::npos)
 		return pos == name.size()-4; 
@@ -264,7 +262,7 @@ short schemaBuilder::execute(database* db, table* mtb)
 			if (isFrmFile(s))
 			{
 				filename_to_tablename(it->path().stem().string().c_str(), path, FN_REFLEN);
-				table* tb = db->openTable(path, TD_OPEN_READONLY);
+				table* tb = db->openTable(path, TD_OPEN_READONLY, NULL);
 				if (!tb->isView())
 				{
 					if ((stat = insertMetaRecord(mtb, tb, ++id))!=0)