1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

post-merge fix

Browse Source
This commit is contained in:
unknown 2004-10-28 14:02:09 +03:00
parent 46ce3d0092
commit 17cf3c633e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmysqld/lib_sql.cc
View File

@ -664,7 +664,7 @@ bool Protocol::send_fields(List<Item> *list, int flags)
DBUG_RETURN(prepare_for_send(list)); DBUG_RETURN(prepare_for_send(list));
err: err:
send_error(thd, ER_OUT_OF_RESOURCES); /* purecov: inspected */ my_error(ER_OUT_OF_RESOURCES, MYF(0)); /* purecov: inspected */
DBUG_RETURN(1); /* purecov: inspected */ DBUG_RETURN(1); /* purecov: inspected */
} }

2
mysql-test/t/connect.test
View File

@ -49,7 +49,7 @@ flush privileges;
#show tables; #show tables;
connect (con1,localhost,test,gambling2,mysql); connect (con1,localhost,test,gambling2,mysql);
set password=""; set password="";
--error 1371 --error 1372
set password='gambling3'; set password='gambling3';
set password=old_password('gambling3'); set password=old_password('gambling3');
show tables; show tables;

6
mysql-test/t/rpl_charset.test
View File

@ -112,10 +112,10 @@ sync_slave_with_master;
# Check that we can't change global.collation_server # Check that we can't change global.collation_server
error 1386; error 1387;
set global character_set_server=latin2; set global character_set_server=latin2;
connection master; connection master;
error 1386; error 1387;
set global character_set_server=latin2; set global character_set_server=latin2;
# Check that SET ONE_SHOT is really one shot # Check that SET ONE_SHOT is really one shot
@ -129,7 +129,7 @@ select @@character_set_server;
select @@character_set_server; select @@character_set_server;
# ONE_SHOT on not charset/collation stuff is not allowed # ONE_SHOT on not charset/collation stuff is not allowed
error 1381; error 1382;
set one_shot max_join_size=10; set one_shot max_join_size=10;
# Test of wrong character set numbers; # Test of wrong character set numbers;

2
mysql-test/t/rpl_timezone.test
View File

@ -76,7 +76,7 @@ select * from t2;
# replication # replication
# #
connection master; connection master;
--error 1386 --error 1387
set global time_zone='MET'; set global time_zone='MET';
# Clean up # Clean up