mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-22 16:25:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, mysys/mf_keycache.c, mysql-test/t/*myisam*

Browse source 
since previous merge. MARIA_PAGECACHE_READS in maria-preload.test are down a little bit (5%), which must be a good
side-effect of some sql/ change.
This commit is contained in:
Guilhem Bichot 2008-12-10 10:02:25 +01:00
commit 926aaf4635
608 changed files with 210493 additions and 6031 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/sql_repl.cc
View file

@ -1522,7 +1522,7 @@ bool show_binlogs(THD* thd)
if (!mysql_bin_log.is_open())
{
my_message(ER_NO_BINARY_LOGGING, ER(ER_NO_BINARY_LOGGING), MYF(0));
return 1;
DBUG_RETURN(TRUE);
}
field_list.push_back(new Item_empty_string("Log_name", 255));