Skip to content

Commit 58e2fde

Browse files
author
Luis Soares
committed
manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
Conflicts ========= Text conflict in .bzr-mysql/default.conf Text conflict in libmysqld/CMakeLists.txt Text conflict in libmysqld/Makefile.am Text conflict in mysql-test/collections/default.experimental Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result Text conflict in mysql-test/t/mysqlbinlog.test Text conflict in sql/CMakeLists.txt Text conflict in sql/Makefile.am Text conflict in sql/log_event_old.cc Text conflict in sql/rpl_rli.cc Text conflict in sql/slave.cc Text conflict in sql/sql_binlog.cc Text conflict in sql/sql_lex.h 21 conflicts encountered. NOTE ==== mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr: - "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr" This is the first cset (merge/...) committed after pulling from mysql-next-mr.
2 parents 2f5413e + c1584c9 commit 58e2fde

306 files changed

Lines changed: 15013 additions & 2453 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.

‎.bzr-mysql/default.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[MYSQL]
22
post_commit_to = "[email protected]"
33
post_push_to = "[email protected]"
4-
tree_name = "mysql-5.5.0-next-mr"
4+
tree_name = "mysql-5.1-rpl-merge"

‎client/my_readline.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#ifndef CLIENT_MY_READLINE_INCLUDED
2+
#define CLIENT_MY_READLINE_INCLUDED
3+
14
/* Copyright (C) 2000 MySQL AB
25
36
This program is free software; you can redistribute it and/or modify
@@ -31,3 +34,5 @@ extern LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file);
3134
extern LINE_BUFFER *batch_readline_command(LINE_BUFFER *buffer, char * str);
3235
extern char *batch_readline(LINE_BUFFER *buffer, bool *truncated);
3336
extern void batch_readline_end(LINE_BUFFER *buffer);
37+
38+
#endif /* CLIENT_MY_READLINE_INCLUDED */

‎client/mysqlbinlog.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,6 @@ static int parse_args(int *argc, char*** argv)
13491349
int ho_error;
13501350

13511351
result_file = stdout;
1352-
load_defaults("my",load_default_groups,argc,argv);
13531352
if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))
13541353
exit(ho_error);
13551354
if (debug_info_flag)
@@ -2001,8 +2000,9 @@ int main(int argc, char** argv)
20012000

20022001
my_init_time(); // for time functions
20032002

2003+
load_defaults("my", load_default_groups, &argc, &argv);
2004+
defaults_argv= argv;
20042005
parse_args(&argc, (char***)&argv);
2005-
defaults_argv=argv;
20062006

20072007
if (!argc)
20082008
{

‎client/sql_string.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#ifndef CLIENT_SQL_STRING_INCLUDED
2+
#define CLIENT_SQL_STRING_INCLUDED
3+
14
/* Copyright (C) 2000 MySQL AB
25
36
This program is free software; you can redistribute it and/or modify
@@ -353,3 +356,5 @@ class String
353356
return (s->alloced && Ptr >= s->Ptr && Ptr < s->Ptr + s->str_length);
354357
}
355358
};
359+
360+
#endif /* CLIENT_SQL_STRING_INCLUDED */

‎dbug/dbug.c‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1662,6 +1662,27 @@ BOOLEAN _db_keyword_(CODE_STATE *cs, const char *keyword)
16621662
InList(cs->stack->processes, cs->process));
16631663
}
16641664

1665+
/*
1666+
* FUNCTION
1667+
*
1668+
* _db_keywords_ test keyword formed by a set of strings for member
1669+
* of keyword list
1670+
*
1671+
* DESCRIPTION
1672+
*
1673+
* This function is similar to _db_keyword but receives a set of strings to
1674+
* be concatenated in order to make the keyword to be compared.
1675+
*/
1676+
1677+
BOOLEAN _db_keywords_(const char *function, const char *type)
1678+
{
1679+
char dest[_DBUG_MAX_FUNC_NAME_ + 1];
1680+
1681+
strxnmov(dest, _DBUG_MAX_FUNC_NAME_, function, type, NULL);
1682+
1683+
return _db_strict_keyword_(dest);
1684+
}
1685+
16651686
/*
16661687
* FUNCTION
16671688
*
@@ -2281,6 +2302,13 @@ void _db_unlock_file_()
22812302
pthread_mutex_unlock(&THR_LOCK_dbug);
22822303
}
22832304

2305+
const char* _db_get_func_(void)
2306+
{
2307+
CODE_STATE *cs= 0;
2308+
get_code_state_or_return NULL;
2309+
return cs->func;
2310+
}
2311+
22842312
/*
22852313
* Here we need the definitions of the clock routine. Add your
22862314
* own for whatever system that you have.

‎extra/my_print_defaults.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ int main(int argc, char **argv)
192192
}
193193

194194
for (argument= arguments+1 ; *argument ; argument++)
195-
puts(*argument);
195+
if (*argument != args_separator) /* skip arguments separator */
196+
puts(*argument);
196197
my_free((char*) load_default_groups,MYF(0));
197198
free_defaults(arguments);
198199

‎include/atomic/gcc_builtins.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#ifndef ATOMIC_GCC_BUILTINS_INCLUDED
2+
#define ATOMIC_GCC_BUILTINS_INCLUDED
3+
14
/* Copyright (C) 2008 MySQL AB
25
36
This program is free software; you can redistribute it and/or modify
@@ -31,3 +34,5 @@
3134
#define make_atomic_store_body(S) \
3235
(void) __sync_lock_test_and_set(a, v);
3336
#endif
37+
38+
#endif /* ATOMIC_GCC_BUILTINS_INCLUDED */

‎include/atomic/nolock.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#ifndef ATOMIC_NOLOCK_INCLUDED
2+
#define ATOMIC_NOLOCK_INCLUDED
3+
14
/* Copyright (C) 2006 MySQL AB
25
36
This program is free software; you can redistribute it and/or modify
@@ -59,3 +62,4 @@ typedef struct { } my_atomic_rwlock_t;
5962

6063
#endif
6164

65+
#endif /* ATOMIC_NOLOCK_INCLUDED */

‎include/atomic/rwlock.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#ifndef ATOMIC_RWLOCK_INCLUDED
2+
#define ATOMIC_RWLOCK_INCLUDED
3+
14
/* Copyright (C) 2006 MySQL AB
25
36
This program is free software; you can redistribute it and/or modify
@@ -46,3 +49,4 @@ typedef struct {pthread_rwlock_t rw;} my_atomic_rwlock_t;
4649
#define make_atomic_load_body(S) ret= *a;
4750
#define make_atomic_store_body(S) *a= v;
4851

52+
#endif /* ATOMIC_RWLOCK_INCLUDED */

‎include/atomic/x86-gcc.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#ifndef ATOMIC_X86_GCC_INCLUDED
2+
#define ATOMIC_X86_GCC_INCLUDED
3+
14
/* Copyright (C) 2006 MySQL AB
25
36
This program is free software; you can redistribute it and/or modify
@@ -56,3 +59,4 @@
5659
asm volatile ("; xchg %0, %1;" : "+m" (*a) : "r" (v))
5760
#endif
5861

62+
#endif /* ATOMIC_X86_GCC_INCLUDED */

0 commit comments

Comments
 (0)