Commit e44b6be9 authored by unknown's avatar unknown
Browse files

Merge mysqldev@production.mysql.com:my/mysql-5.1-release 

into mysql.com:/home/hf/work/mysql-5.1-release
parents bd1d3ebb 81467f2b

mysql-test/r/ctype_sjis.result

+2 −2
Original line number Diff line number Diff line
@@ -172,6 +172,6 @@ c2h 
ab_def

drop table t1;

SET NAMES sjis;

SELECT HEX('佐淘 \圭') FROM DUAL;

HEX('佐淘 ＼圭')

SELECT HEX('@\') FROM DUAL;

HEX('@\')

8DB2939181408C5C

mysql-test/r/innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -1822,7 +1822,7 @@ Variable_name Value 
innodb_sync_spin_loops	20

show variables like "innodb_thread_concurrency";

Variable_name	Value

innodb_thread_concurrency	20

innodb_thread_concurrency	8

set global innodb_thread_concurrency=1001;

show variables like "innodb_thread_concurrency";

Variable_name	Value

mysql-test/t/ctype_sjis.test

+1 −1
Original line number Diff line number Diff line
@@ -78,6 +78,6 @@ SET collation_connection='sjis_bin'; 


--character_set sjis

SET NAMES sjis;

SELECT HEX('@\\') FROM DUAL;

SELECT HEX('@\') FROM DUAL;



# End of 4.1 tests

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -5842,7 +5842,7 @@ log and this option does nothing anymore.", 
  {"innodb_thread_concurrency", OPT_INNODB_THREAD_CONCURRENCY,

   "Helps in performance tuning in heavily concurrent environments.",

   (gptr*) &srv_thread_concurrency, (gptr*) &srv_thread_concurrency,

   0, GET_LONG, REQUIRED_ARG, 20, 1, 1000, 0, 1, 0},

   0, GET_LONG, REQUIRED_ARG, 8, 1, 1000, 0, 1, 0},

  {"innodb_thread_sleep_delay", OPT_INNODB_THREAD_SLEEP_DELAY,

   "Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0"

    " disable a sleep",

sql/sql_lex.cc

+5 −26
Original line number Diff line number Diff line
@@ -319,17 +319,6 @@ static char *get_text(LEX *lex) 
      found_escape=1;

      if (lex->ptr == lex->end_of_query)

	return 0;

#ifdef USE_MB

      int l;

      if (use_mb(cs) &&

          (l = my_ismbchar(cs,

                           (const char *)lex->ptr,

                           (const char *)lex->end_of_query))) {

          lex->ptr += l;

          continue;

      }

      else

#endif

      yySkip();

    }

    else if (c == sep)
@@ -360,9 +349,6 @@ static char *get_text(LEX *lex) 
      {

	uchar *to;



        /* Re-use found_escape for tracking state of escapes */

        found_escape= 0;



	for (to=start ; str != end ; str++)

	{

#ifdef USE_MB
@@ -376,8 +362,7 @@ static char *get_text(LEX *lex) 
	      continue;

	  }

#endif

	  if (!found_escape &&

              !(lex->thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) &&

	  if (!(lex->thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) &&

              *str == '\\' && str+1 != end)

	  {

	    switch(*++str) {
@@ -404,20 +389,14 @@ static char *get_text(LEX *lex) 
	      *to++= '\\';		// remember prefix for wildcard

	      /* Fall through */

	    default:

              found_escape= 1;

              str--;

              *to++= *str;

	      break;

	    }

	  }

	  else if (!found_escape && *str == sep)

          {

            found_escape= 1;

          }

	  else if (*str == sep)

	    *to++= *str++;		// Two ' or "

	  else

          {

	    *to++ = *str;

            found_escape= 0;

          }

	}

	*to=0;

	lex->yytoklen=(uint) (to-start);