Skip to content

Commit 54752b0

Browse files
author
Alexander Nozdrin
committed
Manual merge from mysql-trunk-merge.
Conflicts: - extra/comp_err.c - mysql-test/collections/default.experimental - mysql-test/r/archive.result - mysql-test/r/select.result - mysql-test/suite/binlog/r/binlog_unsafe.result - mysql-test/suite/binlog/t/binlog_unsafe.test - mysql-test/suite/rpl/t/disabled.def - mysql-test/t/archive.test - mysql-test/t/select.test - sql/item.cc - sql/item.h - sql/item_timefunc.cc - sql/sql_base.cc - sql/sql_delete.cc - sql/sql_load.cc - sql/sql_partition.cc - sql/sql_table.cc - storage/innobase/handler/ha_innodb.cc - vio/vio.c --BZR-- revision-id: [email protected] property-branch-nick: mysql-next-mr.MERGE testament3-sha1: 4787233a906b515ca7cd6db07bd6ca1264008178
2 parents 12c8fb8 + c605bac commit 54752b0

File tree

222 files changed

+5378
-1577
lines changed

Some content is hidden

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

222 files changed

+5378
-1577
lines changed

‎.bzrfileids‎

1.73 KB
Binary file not shown.

‎Makefile.am‎

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

202-
test-bt-fast:
203-
-cd mysql-test ; MTR_BUILD_THREAD=auto \
204-
@PERL@ ./mysql-test-run.pl --force --comment=ps --ps-protocol --report-features
205-
206202
test-bt-debug:
207203
-cd mysql-test ; MTR_BUILD_THREAD=auto \
208204
@PERL@ ./mysql-test-run.pl --comment=debug --force --timer \

‎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 : "";

‎configure.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ AC_CANONICAL_SYSTEM
2828
AM_INIT_AUTOMAKE(mysql, 5.6.0-beta)
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/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

‎include/mysql.h‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -459,16 +459,6 @@ unsigned long STDCALL mysql_real_escape_string(MYSQL *mysql,
459459
char *to,const char *from,
460460
unsigned long length);
461461
void STDCALL mysql_debug(const char *debug);
462-
char * STDCALL mysql_odbc_escape_string(MYSQL *mysql,
463-
char *to,
464-
unsigned long to_length,
465-
const char *from,
466-
unsigned long from_length,
467-
void *param,
468-
char *
469-
(*extend_buffer)
470-
(void *, char *to,
471-
unsigned long *length));
472462
void STDCALL myodbc_remove_escape(MYSQL *mysql,char *name);
473463
unsigned int STDCALL mysql_thread_safe(void);
474464
my_bool STDCALL mysql_embedded(void);

‎include/mysql.h.pp‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -474,16 +474,6 @@
474474
char *to,const char *from,
475475
unsigned long length);
476476
void mysql_debug(const char *debug);
477-
char * mysql_odbc_escape_string(MYSQL *mysql,
478-
char *to,
479-
unsigned long to_length,
480-
const char *from,
481-
unsigned long from_length,
482-
void *param,
483-
char *
484-
(*extend_buffer)
485-
(void *, char *to,
486-
unsigned long *length));
487477
void myodbc_remove_escape(MYSQL *mysql,char *name);
488478
unsigned int mysql_thread_safe(void);
489479
my_bool mysql_embedded(void);

‎include/violite.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ struct st_vio
227227
#endif /* HAVE_SMEM */
228228
#ifdef _WIN32
229229
OVERLAPPED pipe_overlapped;
230-
DWORD read_timeout_millis;
231-
DWORD write_timeout_millis;
230+
DWORD read_timeout_ms;
231+
DWORD write_timeout_ms;
232232
#endif
233233
};
234234
#endif /* vio_violite_h_ */

‎libmysql/libmysql.c‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,20 +1258,6 @@ mysql_real_escape_string(MYSQL *mysql, char *to,const char *from,
12581258
return (uint) escape_string_for_mysql(mysql->charset, to, 0, from, length);
12591259
}
12601260

1261-
1262-
char * STDCALL
1263-
mysql_odbc_escape_string(MYSQL *mysql __attribute__((unused)),
1264-
char *to __attribute__((unused)),
1265-
ulong to_length __attribute__((unused)),
1266-
const char *from __attribute__((unused)),
1267-
ulong from_length __attribute__((unused)),
1268-
void *param __attribute__((unused)),
1269-
char * (*extend_buffer)(void *, char *, ulong *)
1270-
__attribute__((unused)))
1271-
{
1272-
return NULL;
1273-
}
1274-
12751261
void STDCALL
12761262
myodbc_remove_escape(MYSQL *mysql,char *name)
12771263
{

‎libmysql/libmysql.def‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ EXPORTS
7878
mysql_next_result
7979
mysql_num_fields
8080
mysql_num_rows
81-
mysql_odbc_escape_string
8281
mysql_options
8382
mysql_stmt_param_count
8483
mysql_stmt_param_metadata

0 commit comments

Comments
 (0)