Viewing all changes in revision 2643.127.51.
- Committer: Michael Widenius
- Date: 2011-11-23 17:32:14 UTC
- mfrom: (2502.1137.92 mysql-5.1)
- mto: (3042.1.1 maria-5.2) (2643.137.1 maria-5.1-org) (3098.1.1 5.2) (3106.1.1 maria-5.2)
- mto: This revision was merged to the branch mainline in revision 3051.
- Revision ID: monty@askmonty.org-20111123173214-0j4yenhaenjlpsm7
Merge with MySQL 5.1.60
- files added:
- cmd-line-utils/libedit/chartype.c
- files removed:
- mysql-test/t/innodb_bug47167.test
- files renamed:
- cmd-line-utils/libedit/el_term.h => cmd-line-utils/libedit/el_terminal.h
- cmd-line-utils/libedit/key.c => cmd-line-utils/libedit/keymacro.c
- cmd-line-utils/libedit/key.h => cmd-line-utils/libedit/keymacro.h
- cmd-line-utils/libedit/term.c => cmd-line-utils/libedit/terminal.c
- files modified:
- client/mysql.cc
expand all
collapse all
added
removed
