diff options
author | unknown <monty@hundin.mysql.fi> | 2001-10-17 19:39:39 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-10-17 19:39:39 +0300 |
commit | aeaf3fcf1275c81578594149ffc7a1d6c45c3596 (patch) | |
tree | a99a119a594cef911c36b9e84ddb7975f5747e05 /readline/display.c | |
parent | 037c19e4ad2beccc0712ddb753ccf981ef58b457 (diff) | |
download | mariadb-git-aeaf3fcf1275c81578594149ffc7a1d6c45c3596.tar.gz |
Don't do signal() on windows (Causes instability problems)
Safer, a bit faster filesort.
Code changes to avoid calls to current_thd() (faster code).
Removed all compiler warnings from readline.
BitKeeper/etc/ignore:
Add my_global.h back.
Docs/manual.texi:
4.0.1 Changelog
include/my_sys.h:
Added strmake_root
libmysql/libmysql.c:
Don't do signal() on windows (Causes instability problems)
mysys/my_alloc.c:
Added strmake_root
readline/bind.c:
Remove warnings
readline/complete.c:
Remove warnings
readline/display.c:
Remove warnings
readline/funmap.c:
Remove warnings
readline/histexpand.c:
Remove warnings
readline/histfile.c:
Remove warnings
readline/history.h:
Remove warnings
readline/histsearch.c:
Remove warnings
readline/isearch.c:
Remove warnings
readline/kill.c:
Remove warnings
readline/macro.c:
Remove warnings
readline/readline.c:
Remove warnings
readline/readline.h:
Remove warnings
readline/rltty.c:
Remove warnings
readline/search.c:
Remove warnings
readline/shell.c:
Remove warnings
readline/terminal.c:
Remove warnings
readline/tilde.c:
Remove warnings
readline/tilde.h:
Remove warnings
readline/undo.c:
Remove warnings
readline/util.c:
Remove warnings
readline/vi_mode.c:
Remove warnings
sql-bench/server-cfg.sh:
Added use of truncate table
sql-bench/test-insert.sh:
Added use of truncate table
Changed some tests to use keys instead of 'range'
sql-bench/test-wisconsin.sh:
Cleanup
sql/field.cc:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/field.h:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/filesort.cc:
Safer memory allocation; Don't allocate pointer to buffers directly, but use an IO_CACHE instead.
This will allow us to use more memory for keys and will also work better if the number of rows that is to be sorted is much larger than expected.
sql/item.cc:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/item.h:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/item_func.h:
Cleanup
sql/opt_range.cc:
Use mem_root instead of sql_alloc() to get more speed
sql/sql_class.cc:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/sql_class.h:
Added strmake()
sql/sql_handler.cc:
Add 'thd' to send() (To avoid usage of 'current_thd')
sql/sql_lex.cc:
Use mem_root instead of sql_alloc() to get more speed
sql/sql_select.cc:
Add 'thd' to send() (To avoid usage of 'current_thd')
tests/fork2_test.pl:
Fixed typos
tests/fork_big.pl:
Fixed typos
tests/insert_and_repair.pl:
Fixed typos
tests/rename_test.pl:
Fixed typos
tests/test_delayed_insert.pl:
Fixed typos
Diffstat (limited to 'readline/display.c')
-rw-r--r-- | readline/display.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/readline/display.c b/readline/display.c index 25aba64ca67..004967c5dc5 100644 --- a/readline/display.c +++ b/readline/display.c @@ -79,9 +79,9 @@ extern int _rl_output_character_function (); #endif extern int _rl_backspace (); -extern char *term_clreol, *term_clrpag; -extern char *term_im, *term_ic, *term_ei, *term_DC; -extern char *term_up, *term_dc, *term_cr, *term_IC; +extern const char *term_clreol, *term_clrpag; +extern const char *term_im, *term_ic, *term_ei, *term_DC; +extern const char *term_up, *term_dc, *term_cr, *term_IC; extern int screenheight, screenwidth, screenchars; extern int terminal_can_insert, _rl_term_autowrap; @@ -141,7 +141,7 @@ int _rl_suppress_redisplay = 0; /* The stuff that gets printed out before the actual text of the line. This is usually pointing to rl_prompt. */ -char *rl_display_prompt = (char *)NULL; +const char *rl_display_prompt = (char *)NULL; /* Pseudo-global variables declared here. */ /* The visible cursor position. If you print some text, adjust this. */ @@ -315,7 +315,7 @@ rl_redisplay () register char *line; int c_pos, inv_botlin, lb_botlin, lb_linenum; int newlines, lpos, temp; - char *prompt_this_line; + const char *prompt_this_line; if (!readline_echoing_p) return; @@ -1229,8 +1229,7 @@ rl_message (va_alist) } #else /* !USE_VARARGS */ int -rl_message (format, arg1, arg2) - char *format; +rl_message (char *format, void *arg1, void *arg2) { sprintf (msg_buf, format, arg1, arg2); rl_display_prompt = msg_buf; @@ -1512,7 +1511,8 @@ cr () void _rl_redisplay_after_sigwinch () { - char *t, *oldp, *oldl, *oldlprefix; + char *t, *oldl, *oldlprefix; + const char *oldp; /* Clear the current line and put the cursor at column 0. Make sure the right thing happens if we have wrapped to a new screen line. */ |