Skip to content

Commit 2ff2d18

Browse files
vaintroubvaintroub
committed
merge
2 parents f31b165 + b3d9906 commit 2ff2d18

243 files changed

Lines changed: 5389 additions & 1728 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎BUILD/.cvsignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Docs/.cvsignore‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎Makefile.am‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,6 @@ test-bt-fast:
202202
-cd mysql-test ; MTR_BUILD_THREAD=auto \
203203
@PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress $(EXP)
204204

205-
test-bt-fast:
206-
-cd mysql-test ; MTR_BUILD_THREAD=auto \
207-
@PERL@ ./mysql-test-run.pl --force --comment=ps --ps-protocol --report-features
208-
209205
test-bt-debug:
210206
-cd mysql-test ; MTR_BUILD_THREAD=auto \
211207
@PERL@ ./mysql-test-run.pl --comment=debug --force --timer \

‎client/.cvsignore‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎client/mysql.cc‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4429,7 +4429,7 @@ com_status(String *buffer __attribute__((unused)),
44294429
Don't remove "limit 1",
44304430
it is protection againts SQL_SELECT_LIMIT=0
44314431
*/
4432-
if (mysql_store_result_for_lazy(&result))
4432+
if (!mysql_store_result_for_lazy(&result))
44334433
{
44344434
MYSQL_ROW cur=mysql_fetch_row(result);
44354435
if (cur)
@@ -4473,7 +4473,7 @@ com_status(String *buffer __attribute__((unused)),
44734473
if (mysql_errno(&mysql) == CR_SERVER_GONE_ERROR)
44744474
return 0;
44754475
}
4476-
if (mysql_store_result_for_lazy(&result))
4476+
if (!mysql_store_result_for_lazy(&result))
44774477
{
44784478
MYSQL_ROW cur=mysql_fetch_row(result);
44794479
if (cur)
@@ -4568,9 +4568,7 @@ server_version_string(MYSQL *con)
45684568
*/
45694569

45704570
if (server_version == NULL)
4571-
{
4572-
server_version= strdup(mysql_get_server_info(con));
4573-
}
4571+
server_version= my_strdup(mysql_get_server_info(con), MYF(MY_WME));
45744572
}
45754573

45764574
return server_version ? server_version : "";

‎cmake/mysql_version.cmake‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,11 @@ MACRO(GET_MYSQL_VERSION)
3838
FILE(STRINGS ${CMAKE_SOURCE_DIR}/configure.in str REGEX "AM_INIT_AUTOMAKE")
3939
STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+[-][^ \\)]+" VERSION_STRING "${str}")
4040
IF(NOT VERSION_STRING)
41-
FILE(STRINGS configure.in str REGEX "AC_INIT\\(")
42-
STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+[-][^ \\]]+" VERSION_STRING "${str}")
41+
STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION_STRING "${str}")
42+
IF(NOT VERSION_STRING)
43+
FILE(STRINGS configure.in str REGEX "AC_INIT\\(")
44+
STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+[-][^ \\]]+" VERSION_STRING "${str}")
45+
ENDIF()
4346
ENDIF()
4447
ENDIF()
4548
ENDIF()

‎cmd-line-utils/readline/.cvsignore‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎configure.in‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,15 @@ AC_CANONICAL_SYSTEM
2525
#
2626
# When changing major version number please also check switch statement
2727
# in client/mysqlbinlog.cc:check_master_version().
28-
AM_INIT_AUTOMAKE(mysql, 5.6.0-beta)
28+
AM_INIT_AUTOMAKE(mysql, 5.5.99)
2929
AM_CONFIG_HEADER([include/config.h:config.h.in])
3030

31+
# Request support for automake silent-rules if available.
32+
# Default to verbose output. One can use the configure-time
33+
# option --enable-silent-rules or make V=0 to activate
34+
# silent rules.
35+
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
36+
3137
PROTOCOL_VERSION=10
3238
DOT_FRM_VERSION=6
3339
# See the libtool docs for information on how to do shared lib versions.

‎extra/.cvsignore‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎extra/comp_err.c‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ static ha_checksum checksum_format_specifier(const char* msg)
660660
case 'u':
661661
case 'x':
662662
case 's':
663-
chksum= my_checksum(chksum, start, (uint) (p - start));
663+
chksum= my_checksum(chksum, start, (uint) (p + 1 - start));
664664
start= 0; /* Not in format specifier anymore */
665665
break;
666666

@@ -1030,20 +1030,22 @@ static char *parse_text_line(char *pos)
10301030
{
10311031
int i, nr;
10321032
char *row= pos;
1033+
size_t len;
10331034
DBUG_ENTER("parse_text_line");
10341035

1036+
len= strlen (pos);
10351037
while (*pos)
10361038
{
10371039
if (*pos == '\\')
10381040
{
10391041
switch (*++pos) {
10401042
case '\\':
10411043
case '"':
1042-
(void) strmov(pos - 1, pos);
1044+
(void) memmove (pos - 1, pos, len - (row - pos));
10431045
break;
10441046
case 'n':
10451047
pos[-1]= '\n';
1046-
(void) strmov(pos, pos + 1);
1048+
(void) memmove (pos, pos + 1, len - (row - pos));
10471049
break;
10481050
default:
10491051
if (*pos >= '0' && *pos < '8')
@@ -1053,10 +1055,10 @@ static char *parse_text_line(char *pos)
10531055
nr= nr * 8 + (*(pos++) - '0');
10541056
pos -= i;
10551057
pos[-1]= nr;
1056-
(void) strmov(pos, pos + i);
1058+
(void) memmove (pos, pos + i, len - (row - pos));
10571059
}
10581060
else if (*pos)
1059-
(void) strmov(pos - 1, pos); /* Remove '\' */
1061+
(void) memmove (pos - 1, pos, len - (row - pos)); /* Remove '\' */
10601062
}
10611063
}
10621064
else

0 commit comments

Comments
 (0)