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

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1

Browse Source 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


mysql-test/include/commit.inc:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/commit_1innodb.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2008-03-14 18:32:01 +01:00
parent 0b7d39fd5f 269ebe5421
commit 774d21cf3b
121 changed files with 2060 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/commit_1innodb.result
View File

@ -879,6 +879,6 @@ SUCCESS
#
# Cleanup
#
drop table t1;
drop table t1, t2, t3;
drop procedure p_verify_status_increment;
drop function f1;