mysql-test/t/warnings.test · cfbbd76d4a81ade252550ac2d06834734205e741 · nexedi / MariaDB · GitLab

Find file Blame History Permalink

manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) · 1a6ecf2d
Luis Soares authored Nov 13, 2009
```
CONFLICTS
=========

Text conflict in sql/sql_yacc.yy
1 conflicts encountered. 
```
1a6ecf2d

warnings.test 5.02 KB