← Back to branch summary

~maria-captains/maria/5.1

~maria-captains/maria/5.1

Viewing all changes in revision 3164.

Committer: timour at askmonty
Date: 2012-11-06 09:52:55 UTC
mfrom: (2502.1195.40 clone-5.1)
Revision ID: timour@askmonty.org-20121106095255-10b1yftq16je2ry1

Merge MySQL 5.1.66 -> MariaDB 5.1.65

files added:
mysql-test/suite/federated/include

mysql-test/suite/innodb_plugin/r/innodb_information_schema_buffer.result

mysql-test/suite/innodb_plugin/t/innodb_information_schema_buffer.test

files removed:
extra/yassl/taocrypt/src/crypto.cpp

files renamed:
mysql-test/suite/federated/federated.inc => mysql-test/suite/federated/include/federated.inc

mysql-test/suite/federated/federated_cleanup.inc => mysql-test/suite/federated/include/federated_cleanup.inc

files modified:
CMakeLists.txt

Docs/INSTALL-BINARY

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

client/sql_string.h

configure.in

extra/perror.c

extra/yassl/src/ssl.cpp

extra/yassl/taocrypt/src/Makefile.am

include/welcome_copyright_notice.h

mysql-test/Makefile.am

mysql-test/r/openssl_1.result

mysql-test/r/subselect.result

mysql-test/suite/federated/federated_archive.test

mysql-test/suite/federated/federated_bug_13118.test

mysql-test/suite/federated/federated_bug_25714.test

mysql-test/suite/federated/federated_bug_32426.test

mysql-test/suite/federated/federated_bug_35333.test

mysql-test/suite/federated/federated_bug_585688.test

mysql-test/suite/federated/federated_debug.test

mysql-test/suite/federated/federated_innodb.test

mysql-test/suite/federated/federated_partition.test

mysql-test/suite/federated/federated_server.test

mysql-test/suite/federated/federated_transactions.test

mysql-test/suite/federated/federatedx.test

mysql-test/suite/innodb/r/innodb_misc1.result

mysql-test/t/openssl_1.test

scripts/mysql_secure_installation.pl.in

scripts/mysql_secure_installation.sh

sql/filesort.cc

sql/gen_lex_hash.cc

sql/ha_partition.cc

sql/ha_partition.h

sql/handler.cc

sql/item_strfunc.cc

sql/item_subselect.cc

sql/log_event.h

sql/mysqld.cc

sql/share/charsets/Index.xml

sql/spatial.cc

sql/spatial.h

sql/sql_prepare.cc

sql/sql_select.cc

sql/sql_show.cc

sql/sql_string.h

storage/federated/ha_federated.cc

storage/innobase/btr/btr0pcur.c

storage/innobase/handler/ha_innodb.cc

storage/innodb_plugin/ChangeLog

storage/innodb_plugin/btr/btr0btr.c

storage/innodb_plugin/btr/btr0cur.c

storage/innodb_plugin/btr/btr0pcur.c

storage/innodb_plugin/buf/buf0buf.c

storage/innodb_plugin/handler/ha_innodb.cc

storage/innodb_plugin/handler/i_s.cc

storage/innodb_plugin/handler/i_s.h

storage/innodb_plugin/ibuf/ibuf0ibuf.c

storage/innodb_plugin/include/buf0buf.h

storage/innodb_plugin/include/buf0buf.ic

storage/innodb_plugin/include/fil0fil.h

storage/innodb_plugin/include/log0log.h

storage/innodb_plugin/include/univ.i

storage/innodb_plugin/page/page0cur.c

storage/innodb_plugin/page/page0page.c

storage/innodb_plugin/row/row0ins.c

storage/innodb_plugin/row/row0merge.c

storage/innodb_plugin/scripts/install_innodb_plugins.sql

storage/innodb_plugin/scripts/install_innodb_plugins_win.sql

support-files/mysql.spec.sh

vio/viosslfactories.c

Show diffs side-by-side

added added

removed removed

Docs/INSTALL-BINARY

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

client/sql_string.h

extra/yassl/src/ssl.cpp

extra/yassl/taocrypt/src/Makefile.am

extra/yassl/taocrypt/src/crypto.cpp

include/welcome_copyright_notice.h

mysql-test/Makefile.am

mysql-test/r/openssl_1.result

mysql-test/r/subselect.result

mysql-test/suite/federated/federated_archive.test

mysql-test/suite/federated/federated_bug_13118.test

mysql-test/suite/federated/federated_bug_25714.test

mysql-test/suite/federated/federated_bug_32426.test

mysql-test/suite/federated/federated_bug_35333.test

mysql-test/suite/federated/federated_bug_585688.test

mysql-test/suite/federated/federated_debug.test

mysql-test/suite/federated/federated_innodb.test

mysql-test/suite/federated/federated_partition.test

mysql-test/suite/federated/federated_server.test

mysql-test/suite/federated/federated_transactions.test

mysql-test/suite/federated/federatedx.test

mysql-test/suite/federated/include/

mysql-test/suite/innodb/r/innodb_misc1.result

mysql-test/suite/innodb_plugin/r/innodb_information_schema_buffer.result

mysql-test/suite/innodb_plugin/t/innodb_information_schema_buffer.test

mysql-test/t/openssl_1.test

scripts/mysql_secure_installation.pl.in

scripts/mysql_secure_installation.sh

sql/filesort.cc

sql/gen_lex_hash.cc

sql/ha_partition.cc

sql/ha_partition.h

sql/item_strfunc.cc

sql/item_subselect.cc

sql/log_event.h

sql/sql_prepare.cc

sql/sql_select.cc

sql/sql_show.cc

sql/sql_string.h

storage/federated/ha_federated.cc

storage/innobase/btr/btr0pcur.c

storage/innobase/handler/ha_innodb.cc

storage/innodb_plugin/ChangeLog

storage/innodb_plugin/btr/btr0btr.c

storage/innodb_plugin/btr/btr0cur.c

storage/innodb_plugin/btr/btr0pcur.c

storage/innodb_plugin/buf/buf0buf.c

storage/innodb_plugin/handler/ha_innodb.cc

storage/innodb_plugin/handler/i_s.cc

storage/innodb_plugin/handler/i_s.h

storage/innodb_plugin/ibuf/ibuf0ibuf.c

storage/innodb_plugin/include/buf0buf.h

storage/innodb_plugin/include/buf0buf.ic

storage/innodb_plugin/include/fil0fil.h

storage/innodb_plugin/include/log0log.h

storage/innodb_plugin/include/univ.i

storage/innodb_plugin/page/page0cur.c

storage/innodb_plugin/page/page0page.c

storage/innodb_plugin/row/row0ins.c

storage/innodb_plugin/row/row0merge.c

storage/innodb_plugin/scripts/install_innodb_plugins.sql

storage/innodb_plugin/scripts/install_innodb_plugins_win.sql

support-files/mysql.spec.sh

vio/viosslfactories.c

Older »