Skip to content

Commit 05f8110

Browse files
Alexey KopytovAlexey Kopytov
Alexey Kopytov
authored and
Alexey Kopytov
committed
Manual merge of mysql-5.1-bugteam to
mysql-trunk-merge. Conflicts: Text conflict in sql/sql_priv.h --BZR-- revision-id: [email protected] property-branch-nick: mysql-trunk-merge testament3-sha1: c3f0d5057e800a1e459feb765293a4639af3e1d5
2 parents afb80db + 71f96e7 commit 05f8110

327 files changed

Lines changed: 5719 additions & 3177 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.

‎.bzrfileids‎

2.19 KB
Binary file not shown.

‎.bzrignore‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ BitKeeper/post-commit-manual
8686
BitKeeper/tmp/*
8787
BitKeeper/tmp/bkr3sAHD
8888
BitKeeper/tmp/gone
89+
CMakeFiles
8990
CMakeFiles/*
91+
CTestTestfile.cmake
9092
COPYING
9193
COPYING.LIB
9294
Docs/#manual.texi#
@@ -394,6 +396,7 @@ client/rpl_tblmap.cc
394396
client/rpl_utility.h
395397
client/rpl_utility.cc
396398
client/select_test
399+
client/sql_const.h
397400
client/sql_string.cpp
398401
client/ssl_test
399402
client/thimble
@@ -1209,7 +1212,7 @@ libmysqld/stacktrace.c
12091212
libmysqld/strfunc.cc
12101213
libmysqld/table.cc
12111214
libmysqld/thr_malloc.cc
1212-
libmysqld/time.cc
1215+
libmysqld/sql_time.cc
12131216
libmysqld/tztime.cc
12141217
libmysqld/uniques.cc
12151218
libmysqld/unireg.cc
@@ -1414,7 +1417,7 @@ mysql-test/var/*
14141417
mysql-test/windows_sys_vars.inc
14151418
mysql.kdevprj
14161419
mysql.proj
1417-
mysql_priv.h
1420+
sql_priv.h
14181421
mysqlbinlog/*.ds?
14191422
mysqlbinlog/*.vcproj
14201423
mysqlcheck/*.ds?

‎client/Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ DEFS = -DMYSQL_CLIENT_NO_THREADS \
103103
-DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \
104104
-DMYSQL_DATADIR="\"$(localstatedir)\""
105105

106-
sql_src=log_event.h mysql_priv.h rpl_constants.h \
106+
sql_src=log_event.h sql_priv.h rpl_constants.h \
107107
rpl_tblmap.h rpl_tblmap.cc \
108108
log_event.cc my_decimal.h my_decimal.cc \
109109
log_event_old.h log_event_old.cc \
110110
rpl_record_old.h rpl_record_old.cc \
111111
rpl_utility.h rpl_utility.cc \
112-
transaction.h
112+
transaction.h sql_const.h
113113
strings_src=decimal.c dtoa.c
114114

115115
link_sources:

‎client/client_priv.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <my_sys.h>
2020
#include <m_string.h>
2121
#include <mysql.h>
22-
#include <mysql_embed.h>
2322
#include <errmsg.h>
2423
#include <my_getopt.h>
2524

‎client/mysqlbinlog.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "client_priv.h"
3232
#include <my_time.h>
3333
/* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */
34-
#include "mysql_priv.h"
34+
#include "sql_priv.h"
3535
#include "log_event.h"
3636
#include "sql_common.h"
3737

‎configure.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ AC_PREREQ(2.59)
2727
# Remember to also update version.c in ndb.
2828
# When changing major version number please also check switch statement
2929
# in client/mysqlbinlog.cc:check_master_version().
30-
AC_INIT([MySQL Server], [5.5.4-m3], [], [mysql])
30+
AC_INIT([MySQL Server], [5.5.5-m3], [], [mysql])
3131
AC_CONFIG_SRCDIR([sql/mysqld.cc])
3232
AC_CANONICAL_SYSTEM
3333
# USTAR format gives us the possibility to store longer path names in

‎include/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
3434
$(HEADERS_GEN_MAKE) probes_mysql.h probes_mysql_nodtrace.h
3535

3636
noinst_HEADERS = config-win.h config-netware.h lf.h my_bit.h \
37-
heap.h my_bitmap.h my_uctype.h \
37+
heap.h my_bitmap.h my_uctype.h password.h \
3838
myisam.h myisampack.h myisammrg.h ft_global.h\
3939
mysys_err.h my_base.h help_start.h help_end.h \
4040
my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \

‎include/hash.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,21 @@
1717

1818
#ifndef _hash_h
1919
#define _hash_h
20+
21+
#include "my_global.h" /* uchar */
22+
#include "my_sys.h" /* DYNAMIC_ARRAY */
23+
24+
/*
25+
This forward declaration is used from C files where the real
26+
definition is included before. Since C does not allow repeated
27+
typedef declarations, even when identical, the definition may not be
28+
repeated.
29+
*/
30+
#ifndef CHARSET_INFO_DEFINED
31+
#define CHARSET_INFO_DEFINED
32+
typedef struct charset_info_st CHARSET_INFO;
33+
#endif /* CHARSET_INFO_DEFINED */
34+
2035
#ifdef __cplusplus
2136
extern "C" {
2237
#endif

‎include/keycache.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717

1818
#ifndef _keycache_h
1919
#define _keycache_h
20+
21+
#include "my_sys.h" /* flush_type */
22+
2023
C_MODE_START
2124

2225
/* declare structures that is used by st_key_cache */

‎include/m_ctype.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515

1616
/*
1717
A better inplementation of the UNIX ctype(3) library.
18-
Notes: my_global.h should be included before ctype.h
1918
*/
2019

2120
#ifndef _m_ctype_h
2221
#define _m_ctype_h
2322

2423
#include <my_attribute.h>
24+
#include "my_global.h" /* uint16, uchar */
2525

2626
#ifdef __cplusplus
2727
extern "C" {
@@ -265,6 +265,12 @@ extern MY_CHARSET_HANDLER my_charset_8bit_handler;
265265
extern MY_CHARSET_HANDLER my_charset_ucs2_handler;
266266

267267

268+
/*
269+
We define this CHARSET_INFO_DEFINED here to prevent a repeat of the
270+
typedef in hash.c, which will cause a compiler error.
271+
*/
272+
#define CHARSET_INFO_DEFINED
273+
268274
/* See strings/CHARSET_INFO.txt about information on this structure */
269275
typedef struct charset_info_st
270276
{

0 commit comments

Comments
 (0)