mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-03 05:35:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Changed safe_mysqld -> mysqld_safe

Browse source 
Added some alias to SHOW commands
Prepare for dynamic changing of MySQL variables


man/Makefile.am:
  Changed safe_mysqld -> mysqld_safe
man/isamchk.1:
  Changed safe_mysqld -> mysqld_safe
man/isamlog.1:
  Changed safe_mysqld -> mysqld_safe
man/mysql.1:
  Changed safe_mysqld -> mysqld_safe
man/mysql_zap.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqlaccess.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqladmin.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqld.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqld_multi.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqld_safe.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqldump.1:
  Changed safe_mysqld -> mysqld_safe
man/mysqlshow.1:
  Changed safe_mysqld -> mysqld_safe
man/perror.1:
  Changed safe_mysqld -> mysqld_safe
man/replace.1:
  Changed safe_mysqld -> mysqld_safe
man/which.2:
  Changed safe_mysqld -> mysqld_safe
myisam/mi_search.c:
  Fixed bug when using packed keys.
scripts/Makefile.am:
  Changed safe_mysqld -> mysqld_safe
scripts/make_binary_distribution.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysql_install_db.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysqld_multi.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysqld_safe-watch.sh:
  Changed safe_mysqld -> mysqld_safe
scripts/mysqld_safe.sh:
  Changed safe_mysqld -> mysqld_safe
sql/lex.h:
  Addex SHOW INDEXES as an alias for SHOW INDEX
sql/sql_class.cc:
  Prepare for dynamic changing of MySQL variables
sql/sql_lex.h:
  Prepare for dynamic changing of MySQL variables
sql/sql_yacc.yy:
  Some changes to SHOW commands.
support-files/binary-configure.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql-max.spec.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql-multi.server.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql.server.sh:
  Changed safe_mysqld -> mysqld_safe
support-files/mysql.spec.sh:
  Changed safe_mysqld -> mysqld_safe
This commit is contained in:
unknown 2001-06-28 10:49:16 +03:00
commit 833f353e34
31 changed files with 109 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

37
sql/sql_yacc.yy
View file

@ -197,6 +197,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
%token IDENT
%token IGNORE_SYM
%token INDEX
%token INDEXES
%token INFILE
%token INNER_SYM
%token INNOBASE_SYM
@ -1047,6 +1048,7 @@ key_or_index:
keys_or_index:
KEYS {}
| INDEX {}
| INDEXES {}
opt_unique_or_fulltext:
/* empty */ { $$= Key::MULTIPLE; }
@ -2392,7 +2394,7 @@ show_param:
lex->select->db= $3;
lex->select->options=0;
}
| opt_full COLUMNS FROM table_ident opt_db wild
| opt_full COLUMNS from_or_in table_ident opt_db wild
{
Lex->sql_command= SQLCOM_SHOW_FIELDS;
if ($5)
@ -2452,7 +2454,7 @@ show_param:
opt_db:
/* empty */ { $$= 0; }
| FROM ident { $$= $2.str; }
| from_or_in ident { $$= $2.str; }
wild:
/* empty */
@ -2462,6 +2464,10 @@ opt_full:
/* empty */ { Lex->verbose=0; }
| FULL { Lex->verbose=1; }
from_or_in:
FROM
| IN_SYM
binlog_in:
/* empty */ { Lex->mi.log_file_name = 0; }
| IN_SYM TEXT_STRING { Lex->mi.log_file_name = $2.str; }
@ -2818,6 +2824,7 @@ keyword:
| HOSTS_SYM {}
| HOUR_SYM {}
| IDENTIFIED_SYM {}
| INDEXES {}
| ISOLATION {}
| ISAM_SYM {}
| INNOBASE_SYM {}
@ -2901,6 +2908,8 @@ set:
lex->select->select_limit=lex->thd->default_select_limit;
lex->gemini_spin_retries=lex->thd->gemini_spin_retries;
lex->tx_isolation=lex->thd->tx_isolation;
lex->option_type=0;
lex->option_list.empty()
}
option_value_list
@ -2910,6 +2919,8 @@ opt_option:
option_value_list:
option_value
| GLOBAL_SYM { Lex->option_type=1; } option_value
| LOCAL_SYM { Lex->option_type=0; } option_value
| option_value_list ',' option_value
option_value:
@ -3017,6 +3028,28 @@ option_value:
slave_skip_counter = $3;
pthread_mutex_unlock(&LOCK_slave);
}
| ident equal DEFAULT
{
LEX *lex=Lex;
lex->option_list.push_back(new Set_option(lex->option_type,
$1.str,$1.length,
(Item*) 0));
}
| ident equal expr
{
THD *thd=current_thd;
Item *item= $3;
if (item->fix_fields(current_thd,0))
{
send_error(&thd->net, ER_SET_CONSTANTS_ONLY);
YYABORT;
}
thd->lex.option_list.
push_back(new Set_option(thd->lex.option_type,
$1.str,$1.length,
item));
}
text_or_password:
TEXT_STRING { $$=$1.str;}