Commit 4cdc097a authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org

Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23

into sinisa.nasamreza.org:/mnt/work/mysql
parents 873bc497 b69e0f48
...@@ -34,8 +34,8 @@ parse_arguments() { ...@@ -34,8 +34,8 @@ parse_arguments() {
--datadir=*) DATADIR=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;; --datadir=*) DATADIR=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;;
--pid-file=*) pid_file=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;; --pid-file=*) pid_file=`echo "$arg" | sed -e "s;--[^=]*=;;"` ;;
--user=*) --user=*)
if [ $SET_USER == 0 ] if test $SET_USER -eq 0
then then
user=`echo "$arg" | sed -e "s;--[^=]*=;;"` ; SET_USER=1 user=`echo "$arg" | sed -e "s;--[^=]*=;;"` ; SET_USER=1
fi fi
;; ;;
......
...@@ -181,7 +181,7 @@ static my_bool net_realloc(NET *net, ulong length) ...@@ -181,7 +181,7 @@ static my_bool net_realloc(NET *net, ulong length)
void net_clear(NET *net) void net_clear(NET *net)
{ {
#ifndef EXTRA_DEBUG #ifndef EXTRA_DEBUG
int count; // One may get 'unused' warning int count; /* One may get 'unused' warning */
bool is_blocking=vio_is_blocking(net->vio); bool is_blocking=vio_is_blocking(net->vio);
if (is_blocking) if (is_blocking)
vio_blocking(net->vio, FALSE); vio_blocking(net->vio, FALSE);
......
...@@ -444,8 +444,8 @@ static uchar* thai2sortable(const uchar * tstr,uint len) ...@@ -444,8 +444,8 @@ static uchar* thai2sortable(const uchar * tstr,uint len)
const uchar* p = tstr; const uchar* p = tstr;
uchar *outBuf; uchar *outBuf;
// uchar *pRight1, *pRight2, *pRight3, *pRight4; /* uchar *pRight1, *pRight2, *pRight3, *pRight4; */
// uchar *pLeft1, *pLeft2, *pLeft3, *pLeft4; /* uchar *pLeft1, *pLeft2, *pLeft3, *pLeft4; */
uchar *pRight1, *pRight2, *pRight3; uchar *pRight1, *pRight2, *pRight3;
uchar *pLeft1, *pLeft2, *pLeft3; uchar *pLeft1, *pLeft2, *pLeft3;
uint bufSize; uint bufSize;
...@@ -480,11 +480,11 @@ static uchar* thai2sortable(const uchar * tstr,uint len) ...@@ -480,11 +480,11 @@ static uchar* thai2sortable(const uchar * tstr,uint len)
*pRight1++ = t_ctype[p[1]][0]; *pRight1++ = t_ctype[p[1]][0];
*pRight2++ = t_ctype[p[1]][1]; *pRight2++ = t_ctype[p[1]][1];
*pRight3++ = t_ctype[p[1]][2]; *pRight3++ = t_ctype[p[1]][2];
// *pRight4++ = t_ctype[p[1]][3]; /* *pRight4++ = t_ctype[p[1]][3]; */
*pRight1++ = t_ctype[*p][0]; *pRight1++ = t_ctype[*p][0];
*pRight2++ = t_ctype[*p][1]; *pRight2++ = t_ctype[*p][1];
*pRight3++ = t_ctype[*p][2]; *pRight3++ = t_ctype[*p][2];
// *pRight4++ = t_ctype[*p][3]; /* *pRight4++ = t_ctype[*p][3]; */
len--; len--;
p += 2; p += 2;
} else { } else {
...@@ -501,17 +501,17 @@ static uchar* thai2sortable(const uchar * tstr,uint len) ...@@ -501,17 +501,17 @@ static uchar* thai2sortable(const uchar * tstr,uint len)
} }
*pRight1++ = L2_BLANK; *pRight1++ = L2_BLANK;
*pRight2++ = L3_BLANK; *pRight2++ = L3_BLANK;
// *pRight3++ = L4_BLANK; /* *pRight3++ = L4_BLANK; */
*pRight3++ = '\0'; *pRight3++ = '\0';
// *pRight4++ = '\0'; /* *pRight4++ = '\0'; */
memcpy(pRight1, pLeft2, pRight2 - pLeft2); memcpy(pRight1, pLeft2, pRight2 - pLeft2);
pRight1 += pRight2 - pLeft2; pRight1 += pRight2 - pLeft2;
memcpy(pRight1, pLeft3, pRight3 - pLeft3); memcpy(pRight1, pLeft3, pRight3 - pLeft3);
// pRight1 += pRight3 - pLeft3; /* pRight1 += pRight3 - pLeft3; */
// memcpy(pRight1, pLeft4, pRight4 - pLeft4); /* memcpy(pRight1, pLeft4, pRight4 - pLeft4); */
free(pLeft2); free(pLeft2);
free(pLeft3); free(pLeft3);
// free(pLeft4); /* free(pLeft4); */
return(outBuf); return(outBuf);
} }
...@@ -603,22 +603,22 @@ my_bool my_like_range_tis620(const char *ptr, uint ptr_length, pchar escape, ...@@ -603,22 +603,22 @@ my_bool my_like_range_tis620(const char *ptr, uint ptr_length, pchar escape,
{ {
if (*ptr == escape && ptr+1 != end) if (*ptr == escape && ptr+1 != end)
{ {
ptr++; // Skipp escape ptr++; /* Skipp escape */
*min_str++= *max_str++ = *ptr; *min_str++= *max_str++ = *ptr;
continue; continue;
} }
if (*ptr == wild_one) // '_' in SQL if (*ptr == wild_one) /* '_' in SQL */
{ {
*min_str++='\0'; // This should be min char *min_str++='\0'; /* This should be min char */
*max_str++=max_sort_chr; *max_str++=max_sort_chr;
continue; continue;
} }
if (*ptr == wild_many) // '%' in SQL if (*ptr == wild_many) /* '%' in SQL */
{ {
*min_length= (uint) (min_str - min_org); *min_length= (uint) (min_str - min_org);
*max_length=res_length; *max_length=res_length;
do { do {
*min_str++ = ' '; // Because if key compression *min_str++ = ' '; /* Because if key compression */
*max_str++ = max_sort_chr; *max_str++ = max_sort_chr;
} while (min_str != min_end); } while (min_str != min_end);
return 0; return 0;
...@@ -628,7 +628,7 @@ my_bool my_like_range_tis620(const char *ptr, uint ptr_length, pchar escape, ...@@ -628,7 +628,7 @@ my_bool my_like_range_tis620(const char *ptr, uint ptr_length, pchar escape,
*min_length= *max_length = (uint) (min_str - min_org); *min_length= *max_length = (uint) (min_str - min_org);
while (min_str != min_end) while (min_str != min_end)
*min_str++ = *max_str++ = ' '; // Because if key compression *min_str++ = *max_str++ = ' '; /* Because if key compression */
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment