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/terminal.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/terminal.c')
-rw-r--r-- | readline/terminal.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/readline/terminal.c b/readline/terminal.c index 6e94bdc4011..1d2fead7768 100644 --- a/readline/terminal.c +++ b/readline/terminal.c @@ -99,8 +99,8 @@ char PC, *BC, *UP; #endif /* __linux__ */ /* Some strings to control terminal actions. These are output by tputs (). */ -char *term_goto, *term_clreol, *term_cr, *term_clrpag, *term_backspace; -char *term_pc; +char *term_goto, *term_clreol, *term_clrpag, *term_backspace; +char *term_cr, *term_pc; /* Non-zero if we determine that the terminal can do character insertion. */ int terminal_can_insert = 0; @@ -245,8 +245,8 @@ rl_resize_terminal () } struct _tc_string { - char *tc_var; - char **tc_value; + const char *tc_var; + char **tc_value; }; /* This should be kept sorted, just in case we decide to change the @@ -291,7 +291,7 @@ get_term_capabilities (bp) { register int i; - for (i = 0; i < NUM_TC_STRINGS; i++) + for (i = 0; i < (int) NUM_TC_STRINGS; i++) *(tc_strings[i].tc_value) = tgetstr (tc_strings[i].tc_var, bp); tcap_initialized = 1; } @@ -304,7 +304,7 @@ _rl_init_terminal_io (terminal_name) screenwidth = ScreenCols (); screenheight = ScreenRows (); screenchars = screenwidth * screenheight; - term_cr = "\r"; + term_cr = (char*) "\r"; term_im = term_ei = term_ic = term_IC = (char *)NULL; term_up = term_dc = term_DC = visible_bell = (char *)NULL; @@ -322,7 +322,8 @@ _rl_init_terminal_io (terminal_name) return; #else /* !__GO32__ */ - char *term, *buffer; + const char *term; + char *buffer; int tty; Keymap xkeymap; @@ -347,7 +348,7 @@ _rl_init_terminal_io (terminal_name) screenwidth = 79; screenheight = 24; screenchars = 79 * 24; - term_cr = "\r"; + term_cr = (char*) "\r"; term_im = term_ei = term_ic = term_IC = (char *)NULL; term_up = term_dc = term_DC = visible_bell = (char *)NULL; term_ku = term_kd = term_kl = term_kr = (char *)NULL; @@ -367,7 +368,7 @@ _rl_init_terminal_io (terminal_name) UP = term_up; if (!term_cr) - term_cr = "\r"; + term_cr = (char*) "\r"; tty = rl_instream ? fileno (rl_instream) : 0; @@ -427,7 +428,7 @@ rl_get_termcap (cap) if (tcap_initialized == 0) return ((char *)NULL); - for (i = 0; i < NUM_TC_STRINGS; i++) + for (i = 0; i < (int) NUM_TC_STRINGS; i++) { if (tc_strings[i].tc_var[0] == cap[0] && strcmp (tc_strings[i].tc_var, cap) == 0) return *(tc_strings[i].tc_value); |