Commit d278381e authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0


client/mysql.cc:
  Auto merged
heap/hp_delete.c:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
scripts/fill_func_tables.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/grant2.result:
  Manual merge
mysql-test/r/heap_btree.result:
  Manual merge
mysql-test/r/mysql_client.result:
  Manual merge
mysql-test/t/grant2.test:
  Manual merge
mysql-test/t/heap_btree.test:
  Manual merge
mysql-test/t/mysql_client.test:
  Manual merge
parents 51bb3b2a 842ec233

client/mysql.cc

+24 −15
Original line number Diff line number Diff line
@@ -577,13 +577,13 @@ static struct my_option my_long_options[] = 
  {"force", 'f', "Continue even if we get an sql error.",

   (gptr*) &ignore_errors, (gptr*) &ignore_errors, 0, GET_BOOL, NO_ARG, 0, 0,

   0, 0, 0, 0},

  {"no-named-commands", 'g',

   "Named commands are disabled. Use \\* form only, or use named commands only in the beginning of a line ending with a semicolon (;) Since version 10.9 the client now starts with this option ENABLED by default! Disable with '-G'. Long format commands still work from the first line. WARNING: option deprecated; use --disable-named-commands instead.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"named-commands", 'G',

   "Enable named commands. Named commands mean this program's internal commands; see mysql> help . When enabled, the named commands can be used from any line of the query, otherwise only from the first line, before an enter. Disable with --disable-named-commands. This option is disabled by default.",

   (gptr*) &named_cmds, (gptr*) &named_cmds, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,

   0, 0},

  {"no-named-commands", 'g',

   "Named commands are disabled. Use \\* form only, or use named commands only in the beginning of a line ending with a semicolon (;) Since version 10.9 the client now starts with this option ENABLED by default! Disable with '-G'. Long format commands still work from the first line. WARNING: option deprecated; use --disable-named-commands instead.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"ignore-spaces", 'i', "Ignore space after function names.", 0, 0, 0,

   GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"local-infile", OPT_LOCAL_INFILE, "Enable/disable LOAD DATA LOCAL INFILE.",
@@ -602,13 +602,6 @@ static struct my_option my_long_options[] = 
   NO_ARG, 1, 0, 0, 0, 0, 0},  

  {"skip-line-numbers", 'L', "Don't write line number for errors. WARNING: -L is deprecated, use long version of this option instead.", 0, 0, 0, GET_NO_ARG,

   NO_ARG, 0, 0, 0, 0, 0, 0},

#ifdef USE_POPEN

  {"no-pager", OPT_NOPAGER,

   "Disable pager and print to stdout. See interactive help (\\h) also. WARNING: option deprecated; use --disable-pager instead.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"no-tee", OPT_NOTEE, "Disable outfile. See interactive help (\\h) also. WARNING: option deprecated; use --disable-tee instead", 0, 0, 0, GET_NO_ARG,

   NO_ARG, 0, 0, 0, 0, 0, 0},

  {"unbuffered", 'n', "Flush buffer after each query.", (gptr*) &unbuffered,

   (gptr*) &unbuffered, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"column-names", OPT_COLUMN_NAMES, "Write column names in results.",
@@ -628,8 +621,11 @@ static struct my_option my_long_options[] = 
   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#ifdef USE_POPEN

  {"pager", OPT_PAGER,

   "Pager to use to display results. If you don't supply an option the default pager is taken from your ENV variable PAGER. Valid pagers are less, more, cat [> filename], etc. See interactive help (\\h) also. This option does not work in batch mode.",

   "Pager to use to display results. If you don't supply an option the default pager is taken from your ENV variable PAGER. Valid pagers are less, more, cat [> filename], etc. See interactive help (\\h) also. This option does not work in batch mode. Disable with --disable-pager. This option is disabled by default.",

   0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},

  {"no-pager", OPT_NOPAGER,

   "Disable pager and print to stdout. See interactive help (\\h) also. WARNING: option deprecated; use --disable-pager instead.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"password", 'p',

   "Password to use when connecting to server. If password is not given it's asked from the tty.",
@@ -670,8 +666,10 @@ static struct my_option my_long_options[] = 
  {"debug-info", 'T', "Print some debug info at exit.", (gptr*) &info_flag,

   (gptr*) &info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"tee", OPT_TEE,

   "Append everything into outfile. See interactive help (\\h) also. Does not work in batch mode.",

   "Append everything into outfile. See interactive help (\\h) also. Does not work in batch mode. Disable with --disable-tee. This option is disabled by default.",

   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"no-tee", OPT_NOTEE, "Disable outfile. See interactive help (\\h) also. WARNING: option deprecated; use --disable-tee instead", 0, 0, 0, GET_NO_ARG,

   NO_ARG, 0, 0, 0, 0, 0, 0},

#ifndef DONT_ALLOW_USER_CHANGE

  {"user", 'u', "User for login if not current user.", (gptr*) &current_user,

   (gptr*) &current_user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -1795,6 +1793,13 @@ static int com_server_help(String *buffer __attribute__((unused)), 
  

  if (help_arg[0] != '\'')

  {

	char *end_arg= strend(help_arg);

	if(--end_arg)

	{

		while (my_isspace(charset_info,*end_arg))

          end_arg--;

		*++end_arg= '\0';

	}

	(void) strxnmov(cmd_buf, sizeof(cmd_buf), "help '", help_arg, "'", NullS);

    server_cmd= cmd_buf;

  }
@@ -1881,9 +1886,13 @@ com_help(String *buffer __attribute__((unused)), 
{

  reg1 int i, j;

  char * help_arg= strchr(line,' '), buff[32], *end;



  if (help_arg)

    return com_server_help(buffer,line,help_arg+1);

  {

    while (my_isspace(charset_info,*help_arg))

      help_arg++;

	if (*help_arg)	  

	  return com_server_help(buffer,line,help_arg);

  }



  put_info("\nFor information about MySQL products and services, visit:\n"

           "   http://www.mysql.com/\n"

heap/hp_delete.c

+3 −0
Original line number Diff line number Diff line
@@ -73,7 +73,10 @@ int hp_rb_delete_key(HP_INFO *info, register HP_KEYDEF *keyinfo, 
  int res;



  if (flag) 

  {

    info->last_pos= NULL; /* For heap_rnext/heap_rprev */

    info->lastkey_len= 0;

  }



  custom_arg.keyseg= keyinfo->seg;

  custom_arg.key_length= hp_rb_make_key(keyinfo, info->recbuf, record, recpos);

mysql-test/r/bug20328.result

0 → 100644
+44 −0
Original line number Diff line number Diff line 
?         (\?) Synonym for `help'.

clear     (\c) Clear command.

connect   (\r) Reconnect to the server. Optional arguments are db and host.

delimiter (\d) Set query delimiter. 

edit      (\e) Edit command with $EDITOR.

ego       (\G) Send command to mysql server, display result vertically.

exit      (\q) Exit mysql. Same as quit.

go        (\g) Send command to mysql server.

help      (\h) Display this help.

nopager   (\n) Disable pager, print to stdout.

notee     (\t) Don't write into outfile.

pager     (\P) Set PAGER [to_pager]. Print the query results via PAGER.

print     (\p) Print current command.

prompt    (\R) Change your mysql prompt.

quit      (\q) Quit mysql.

rehash    (\#) Rebuild completion hash.

source    (\.) Execute an SQL script file. Takes a file name as an argument.

status    (\s) Get status information from the server.

system    (\!) Execute a system shell command.

tee       (\T) Set outfile [to_outfile]. Append everything into given outfile.

use       (\u) Use another database. Takes database name as argument.

charset_name(\C) Switch to another charset. Might be needed for processing binlog.

?         (\?) Synonym for `help'.

clear     (\c) Clear command.

connect   (\r) Reconnect to the server. Optional arguments are db and host.

delimiter (\d) Set query delimiter. 

edit      (\e) Edit command with $EDITOR.

ego       (\G) Send command to mysql server, display result vertically.

exit      (\q) Exit mysql. Same as quit.

go        (\g) Send command to mysql server.

help      (\h) Display this help.

nopager   (\n) Disable pager, print to stdout.

notee     (\t) Don't write into outfile.

pager     (\P) Set PAGER [to_pager]. Print the query results via PAGER.

print     (\p) Print current command.

prompt    (\R) Change your mysql prompt.

quit      (\q) Quit mysql.

rehash    (\#) Rebuild completion hash.

source    (\.) Execute an SQL script file. Takes a file name as an argument.

status    (\s) Get status information from the server.

system    (\!) Execute a system shell command.

tee       (\T) Set outfile [to_outfile]. Append everything into given outfile.

use       (\u) Use another database. Takes database name as argument.

charset_name(\C) Switch to another charset. Might be needed for processing binlog.

mysql-test/r/grant2.result

+10 −0
Original line number Diff line number Diff line
@@ -118,6 +118,16 @@ flush privileges; 
drop user mysqltest_3@host3;

drop user mysqltest_1@host1, mysqltest_2@host2, mysqltest_4@host4,

mysqltest_5@host5, mysqltest_6@host6, mysqltest_7@host7;

create database mysqltest_1;

grant select, insert, update on `mysqltest\_1`.* to mysqltest_1@localhost;

set sql_log_off = 1;

ERROR HY000: Access denied; you need the SUPER privilege for this operation

set sql_log_bin = 0;

ERROR HY000: Access denied; you need the SUPER privilege for this operation

delete from mysql.user where user like 'mysqltest\_1';

delete from mysql.db where user like 'mysqltest\_1';

drop database mysqltest_1;

flush privileges;

set sql_mode='maxdb';

drop table if exists t1, t2;

create table t1(c1 int);

mysql-test/r/heap_btree.result

+35 −0
Original line number Diff line number Diff line
@@ -246,6 +246,41 @@ DELETE from t1 where a < 100; 
SELECT * from t1;

a

DROP TABLE t1;

create table t1(a int not null, key using btree(a)) engine=heap;

insert into t1 values (2), (2), (2), (1), (1), (3), (3), (3), (3);

select a from t1 where a > 2;

a

3

3

3

3

delete from t1 where a < 4;

select a from t1;

a

insert into t1 values (2), (2), (2), (1), (1), (3), (3), (3), (3);

select a from t1 where a > 4;

a

delete from t1 where a > 4;

select a from t1;

a

3

3

1

3

3

1

2

2

2

select a from t1 where a > 3;

a

delete from t1 where a >= 2;

select a from t1;

a

1

1

drop table t1;

End of 4.1 tests

CREATE TABLE t1(val INT, KEY USING BTREE(val)) ENGINE=memory;

INSERT INTO t1 VALUES(0);

SELECT INDEX_LENGTH FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='t1';