diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 15:08:56 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 15:08:56 +0100 |
| commit | 704b4845aa9ce51a6c5a9f5f42265e376db0dfb3 (patch) | |
| tree | 73476f970c229f75846855edeeddfbc6fd87ed4b /.bzrignore | |
| parent | 2637dda66845868fe996e60e54996acf03f6c537 (diff) | |
| parent | a5e5b0180a6b86cce258eef232ef59d6e7c40bb0 (diff) | |
| download | mariadb-git-704b4845aa9ce51a6c5a9f5f42265e376db0dfb3.tar.gz | |
merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.
There were so many changes into mtr (this is the new mtr coming) that I rather
copied mtr from 6.0-main here (at least this one knows how to run Maria tests).
I also fixed suite/maria tests to be accepted by the new mtr.
mysys/thr_mutex.c:
adding DBUG_PRINT here, so that we can locate where the warning is issued.
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index a7166d4551f..d22056caf01 100644 --- a/.bzrignore +++ b/.bzrignore @@ -748,6 +748,7 @@ mysql-test/.DS_Store mysql-test/funcs_1.log mysql-test/funcs_1.tar mysql-test/install_test_db +mysql-test/lib/My/SafeProcess/my_safe_process mysql-test/lib/init_db.sql mysql-test/linux_sys_vars.inc mysql-test/load_sysvars.inc @@ -1221,9 +1222,12 @@ sql/*.ds? sql/*.vcproj sql/.gdbinit sql/client.c +sql/Doxyfile sql/f.c sql/gen_lex_hash sql/handlerton.cc +sql/html +sql/latex sql/lex_hash.h sql/link_sources sql/max/* |