Skip to content

Commit c605bac

Browse files
author
Alexander Nozdrin
committed
Manual merge from mysql-trunk.
Conflicts: - client/mysqltest.cc - mysql-test/collections/default.experimental - mysql-test/suite/rpl/t/disabled.def - sql/mysqld.cc - sql/opt_range.cc - sql/sp.cc - sql/sql_acl.cc - sql/sql_partition.cc - sql/sql_table.cc --BZR-- revision-id: [email protected] property-branch-nick: mysql-trunk-merge testament3-sha1: 4687303a45297a218e7db81c3464a6b481ba4177
2 parents 83934ea + 4da2236 commit c605bac

1,064 files changed

Lines changed: 62566 additions & 35416 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‎

613 Bytes
Binary file not shown.

‎.bzrignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,6 +1139,7 @@ libmysqld/protocol_cursor.cc
11391139
libmysqld/records.cc
11401140
libmysqld/repl_failsafe.cc
11411141
libmysqld/rpl_filter.cc
1142+
libmysqld/rpl_handler.cc
11421143
libmysqld/rpl_injector.cc
11431144
libmysqld/rpl_record.cc
11441145
libmysqld/rpl_record_old.cc
@@ -3064,4 +3065,8 @@ sql/share/spanish
30643065
sql/share/swedish
30653066
sql/share/ukrainian
30663067
libmysqld/examples/mysqltest.cc
3068+
libmysqld/sql_signal.cc
3069+
libmysqld/rpl_handler.cc
30673070
libmysqld/debug_sync.cc
3071+
libmysqld/rpl_handler.cc
3072+
dbug/tests

‎.cvsignore‎

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

‎BUILD/build_mccge.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ parse_package()
556556
package="pro"
557557
;;
558558
extended )
559-
package=""
559+
package="extended"
560560
;;
561561
cge )
562562
package="cge"
@@ -1274,7 +1274,7 @@ set_bsd_configs()
12741274
if test "x$fast_flag" != "xno" ; then
12751275
compiler_flags="$compiler_flags -O3"
12761276
else
1277-
compiler_flags="$compiler_flags -O"
1277+
compiler_flags="$compiler_flags -O0"
12781278
fi
12791279
set_cc_and_cxx_for_gcc
12801280
}
@@ -1305,7 +1305,7 @@ set_linux_configs()
13051305
if test "x$fast_flag" != "xno" ; then
13061306
compiler_flags="$compiler_flags -O2"
13071307
else
1308-
compiler_flags="$compiler_flags -O"
1308+
compiler_flags="$compiler_flags -O0"
13091309
fi
13101310
# configure will set proper compiler flags for gcc on Linux
13111311
elif test "x$compiler" = "xicc" ; then
@@ -1375,8 +1375,8 @@ set_solaris_configs()
13751375
LDFLAGS="$LDFLAGS -O2"
13761376
compiler_flags="$compiler_flags -O2"
13771377
else
1378-
LDFLAGS="$LDFLAGS -O"
1379-
compiler_flags="$compiler_flags -O"
1378+
LDFLAGS="$LDFLAGS -O0"
1379+
compiler_flags="$compiler_flags -O0"
13801380
fi
13811381
fi
13821382
else
@@ -1407,7 +1407,7 @@ set_solaris_configs()
14071407
elif test "x$fast_flag" = "xgeneric" ; then
14081408
compiler_flags="$compiler_flags -xO2"
14091409
else
1410-
compiler_flags="$compiler_flags -xO"
1410+
compiler_flags="$compiler_flags -xO0"
14111411
fi
14121412
else
14131413
#Using SPARC cpu with SunStudio (Forte) compiler
@@ -1421,7 +1421,7 @@ set_solaris_configs()
14211421
elif test "x$fast_flag" = "xgeneric" ; then
14221422
compiler_flags="$compiler_flags -xO2"
14231423
else
1424-
compiler_flags="$compiler_flags -xO"
1424+
compiler_flags="$compiler_flags -xO0"
14251425
fi
14261426
fi
14271427
fi
@@ -1452,7 +1452,7 @@ set_macosx_configs()
14521452
if test "x$fast_flag" != "xno" ; then
14531453
compiler_flags="$compiler_flags -Os"
14541454
else
1455-
compiler_flags="$compiler_flags -O"
1455+
compiler_flags="$compiler_flags -O0"
14561456
fi
14571457
set_cc_and_cxx_for_gcc
14581458
}

‎BitKeeper/etc/RESYNC_TREE‎

Whitespace-only changes.

‎BitKeeper/etc/collapsed‎

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

‎BitKeeper/etc/config‎

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

0 commit comments

Comments
 (0)