Loading Docs/manual.texi +43 −28 Original line number Diff line number Diff line Loading @@ -13529,36 +13529,44 @@ character}. @strong{MySQL} recognizes the following escape sequences: @item \0 An ASCII 0 (@code{NUL}) character. @findex \' (single quote) @findex single quote (\') @item \' A single quote (@samp{'}) character. @findex \" (double quote) @findex double quote (\") @item \" A double quote (@samp{"}) character. @findex \b (backspace) @findex backspace (\b) @item \b A backspace character. @findex \n (newline) @findex newline (\n) @item \n A newline character. @findex \t (tab) @findex tab (\t) @item \t A tab character. @findex \r (carriage return) @findex return (\r) @findex carriage return (\r) @item \r A carriage return character. @findex \b (backspace) @findex backspace (\b) @item \b A backspace character. @findex \' (single quote) @findex single quote (\') @item \' A single quote (@samp{'}) character. @findex \t (tab) @findex tab (\t) @item \t A tab character. @findex \" (double quote) @findex double quote (\") @item \" A double quote (@samp{"}) character. @findex \z (Control-Z) ASCII(26) @findex (Control-Z) \z @item \z ASCII(26) (Control-Z). This character can be encoded to allow you to go around the problem that ASCII(26) stands for END-OF-FILE on windows. (ASCII(26) will cause problems if you try to use @code{mysql database < filename}). @findex \\ (escape) @findex escape (\\) Loading Loading @@ -37258,10 +37266,12 @@ None. You should use @code{mysql_real_escape_string()} instead! This is identical to @code{mysql_real_escape_string()} except that it takes the connection as the first argument. @code{mysql_real_escape_string()} will escape the string according to the current character set while @code{mysql_escape_string()} does not respect the current charset setting. This is identical to @code{mysql_real_escape_string()} except that it takes the connection as the first argument. @code{mysql_real_escape_string()} will escape the string according to the current character set while @code{mysql_escape_string()} does not respect the current charset setting. @findex @code{mysql_fetch_field()} @node mysql_fetch_field, mysql_fetch_fields, mysql_escape_string, C API functions Loading Loading @@ -38365,12 +38375,14 @@ try reconnecting to the server before giving up. @subsubheading Description Encodes the string in @code{from} to an escaped SQL string, taking into account the current charset of the connection, that can be sent to the server in a SQL statement, places the result in @code{to}, and adds a terminating null byte. Characters encoded are @code{NUL} (ASCII 0), @samp{\n}, @samp{\r}, @samp{\}, @samp{'}, @samp{"}, and Control-Z (@pxref{Literals}). This function is used to create a legal SQL string that you can use in a SQL statement. @xref{String syntax}. The string in @code{from} is encoded to an escaped SQL string, taking into account the current character set of the connection. The result is placed in @code{to} and a terminating null byte is appended. Characters encoded are @code{NUL} (ASCII 0), @samp{\n}, @samp{\r}, @samp{\}, @samp{'}, @samp{"}, and Control-Z (@pxref{Literals}). The string pointed to by @code{from} must be @code{length} bytes long. You must allocate the @code{to} buffer to be at least @code{length*2+1} bytes Loading Loading @@ -42413,6 +42425,9 @@ of connections in a short time). Don't free the key cache on @code{FLUSH TABLES} as this will cause problems with temporary tables. @item Fixed problem in Innobase with with other character sets than latin1 and alarms on Solaris. @item Fixed a core-dump bug when using very complex query involving @code{DISTINCT} and summary functions. @item innobase/os/os0file.c +1 −1 Original line number Diff line number Diff line Loading @@ -905,7 +905,7 @@ os_aio_init( os_aio_segment_wait_events[i] = os_event_create(NULL); } #ifdef POSIX_ASYNC_IO #if defined(POSIX_ASYNC_IO) && defined(NOT_USED_WITH_MYSQL) /* Block aio signals from the current thread and its children: for this to work, the current thread must be the first created in the database, so that all its children will inherit its Loading sql/ha_innobase.cc +1 −7 Original line number Diff line number Diff line Loading @@ -930,13 +930,7 @@ innobase_mysql_cmp( case FIELD_TYPE_VAR_STRING: ret = my_sortncmp((const char*) a, a_length, (const char*) b, b_length); if (ret < 0) { return(-1); } else if (ret > 0) { return(1); } else { return(0); } return ret; default: assert(0); } Loading Loading
Docs/manual.texi +43 −28 Original line number Diff line number Diff line Loading @@ -13529,36 +13529,44 @@ character}. @strong{MySQL} recognizes the following escape sequences: @item \0 An ASCII 0 (@code{NUL}) character. @findex \' (single quote) @findex single quote (\') @item \' A single quote (@samp{'}) character. @findex \" (double quote) @findex double quote (\") @item \" A double quote (@samp{"}) character. @findex \b (backspace) @findex backspace (\b) @item \b A backspace character. @findex \n (newline) @findex newline (\n) @item \n A newline character. @findex \t (tab) @findex tab (\t) @item \t A tab character. @findex \r (carriage return) @findex return (\r) @findex carriage return (\r) @item \r A carriage return character. @findex \b (backspace) @findex backspace (\b) @item \b A backspace character. @findex \' (single quote) @findex single quote (\') @item \' A single quote (@samp{'}) character. @findex \t (tab) @findex tab (\t) @item \t A tab character. @findex \" (double quote) @findex double quote (\") @item \" A double quote (@samp{"}) character. @findex \z (Control-Z) ASCII(26) @findex (Control-Z) \z @item \z ASCII(26) (Control-Z). This character can be encoded to allow you to go around the problem that ASCII(26) stands for END-OF-FILE on windows. (ASCII(26) will cause problems if you try to use @code{mysql database < filename}). @findex \\ (escape) @findex escape (\\) Loading Loading @@ -37258,10 +37266,12 @@ None. You should use @code{mysql_real_escape_string()} instead! This is identical to @code{mysql_real_escape_string()} except that it takes the connection as the first argument. @code{mysql_real_escape_string()} will escape the string according to the current character set while @code{mysql_escape_string()} does not respect the current charset setting. This is identical to @code{mysql_real_escape_string()} except that it takes the connection as the first argument. @code{mysql_real_escape_string()} will escape the string according to the current character set while @code{mysql_escape_string()} does not respect the current charset setting. @findex @code{mysql_fetch_field()} @node mysql_fetch_field, mysql_fetch_fields, mysql_escape_string, C API functions Loading Loading @@ -38365,12 +38375,14 @@ try reconnecting to the server before giving up. @subsubheading Description Encodes the string in @code{from} to an escaped SQL string, taking into account the current charset of the connection, that can be sent to the server in a SQL statement, places the result in @code{to}, and adds a terminating null byte. Characters encoded are @code{NUL} (ASCII 0), @samp{\n}, @samp{\r}, @samp{\}, @samp{'}, @samp{"}, and Control-Z (@pxref{Literals}). This function is used to create a legal SQL string that you can use in a SQL statement. @xref{String syntax}. The string in @code{from} is encoded to an escaped SQL string, taking into account the current character set of the connection. The result is placed in @code{to} and a terminating null byte is appended. Characters encoded are @code{NUL} (ASCII 0), @samp{\n}, @samp{\r}, @samp{\}, @samp{'}, @samp{"}, and Control-Z (@pxref{Literals}). The string pointed to by @code{from} must be @code{length} bytes long. You must allocate the @code{to} buffer to be at least @code{length*2+1} bytes Loading Loading @@ -42413,6 +42425,9 @@ of connections in a short time). Don't free the key cache on @code{FLUSH TABLES} as this will cause problems with temporary tables. @item Fixed problem in Innobase with with other character sets than latin1 and alarms on Solaris. @item Fixed a core-dump bug when using very complex query involving @code{DISTINCT} and summary functions. @item
innobase/os/os0file.c +1 −1 Original line number Diff line number Diff line Loading @@ -905,7 +905,7 @@ os_aio_init( os_aio_segment_wait_events[i] = os_event_create(NULL); } #ifdef POSIX_ASYNC_IO #if defined(POSIX_ASYNC_IO) && defined(NOT_USED_WITH_MYSQL) /* Block aio signals from the current thread and its children: for this to work, the current thread must be the first created in the database, so that all its children will inherit its Loading
sql/ha_innobase.cc +1 −7 Original line number Diff line number Diff line Loading @@ -930,13 +930,7 @@ innobase_mysql_cmp( case FIELD_TYPE_VAR_STRING: ret = my_sortncmp((const char*) a, a_length, (const char*) b, b_length); if (ret < 0) { return(-1); } else if (ret > 0) { return(1); } else { return(0); } return ret; default: assert(0); } Loading