1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

after merge fix

Browse Source 
mysql-test/r/user_var.result:
  after merge fixes - old (erroneous) results restored.
  Should be corrected when the fix is applied
mysql-test/t/user_var.test:
  after merge fixes - old (erroneous) results restored.
  Should be corrected when the fix is applied
This commit is contained in:
unknown 2005-04-06 23:12:10 +02:00
parent 3960c84f12
commit 1fcebd5549
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/user_var.result
View File

@ -180,6 +180,5 @@ select coercibility(@v1),coercibility(@v2),coercibility(@v3),coercibility(@v4);
coercibility(@v1) coercibility(@v2) coercibility(@v3) coercibility(@v4) coercibility(@v1) coercibility(@v2) coercibility(@v3) coercibility(@v4)
2 2 2 2 2 2 2 2
set session @honk=99; set session @honk=99;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@honk=99' at line 1
set one_shot @honk=99; set one_shot @honk=99;
ERROR HY000: The SET ONE_SHOT syntax is reserved for purposes internal to the MySQL server ERROR HY000: The 'SET ONE_SHOT' syntax is reserved for purposes internal to the MySQL server

3
mysql-test/t/user_var.test
View File

@ -116,7 +116,6 @@ select coercibility(@v1),coercibility(@v2),coercibility(@v3),coercibility(@v4);
# #
# Bug #9286 SESSION/GLOBAL should be disallowed for user variables # Bug #9286 SESSION/GLOBAL should be disallowed for user variables
# #
--error 1064
set session @honk=99; set session @honk=99;
--error 1105 --error 1382
set one_shot @honk=99; set one_shot @honk=99;

3
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
View File

@ -813,6 +813,7 @@ Dbtup::updateFixedSizeTHManyWordNotNULL(Uint32* inBuffer,
ndbrequire(i < regTabPtr->noOfCharsets); ndbrequire(i < regTabPtr->noOfCharsets);
// not const in MySQL // not const in MySQL
CHARSET_INFO* cs = regTabPtr->charsetArray[i]; CHARSET_INFO* cs = regTabPtr->charsetArray[i];
int not_used;
const char* ssrc = (const char*)&inBuffer[tInBufIndex + 1]; const char* ssrc = (const char*)&inBuffer[tInBufIndex + 1];
Uint32 lb, len; Uint32 lb, len;
if (! NdbSqlUtil::get_var_length(typeId, ssrc, bytes, lb, len)) { if (! NdbSqlUtil::get_var_length(typeId, ssrc, bytes, lb, len)) {
@ -822,7 +823,7 @@ Dbtup::updateFixedSizeTHManyWordNotNULL(Uint32* inBuffer,
} }
// fast fix bug#7340 // fast fix bug#7340
if (typeId != NDB_TYPE_TEXT && if (typeId != NDB_TYPE_TEXT &&
(*cs->cset->well_formed_len)(cs, ssrc + lb, ssrc + lb + len, ZNIL) != len) { (*cs->cset->well_formed_len)(cs, ssrc + lb, ssrc + lb + len, ZNIL, &not_used) != len) {
ljam(); ljam();
terrorCode = ZINVALID_CHAR_FORMAT; terrorCode = ZINVALID_CHAR_FORMAT;
return false; return false;

4
strings/ctype-cp932.c
View File

@ -5413,9 +5413,10 @@ uint my_numcells_cp932(CHARSET_INFO *cs __attribute__((unused)),
*/ */
static static
uint my_well_formed_len_cp932(CHARSET_INFO *cs __attribute__((unused)), uint my_well_formed_len_cp932(CHARSET_INFO *cs __attribute__((unused)),
const char *b, const char *e, uint pos) const char *b, const char *e, uint pos, int *error)
{ {
const char *b0= b; const char *b0= b;
*error= 0;
while (pos && b < e) while (pos && b < e)
{ {
/* /*
@ -5441,6 +5442,7 @@ uint my_well_formed_len_cp932(CHARSET_INFO *cs __attribute__((unused)),
else else
{ {
/* Wrong byte sequence */ /* Wrong byte sequence */
*error= 1;
break; break;
} }
} }

5
strings/ctype-eucjpms.c
View File

@ -8388,9 +8388,10 @@ my_jisx0212_uni_onechar(int code){
static static
uint my_well_formed_len_eucjpms(CHARSET_INFO *cs __attribute__((unused)), uint my_well_formed_len_eucjpms(CHARSET_INFO *cs __attribute__((unused)),
const char *beg, const char *end, uint pos) const char *beg, const char *end, uint pos, int *error)
{ {
const uchar *b= (uchar *) beg; const uchar *b= (uchar *) beg;
*error=0;
for ( ; pos && b < (uchar*) end; pos--, b++) for ( ; pos && b < (uchar*) end; pos--, b++)
{ {
@ -8408,6 +8409,7 @@ uint my_well_formed_len_eucjpms(CHARSET_INFO *cs __attribute__((unused)),
{ {
if (*b >= 0xA0 && *b <= 0xDF) if (*b >= 0xA0 && *b <= 0xDF)
continue; continue;
*error=1;
return chbeg - beg; /* invalid sequence */ return chbeg - beg; /* invalid sequence */
} }
@ -8421,6 +8423,7 @@ uint my_well_formed_len_eucjpms(CHARSET_INFO *cs __attribute__((unused)),
if (ch >= 0xA1 && ch <= 0xFE && if (ch >= 0xA1 && ch <= 0xFE &&
*b >= 0xA1 && *b <= 0xFE) /* [xA1-xFE][xA1-xFE] */ *b >= 0xA1 && *b <= 0xFE) /* [xA1-xFE][xA1-xFE] */
continue; continue;
*error=1;
return chbeg - beg; /* invalid sequence */ return chbeg - beg; /* invalid sequence */
} }
return b - (uchar *) beg; return b - (uchar *) beg;