1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Fix merge problems and re-record output for legitimate changes.

This commit is contained in:
cmiller@zippy.cornsilk.net
2008-05-16 11:35:15 -04:00
parent b59575830a
commit 1e5fc1089f
5 changed files with 89 additions and 46 deletions

View File

@ -303,6 +303,8 @@ SET @@session.sql_mode=0/*!*/;
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
/*!\C latin1 *//*!*/;
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
SET @@session.lc_time_names=0/*!*/;
SET @@session.collation_database=DEFAULT/*!*/;
CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`()
begin
select 1;