Commit 12eb42ac authored by unknown's avatar unknown
Browse files

Merge updates. 


mysql-test/r/grant2.result:
  Merge update:  Change between versions, it appears.
mysql-test/r/heap_btree.result:
  Merge update:  Add deterministic ordering of data, as the order is different 
  between versions.
mysql-test/r/mysql_client.result:
  Merge update: Help options changed between versions.
mysql-test/t/heap_btree.test:
  Merge update:  Add deterministic ordering of data, as the order is different 
  between versions.
BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
  Delete: mysql-test/t/bug20328.test
BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
  Delete: mysql-test/r/bug20328.result
parent 78c9885f

mysql-test/r/bug20328.result

deleted100644 → 0
+0 −44
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

+2 −2
Original line number Diff line number Diff line
@@ -121,9 +121,9 @@ 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

ERROR 42000: 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

ERROR 42000: 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;

mysql-test/r/heap_btree.result

+10 −10
Original line number Diff line number Diff line
@@ -248,34 +248,34 @@ 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;

select a from t1 where a > 2 order by a;

a

3

3

3

3

delete from t1 where a < 4;

select a from t1;

select a from t1 order by a;

a

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

select a from t1 where a > 4;

select a from t1 where a > 4 order by a;

a

delete from t1 where a > 4;

select a from t1;

select a from t1 order by a;

a

3

3

1

3

3

1

2

2

2

select a from t1 where a > 3;

3

3

3

3

select a from t1 where a > 3 order by a;

a

delete from t1 where a >= 2;

select a from t1;

select a from t1 order by a;

a

1

1

mysql-test/r/mysql_client.result

+8 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ ERROR at line 1: USE must be followed by a database name 
?         (\?) Synonym for `help'.

clear     (\c) Clear command.

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

delimiter (\d) Set query delimiter. 

delimiter (\d) Set statement delimiter. NOTE: Takes the rest of the line as new delimiter.

edit      (\e) Edit command with $EDITOR.

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

exit      (\q) Exit mysql. Same as quit.
@@ -23,11 +23,13 @@ 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.

charset   (\C) Switch to another charset. Might be needed for processing binlog with multi-byte charsets.

warnings  (\W) Show warnings after every statement.

nowarning (\w) Don't show warnings after every statement.

?         (\?) Synonym for `help'.

clear     (\c) Clear command.

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

delimiter (\d) Set query delimiter. 

delimiter (\d) Set statement delimiter. NOTE: Takes the rest of the line as new delimiter.

edit      (\e) Edit command with $EDITOR.

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

exit      (\q) Exit mysql. Same as quit.
@@ -45,7 +47,9 @@ 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.

charset   (\C) Switch to another charset. Might be needed for processing binlog with multi-byte charsets.

warnings  (\W) Show warnings after every statement.

nowarning (\w) Don't show warnings after every statement.

\

\\

';

mysql-test/t/bug20328.test

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
# This test should work in embedded server after we fix mysqltest

-- source include/not_embedded.inc



#

# Bug #20328: mysql client interprets commands in comments

#

--exec echo 'help' | $MYSQL

--exec echo 'help ' | $MYSQL