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 | 381708129e50bedf90c9f4b98d58d0802eca3123 (patch) | |
tree | a99a119a594cef911c36b9e84ddb7975f5747e05 /readline/macro.c | |
parent | 5d85d1eb0c5e469986448e71271ed2ace42f6c9c (diff) | |
download | mariadb-git-381708129e50bedf90c9f4b98d58d0802eca3123.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/macro.c')
-rw-r--r-- | readline/macro.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/readline/macro.c b/readline/macro.c index f3c442b41c3..b4d7835c631 100644 --- a/readline/macro.c +++ b/readline/macro.c @@ -90,7 +90,7 @@ static int current_macro_index; It is a linked list of string/index for each saved macro. */ struct saved_macro { struct saved_macro *next; - char *string; + const char *string; int sindex; }; @@ -100,11 +100,10 @@ static struct saved_macro *macro_list = (struct saved_macro *)NULL; /* Set up to read subsequent input from STRING. STRING is free ()'ed when we are done with it. */ void -_rl_with_macro_input (string) - char *string; +_rl_with_macro_input (const char *string) { _rl_push_executing_macro (); - _rl_executing_macro = string; + _rl_executing_macro = (char*) string; executing_macro_index = 0; } @@ -155,7 +154,7 @@ _rl_pop_executing_macro () if (macro_list) { macro = macro_list; - _rl_executing_macro = macro_list->string; + _rl_executing_macro = (char*) macro_list->string; executing_macro_index = macro_list->sindex; macro_list = macro_list->next; free (macro); @@ -206,8 +205,8 @@ _rl_kill_kbd_macro () definition to the end of the existing macro, and start by re-executing the existing macro. */ int -rl_start_kbd_macro (ignore1, ignore2) - int ignore1, ignore2; +rl_start_kbd_macro (int count __attribute__((unused)), + int key __attribute__((unused))) { if (_rl_defining_kbd_macro) { @@ -231,8 +230,7 @@ rl_start_kbd_macro (ignore1, ignore2) A numeric argument says to execute the macro right now, that many times, counting the definition as the first time. */ int -rl_end_kbd_macro (count, ignore) - int count, ignore; +rl_end_kbd_macro (int count, int ignore __attribute__((unused))) { if (_rl_defining_kbd_macro == 0) { @@ -251,8 +249,7 @@ rl_end_kbd_macro (count, ignore) /* Execute the most recently defined keyboard macro. COUNT says how many times to execute it. */ int -rl_call_last_kbd_macro (count, ignore) - int count, ignore; +rl_call_last_kbd_macro (int count, int key __attribute__((unused))) { if (current_macro == 0) _rl_abort_internal (); |