1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

fix after merge of 5.0 into 5.1

sql/share/errmsg.txt:
  fix after merge
sql/sql_show.cc:
  fix after merge
This commit is contained in:
unknown
2005-11-18 21:34:54 +01:00
parent 41de6f9a7c
commit a06f394e68
2 changed files with 10 additions and 8 deletions

View File

@@ -82,12 +82,12 @@ bool mysqld_show_storage_engines(THD *thd)
option_name= "DEFAULT";
protocol->store(option_name, system_charset_info);
protocol->store((*types)->comment, system_charset_info);
protocol->store((*types)->commit ? "YES" : "NO", system_charset_info);
protocol->store((*types)->prepare ? "YES" : "NO", system_charset_info);
protocol->store((*types)->savepoint_set ? "YES" : "NO", system_charset_info);
if (protocol->write())
DBUG_RETURN(TRUE);
}
move protocol->store((*types)->commit ? "YES" : "NO", system_charset_info);
move protocol->store((*types)->prepare ? "YES" : "NO", system_charset_info);
move protocol->store((*types)->savepoint_set ? "YES" : "NO", system_charset_info);
}
send_eof(thd);
DBUG_RETURN(FALSE);