3577 Nirbhay Choubey 2011-10-14 [merge]
Merge of changeset of WL#5945 from mysql-5.1.
added:
cmd-line-utils/libedit/chartype.c
cmd-line-utils/libedit/chartype.h
cmd-line-utils/libedit/eln.c
cmd-line-utils/libedit/historyn.c
cmd-line-utils/libedit/np/wcsdup.c
cmd-line-utils/libedit/tokenizern.c
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
modified:
cmd-line-utils/libedit/CMakeLists.txt
cmd-line-utils/libedit/README
cmd-line-utils/libedit/chared.c
cmd-line-utils/libedit/chared.h
cmd-line-utils/libedit/common.c
cmd-line-utils/libedit/config.h
cmd-line-utils/libedit/el.c
cmd-line-utils/libedit/el.h
cmd-line-utils/libedit/emacs.c
cmd-line-utils/libedit/filecomplete.c
cmd-line-utils/libedit/filecomplete.h
cmd-line-utils/libedit/hist.c
cmd-line-utils/libedit/hist.h
cmd-line-utils/libedit/histedit.h
cmd-line-utils/libedit/history.c
cmd-line-utils/libedit/makelist.sh
cmd-line-utils/libedit/map.c
cmd-line-utils/libedit/map.h
cmd-line-utils/libedit/np/strlcat.c
cmd-line-utils/libedit/np/strlcpy.c
cmd-line-utils/libedit/np/unvis.c
cmd-line-utils/libedit/np/vis.c
cmd-line-utils/libedit/np/vis.h
cmd-line-utils/libedit/parse.c
cmd-line-utils/libedit/parse.h
cmd-line-utils/libedit/prompt.c
cmd-line-utils/libedit/prompt.h
cmd-line-utils/libedit/read.c
cmd-line-utils/libedit/read.h
cmd-line-utils/libedit/readline.c
cmd-line-utils/libedit/readline/readline.h
cmd-line-utils/libedit/refresh.c
cmd-line-utils/libedit/refresh.h
cmd-line-utils/libedit/search.c
cmd-line-utils/libedit/search.h
cmd-line-utils/libedit/sig.c
cmd-line-utils/libedit/sig.h
cmd-line-utils/libedit/sys.h
cmd-line-utils/libedit/tokenizer.c
cmd-line-utils/libedit/tty.c
cmd-line-utils/libedit/tty.h
cmd-line-utils/libedit/vi.c
cmd-line-utils/libedit/el_terminal.h
cmd-line-utils/libedit/keymacro.c
cmd-line-utils/libedit/keymacro.h
cmd-line-utils/libedit/terminal.c
3576 Sergey Glukhov 2011-10-12 [merge]
automerge
modified:
storage/innobase/btr/btr0cur.c
storage/innobase/btr/btr0sea.c
storage/innobase/buf/buf0buf.c
storage/innobase/buf/buf0lru.c
storage/innobase/ha/ha0ha.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/ibuf/ibuf0ibuf.c
storage/innobase/include/btr0sea.h
storage/innobase/include/btr0types.h
storage/innobase/include/buf0buf.h
storage/innobase/include/ha0ha.h
storage/innobase/include/ha0ha.ic
storage/innobase/include/row0upd.ic
storage/innobase/include/sync0sync.h
storage/innobase/page/page0page.c
storage/innobase/sync/sync0sync.c
Diff too large for email (16934 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5 branch (nirbhay.choubey:3576 to 3577) WL#5945 | Nirbhay Choubey | 14 Oct |