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

manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)

Browse Source 
CONFLICTS
=========

Text conflict in sql/sql_yacc.yy
1 conflicts encountered.
This commit is contained in:
Luis Soares
2009-11-13 10:17:53 +00:00
parent 0d46e5880e 7cf9ee96ae
commit d8ca6b9dd9
81 changed files with 267 additions and 2351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/t/warnings.test
View File

@@ -111,11 +111,6 @@ show variables like 'max_error_count';
drop table t1;
#
# Test for deprecated table_type variable
#
set table_type=MYISAM;
#
# Tests for show warnings limit a, b
#