Skip to content

Commit b78e3a5

Browse files
author
Alexander Nozdrin
committed
Auto-merge from mysql-next-mr.
2 parents 31740ff + 47ac596 commit b78e3a5

File tree

646 files changed

+95744
-12249
lines changed

Some content is hidden

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

646 files changed

+95744
-12249
lines changed

‎.bzrignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ client/rpl_record_old.h
392392
client/rpl_tblmap.h
393393
client/rpl_tblmap.cc
394394
client/rpl_utility.h
395+
client/rpl_utility.cc
395396
client/select_test
396397
client/sql_string.cpp
397398
client/ssl_test
@@ -1143,6 +1144,7 @@ libmysqld/rpl_handler.cc
11431144
libmysqld/rpl_injector.cc
11441145
libmysqld/rpl_record.cc
11451146
libmysqld/rpl_record_old.cc
1147+
libmysqld/rpl_utility.cc
11461148
libmysqld/scheduler.cc
11471149
libmysqld/set_var.cc
11481150
libmysqld/simple-test
@@ -3072,3 +3074,4 @@ libmysqld/rpl_handler.cc
30723074
dbug/tests
30733075
libmysqld/sys_vars.cc
30743076
libmysqld/keycaches.cc
3077+
client/dtoa.c

‎BUILD/compile-dist

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
#!/bin/sh
2+
3+
# Copyright (C) 2009 Sun Microsystems, Inc
4+
#
5+
# This program is free software; you can redistribute it and/or modify
6+
# it under the terms of the GNU General Public License as published by
7+
# the Free Software Foundation; version 2 of the License.
8+
#
9+
# This program is distributed in the hope that it will be useful,
10+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
# GNU General Public License for more details.
13+
#
14+
# You should have received a copy of the GNU General Public License
15+
# along with this program; if not, write to the Free Software
16+
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17+
218
#
319
# This script's purpose is to update the automake/autoconf helper scripts and
420
# to run a plain "configure" without any special compile flags. Only features
@@ -61,6 +77,7 @@ fi
6177
# Remember that configure restricts the man pages to the configured features !
6278
./configure \
6379
--with-embedded-server \
80+
--with-perfschema \
6481
--with-ndbcluster
6582
$gmake
6683

‎client/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,10 @@ DEFS = -DMYSQL_CLIENT_NO_THREADS \
104104
-DMYSQL_DATADIR="\"$(localstatedir)\""
105105

106106
sql_src=log_event.h mysql_priv.h rpl_constants.h \
107-
rpl_utility.h rpl_tblmap.h rpl_tblmap.cc \
107+
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 \
110+
rpl_utility.h rpl_utility.cc \
110111
rpl_record_old.h rpl_record_old.cc
111112
strings_src=decimal.c dtoa.c
112113

‎client/mysqlbinlog.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2140,4 +2140,4 @@ int main(int argc, char** argv)
21402140
#include "my_decimal.cc"
21412141
#include "log_event.cc"
21422142
#include "log_event_old.cc"
2143-
2143+
#include "rpl_utility.cc"

‎include/m_ctype.h

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ extern "C" {
4040

4141
typedef struct unicase_info_st
4242
{
43-
uint16 toupper;
44-
uint16 tolower;
45-
uint16 sort;
43+
uint32 toupper;
44+
uint32 tolower;
45+
uint32 sort;
4646
} MY_UNICASE_INFO;
4747

4848

@@ -439,6 +439,14 @@ extern size_t my_caseup_mb(CHARSET_INFO *, char *src, size_t srclen,
439439
char *dst, size_t dstlen);
440440
extern size_t my_casedn_mb(CHARSET_INFO *, char *src, size_t srclen,
441441
char *dst, size_t dstlen);
442+
extern size_t my_caseup_mb_varlen(CHARSET_INFO *, char *src, size_t srclen,
443+
char *dst, size_t dstlen);
444+
extern size_t my_casedn_mb_varlen(CHARSET_INFO *, char *src, size_t srclen,
445+
char *dst, size_t dstlen);
446+
extern size_t my_caseup_ujis(CHARSET_INFO *, char *src, size_t srclen,
447+
char *dst, size_t dstlen);
448+
extern size_t my_casedn_ujis(CHARSET_INFO *, char *src, size_t srclen,
449+
char *dst, size_t dstlen);
442450
extern int my_strcasecmp_mb(CHARSET_INFO * cs,const char *, const char *);
443451

444452
int my_wildcmp_mb(CHARSET_INFO *,

‎include/mysql_com.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@ enum enum_server_command
117117
thread */
118118
#define REFRESH_MASTER 128 /* Remove all bin logs in the index
119119
and truncate the index */
120+
#define REFRESH_ERROR_LOG 256 /* Rotate only the erorr log */
121+
#define REFRESH_ENGINE_LOG 512 /* Flush all storage engine logs */
122+
#define REFRESH_BINARY_LOG 1024 /* Flush the binary log */
123+
#define REFRESH_RELAY_LOG 2048 /* Flush the relay log */
124+
#define REFRESH_GENERAL_LOG 4096 /* Flush the general log */
125+
#define REFRESH_SLOW_LOG 8192 /* Flush the slow query log */
120126

121127
/* The following can't be set with mysql_refresh() */
122128
#define REFRESH_READ_LOCK 16384 /* Lock tables for read */

‎libmysqld/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
5656
item_geofunc.cc item_subselect.cc item_row.cc\
5757
item_xmlfunc.cc \
5858
key.cc lock.cc log.cc sql_state.c \
59-
log_event.cc rpl_record.cc \
59+
log_event.cc rpl_record.cc rpl_utility.cc \
6060
log_event_old.cc rpl_record_old.cc \
6161
protocol.cc net_serv.cc opt_range.cc \
6262
opt_sum.cc procedure.cc records.cc sql_acl.cc \

‎mysql-test/Makefile.am

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2000-2006 MySQL AB
1+
# Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc.
22
#
33
# This library is free software; you can redistribute it and/or
44
# modify it under the terms of the GNU Library General Public
@@ -75,6 +75,8 @@ EXTRA_DIST = README \
7575

7676
# List of directories containing test + result files and the
7777
# related test data files that should be copied
78+
# If you want to add a new suite, please check DEFAULT_SUITES in
79+
# mysql-test-run.pl.
7880
TEST_DIRS = t r include std_data std_data/parts collections \
7981
std_data/ndb_backup50 std_data/ndb_backup51 \
8082
std_data/ndb_backup51_data_be std_data/ndb_backup51_data_le \
@@ -100,7 +102,9 @@ TEST_DIRS = t r include std_data std_data/parts collections \
100102
suite/rpl_ndb suite/rpl_ndb/t suite/rpl_ndb/r \
101103
suite/parts suite/parts/t suite/parts/r suite/parts/inc \
102104
suite/innodb suite/innodb/t suite/innodb/r suite/innodb/include \
103-
suite/sys_vars suite/sys_vars/t suite/sys_vars/inc suite/sys_vars/r
105+
suite/sys_vars suite/sys_vars/t suite/sys_vars/inc suite/sys_vars/r \
106+
suite/perfschema suite/perfschema/t suite/perfschema/r \
107+
suite/perfschema/include
104108

105109
# Used by dist-hook and install-data-local to copy all
106110
# test files into either dist or install directory

‎mysql-test/collections/default.experimental

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,28 @@ main.information_schema # Bug#47449 2009-09-19 alik main.inform
1111
main.lock_multi_bug38499 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
1212
main.lock_multi_bug38691 @solaris # Bug#47792 2009-10-02 alik main.lock_multi_bug38691 times out sporadically on Solaris 10
1313
main.log_tables # Bug#47924 2009-10-08 alik main.log_tables times out sporadically
14+
main.outfile_loaddata @solaris # bug#46895 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)
1415
main.plugin # Bug#47146 Linking problem with example plugin when dtrace enabled
16+
main.signal_demo3 @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
17+
main.sp @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
18+
19+
perfschema.tampered_perfschema_table1 @windows # Bug#50478 2010-01-20 alik perfschema.tampered_perfschema_table1 fails sporadically on Windows and Solaris
20+
perfschema.tampered_perfschema_table1 @solaris # Bug#50478 2010-01-20 alik perfschema.tampered_perfschema_table1 fails sporadically on Windows and Solaris
1521

1622
rpl.rpl_get_master_version_and_clock* # Bug#49191 2009-12-01 Daogang rpl_get_master_version_and_clock failed on PB2: COM_REGISTER_SLAVE failed
1723
rpl.rpl_heartbeat_basic # BUG#43828 2009-10-22 luis fails sporadically
1824
rpl.rpl_heartbeat_2slaves # BUG#43828 2009-10-22 luis fails sporadically
1925
rpl.rpl_innodb_bug28430* # Bug#46029
2026
rpl.rpl_innodb_bug30888* @solaris # Bug#47646 2009-09-25 alik rpl.rpl_innodb_bug30888 fails sporadically on Solaris
27+
rpl.rpl_killed_ddl @windows # Bug#47638 2010-01-20 alik The rpl_killed_ddl test fails on Windows
2128
rpl.rpl_plugin_load* @solaris # Bug#47146
29+
rpl.rpl_row_sp011* @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
30+
rpl.rpl_slave_load_remove_tmpfile* @windows # Bug#50474 2010-01-20 alik rpl_slave_load_remove_tmpfile failed on windows debug enabled binary
31+
rpl.rpl_sync* @windows # Bug#50473 2010-01-20 alik rpl_sync fails on windows debug enabled binaries
2232
rpl.rpl_timezone* # Bug#47017 2009-10-27 alik rpl_timezone fails on PB-2 with mismatch error
2333

34+
sys_vars.max_sp_recursion_depth_func @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
35+
2436
# Declare all NDB-tests in ndb and rpl_ndb test suites experimental.
2537
# Usually the test cases from ndb and rpl_ndb test suites are not run in PB,
2638
# but they run by gcov.

‎mysql-test/collections/mysql-next-mr.push

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --suite=main,binlog,innodb,federated,rpl,sys_vars
2-
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row --vardir=var-ps_row --ps-protocol --mysqld=--binlog-format=row --suite=main,binlog,innodb,federated,rpl
3-
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded --vardir=var-emebbed --embedded --suite=main,binlog,innodb,federated,rpl
1+
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema
2+
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row --vardir=var-ps_row --ps-protocol --mysqld=--binlog-format=row --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema
3+
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded --vardir=var-emebbed --embedded --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema
44
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row --vardir=var-rpl_binlog_row --mysqld=--binlog-format=row --suite=rpl,binlog
55
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1

‎mysql-test/collections/mysql-trunk.push

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --suite=main,binlog,innodb,federated,rpl
2-
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row --vardir=var-ps_row --ps-protocol --mysqld=--binlog-format=row --suite=main,binlog,innodb,federated,rpl
3-
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded --vardir=var-emebbed --embedded --suite=main,binlog,innodb,federated,rpl
1+
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=n_mix --vardir=var-n_mix --mysqld=--binlog-format=mixed --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema
2+
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=ps_row --vardir=var-ps_row --ps-protocol --mysqld=--binlog-format=row --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema
3+
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=embedded --vardir=var-emebbed --embedded --suite=main,binlog,innodb,federated,rpl,sys_vars,perfschema
44
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_row --vardir=var-rpl_binlog_row --mysqld=--binlog-format=row --suite=rpl,binlog
55
perl mysql-test-run.pl --timer --force --parallel=auto --experimental=collections/default.experimental --comment=funcs_1 --vardir=var-funcs_1 --suite=funcs_1

0 commit comments

Comments
 (0)