lp:~stewart/percona-server/5.1.67
Created by
Stewart Smith
and last modified
- Get this branch:
- bzr branch lp:~stewart/percona-server/5.1.67
Only
Stewart Smith
can upload to this branch. If you are
Stewart Smith
please log in for upload directions.
Branch merges
Propose for merging
- Laurynas Biveinis (community): Approve
-
Diff: 3724 lines (+1320/-575)69 files modifiedPercona-Server/client/mysql.cc (+89/-2)
Percona-Server/configure.in (+1/-1)
Percona-Server/libmysql/libmysql.c (+1/-1)
Percona-Server/mysql-test/r/ctype_ucs.result (+26/-0)
Percona-Server/mysql-test/r/loaddata.result (+0/-29)
Percona-Server/mysql-test/r/sp_notembedded.result (+1/-1)
Percona-Server/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test (+1/-1)
Percona-Server/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test (+1/-1)
Percona-Server/mysql-test/suite/innodb/r/innodb_bug14704286.result (+53/-0)
Percona-Server/mysql-test/suite/innodb/t/innodb_bug14704286.test (+95/-0)
Percona-Server/mysql-test/t/ctype_ucs.test (+32/-0)
Percona-Server/mysql-test/t/loaddata.test (+34/-30)
Percona-Server/mysql-test/t/sp_notembedded.test (+10/-10)
Percona-Server/scripts/mysql_install_db.pl.in (+18/-3)
Percona-Server/scripts/mysqld_multi.sh (+22/-0)
Percona-Server/scripts/mysqld_safe.sh (+34/-1)
Percona-Server/sql/hostname.cc (+9/-0)
Percona-Server/sql/item_cmpfunc.cc (+20/-1)
Percona-Server/sql/item_func.cc (+2/-1)
Percona-Server/sql/item_func.h (+1/-0)
Percona-Server/sql/log.cc (+6/-0)
Percona-Server/sql/log_event.cc (+55/-4)
Percona-Server/sql/log_event.h (+3/-3)
Percona-Server/sql/mysql_priv.h (+35/-0)
Percona-Server/sql/mysqld.cc (+1/-1)
Percona-Server/sql/sp_head.cc (+27/-21)
Percona-Server/sql/sql_acl.cc (+169/-93)
Percona-Server/sql/sql_connect.cc (+60/-8)
Percona-Server/sql/sql_lex.cc (+1/-0)
Percona-Server/sql/sql_list.h (+9/-2)
Percona-Server/sql/sql_profile.cc (+19/-10)
Percona-Server/sql/sql_profile.h (+4/-2)
Percona-Server/sql/sql_select.cc (+13/-13)
Percona-Server/storage/innobase/btr/btr0cur.c (+6/-5)
Percona-Server/storage/innobase/dict/dict0dict.c (+15/-3)
Percona-Server/storage/innobase/handler/ha_innodb.cc (+2/-2)
Percona-Server/storage/innobase/ibuf/ibuf0ibuf.c (+25/-3)
Percona-Server/storage/innobase/include/btr0cur.h (+5/-4)
Percona-Server/storage/innobase/include/dict0mem.h (+6/-1)
Percona-Server/storage/innobase/include/row0undo.h (+2/-7)
Percona-Server/storage/innobase/os/os0file.c (+15/-0)
Percona-Server/storage/innobase/row/row0sel.c (+17/-8)
Percona-Server/storage/innobase/row/row0umod.c (+0/-54)
Percona-Server/storage/innobase/row/row0undo.c (+0/-19)
Percona-Server/storage/innodb_plugin/ChangeLog (+37/-0)
Percona-Server/storage/innodb_plugin/btr/btr0btr.c (+17/-15)
Percona-Server/storage/innodb_plugin/btr/btr0cur.c (+22/-18)
Percona-Server/storage/innodb_plugin/buf/buf0buf.c (+4/-3)
Percona-Server/storage/innodb_plugin/buf/buf0lru.c (+3/-1)
Percona-Server/storage/innodb_plugin/dict/dict0dict.c (+60/-31)
Percona-Server/storage/innodb_plugin/handler/ha_innodb.cc (+2/-2)
Percona-Server/storage/innodb_plugin/handler/handler0alter.cc (+6/-2)
Percona-Server/storage/innodb_plugin/ibuf/ibuf0ibuf.c (+26/-3)
Percona-Server/storage/innodb_plugin/include/btr0cur.h (+6/-5)
Percona-Server/storage/innodb_plugin/include/dict0dict.h (+12/-0)
Percona-Server/storage/innodb_plugin/include/dict0mem.h (+6/-1)
Percona-Server/storage/innodb_plugin/include/page0zip.h (+5/-3)
Percona-Server/storage/innodb_plugin/include/row0undo.h (+0/-7)
Percona-Server/storage/innodb_plugin/log/log0recv.c (+2/-3)
Percona-Server/storage/innodb_plugin/os/os0file.c (+15/-0)
Percona-Server/storage/innodb_plugin/page/page0cur.c (+3/-3)
Percona-Server/storage/innodb_plugin/page/page0page.c (+8/-6)
Percona-Server/storage/innodb_plugin/page/page0zip.c (+111/-46)
Percona-Server/storage/innodb_plugin/row/row0mysql.c (+4/-1)
Percona-Server/storage/innodb_plugin/row/row0sel.c (+17/-7)
Percona-Server/storage/innodb_plugin/row/row0umod.c (+0/-53)
Percona-Server/storage/innodb_plugin/row/row0undo.c (+0/-19)
Percona-Server/storage/myisam/myisamchk.c (+8/-1)
Percona-Server/tests/mysql_client_test.c (+1/-0)
Branch information
- Owner:
- Stewart Smith
- Status:
- Merged
Recent revisions
- 502. By Stewart Smith
-
merge MySQL 5.1.57. One small manual fix in Percona-
Server/ sql/log_ event.cc but apart from that, auto merge - 499. By Stewart Smith
-
merge latest PS 5.1 trunk, which includes fix for lp:~vlad-lesin/percona-server/5.1-bug1049871-injections-gca
- 496. By Ignacio Nin
-
Enable SSL support without YaSSL
In the fix for bug lp:1028240, --with yassl was removed from the RPM
builder script. Internal logic inside percona-server.spec led to having
the server built without SSL support at all (--without-ssl) instead of
having it built with the libcrypto functions.This fix ensures that the server is built --with-ssl.
- 493. By Stewart Smith
-
Fix up locking in new InnoDB I_S tables. (I do this in a separate commit to 5.1.66 merge to make it easier to merge up to 5.5
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:percona-server/5.5