3306 Marc Alff 2010-07-15 [merge]
Null merge of backports, mysql-trunk-bugfixing --> mysql-next-mr-bugfixing
3305 Davi Arnaut 2010-07-15 [merge]
Merge of mysql-trunk-bugfixing into mysql-next-mr-bugfixing.
removed:
include/config-netware.h
include/help_end.h
include/help_start.h
mysys/mf_util.c
mysys/my_netware.c
netware/
netware/BUILD/
netware/BUILD/apply-patch
netware/BUILD/compile-AUTOTOOLS
netware/BUILD/compile-linux-tools
netware/BUILD/compile-netware-END
netware/BUILD/compile-netware-START
netware/BUILD/compile-netware-all
netware/BUILD/compile-netware-debug
netware/BUILD/compile-netware-max
netware/BUILD/compile-netware-max-debug
netware/BUILD/compile-netware-src
netware/BUILD/compile-netware-standard
netware/BUILD/create-patch
netware/BUILD/cron-build
netware/BUILD/crontab
netware/BUILD/knetware.imp
netware/BUILD/mwasmnlm
netware/BUILD/mwccnlm
netware/BUILD/mwenv
netware/BUILD/mwldnlm
netware/BUILD/nwbuild
netware/BUILD/openssl.imp
netware/BUILD/save-patch
netware/Makefile.am
netware/comp_err.def
netware/install_test_db.ncf
netware/libmysql.def
netware/libmysqlmain.c
netware/my_manage.c
netware/my_manage.h
netware/my_print_defaults.def
netware/myisam_ftdump.def
netware/myisamchk.def
netware/myisamlog.def
netware/myisampack.def
netware/mysql.def
netware/mysql.xdc
netware/mysql_client_test.def
netware/mysql_fix_privilege_tables.pl
netware/mysql_install_db.c
netware/mysql_install_db.def
netware/mysql_secure_installation.pl
netware/mysql_test_run.c
netware/mysql_test_run.def
netware/mysql_upgrade.def
netware/mysql_waitpid.def
netware/mysqladmin.def
netware/mysqlbinlog.def
netware/mysqlcheck.def
netware/mysqld.def
netware/mysqld_safe.c
netware/mysqld_safe.def
netware/mysqldump.def
netware/mysqlimport.def
netware/mysqlshow.def
netware/mysqlslap.def
netware/mysqltest.def
netware/perror.def
netware/replace.def
netware/resolve_stack_dump.def
netware/resolveip.def
netware/static_init_db.sql
sql/my_lock.c
modified:
Makefile.am
client/client_priv.h
client/mysql.cc
client/mysql_upgrade.c
client/mysqladmin.cc
client/mysqlbinlog.cc
client/mysqlcheck.c
client/mysqldump.c
client/mysqlimport.c
client/mysqlshow.c
client/mysqlslap.c
client/mysqltest.cc
config/ac-macros/misc.m4
configure.in
dbug/dbug.c
dbug/dbug_analyze.c
extra/my_print_defaults.c
extra/mysql_waitpid.c
extra/perror.c
extra/resolve_stack_dump.c
extra/resolveip.c
extra/yassl/include/yassl_int.hpp
extra/yassl/src/socket_wrapper.cpp
extra/yassl/taocrypt/include/misc.hpp
extra/yassl/taocrypt/src/random.cpp
extra/yassl/testsuite/test.hpp
include/Makefile.am
include/config-win.h
include/m_string.h
include/my_dbug.h
include/my_global.h
include/my_net.h
include/my_pthread.h
include/my_stacktrace.h
include/my_sys.h
include/my_time.h
include/mysql.h
include/mysys_err.h
libmysql/dll.c
libmysql/get_password.c
libmysql/libmysql.c
libmysqld/Makefile.am
libmysqld/lib_sql.cc
libmysqld/libmysqld.c
mysql-test/lib/v1/mtr_misc.pl
mysql-test/lib/v1/mysql-test-run.pl
mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test
mysql-test/suite/sys_vars/t/ndb_log_update_as_write_basic.test
mysql-test/suite/sys_vars/t/ndb_log_updated_only_basic.test
mysys/Makefile.am
mysys/default.c
mysys/errors.c
mysys/mf_dirname.c
mysys/mf_fn_ext.c
mysys/mf_keycache.c
mysys/mf_pack.c
mysys/mf_path.c
mysys/mf_tempdir.c
mysys/mf_tempfile.c
mysys/mf_unixpath.c
mysys/my_clock.c
mysys/my_copy.c
mysys/my_getopt.c
mysys/my_getsystime.c
mysys/my_getwd.c
mysys/my_init.c
mysys/my_lib.c
mysys/my_lock.c
mysys/my_mess.c
mysys/my_pthread.c
mysys/my_rdtsc.c
mysys/my_redel.c
mysys/my_sleep.c
mysys/my_static.c
mysys/my_static.h
scripts/make_binary_distribution.sh
scripts/mysqlhotcopy.sh
sql-common/client.c
sql/Makefile.am
sql/mysqld.cc
sql/net_serv.cc
sql/sql_bitmap.h
sql/sql_connect.cc
sql/sql_load.cc
sql/sys_vars.cc
sql/tztime.cc
storage/heap/hp_open.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/include/os0file.h
storage/innobase/include/srv0start.h
storage/innobase/include/univ.i
storage/innobase/include/ut0dbg.h
storage/innobase/os/os0file.c
storage/innobase/os/os0proc.c
storage/innobase/os/os0thread.c
storage/innobase/srv/srv0start.c
storage/innobase/ut/ut0dbg.c
storage/innobase/ut/ut0mem.c
storage/myisam/mi_create.c
storage/myisam/mi_log.c
storage/myisam/mi_open.c
storage/myisam/mi_static.c
storage/myisam/mi_test2.c
storage/myisam/mi_test3.c
storage/myisam/myisam_ftdump.c
storage/myisam/myisamchk.c
storage/myisam/myisamdef.h
storage/myisam/myisamlog.c
storage/myisam/myisampack.c
storage/myisam/sort.c
storage/myisammrg/myrg_open.c
storage/ndb/src/mgmclient/main.cpp
storage/ndb/src/mgmsrv/main.cpp
strings/ctype-big5.c
strings/ctype-cp932.c
strings/ctype-czech.c
strings/ctype-euc_kr.c
strings/ctype-eucjpms.c
strings/ctype-gb2312.c
strings/ctype-gbk.c
strings/ctype-simple.c
strings/ctype-sjis.c
strings/ctype-tis620.c
strings/ctype-ujis.c
strings/ctype-win1250ch.c
strings/do_ctype.c
strings/int2str.c
strings/my_strtoll10.c
strings/strtol.c
strings/strtoul.c
vio/test-ssl.c
vio/viossl.c
vio/viosslfactories.c
Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100716012830-9nkc2ixkxm6lxlee.bundle
| Thread |
|---|
| • bzr push into mysql-next-mr-bugfixing branch (marc.alff:3305 to 3306) | Marc Alff | 16 Jul |
