summaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2020-10-281-0/+1
|\
| * .gitignoreSergei Golubchik2020-10-231-0/+1
| |
* | Merge 10.2 into 10.3Marko Mäkelä2020-01-311-0/+2
|\ \ | |/
| * Merge 10.1 into 10.2Marko Mäkelä2020-01-311-0/+2
| |\
| | * Ingore sysusers and tmpfiles artifactsVicențiu Ciorbaru2020-01-281-0/+2
| | |
| * | Fixed dependency checking in some Galera testsJulius Goryavsky2019-07-181-0/+1
| | |
* | | wsrep_check_version binary is added to .gitignoreJulius Goryavsky2019-07-181-0/+1
| | |
* | | Ignore VScode workspaceAnel Husakovic2019-03-131-0/+3
| | |
* | | Merge 10.2 into 10.3Marko Mäkelä2019-03-041-1/+1
|\ \ \ | |/ /
| * | .gitignoreSergei Golubchik2019-03-011-1/+2
| | |
* | | Added generated wsrep_xxx files to .gitignoreMonty2019-02-061-0/+2
| | |
* | | Make the PYTHON_SHEBANG value configurableSergei Golubchik2019-01-251-0/+1
| | | | | | | | | | | | | | | | | | and gitignore myrocks_hotbackup (as it's now generated) Closes #1081
* | | DEV-17835: Remove wsrep-sst-method=xtrabackupJulius Goryavsky2018-12-171-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of the xtrabackup and xtrabackup-v2 methods for SST has been declared obsolete since version 10.2, now it cannot be used because of the different redo log format. Accordingly, we need to remove the xtrabackup-related scripts and dynamically replace the call to xtrabackup[-v2] to the mariabackup (with a corresponding warning in the log) when the server performs SST. https://jira.mariadb.org/browse/MDEV-17835
* | | Merge 10.2 into 10.3Marko Mäkelä2018-11-061-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | main.derived_cond_pushdown: Move all 10.3 tests to the end, trim trailing white space, and add an "End of 10.3 tests" marker. Add --sorted_result to tests where the ordering is not deterministic. main.win_percentile: Add --sorted_result to tests where the ordering is no longer deterministic.
| * | Merge 10.1 into 10.2Marko Mäkelä2018-11-061-0/+1
| |\ \ | | |/
| | * Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-0/+1
| | |\
| | | * Merge branch '5.5' into 10.0Sergei Golubchik2018-10-271-0/+2
| | | |\
| | | | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-10-231-0/+1
| | | | |\
| | | | | * Create .gitignore as a copy of .bzrignoreJon Olav Hauglid2014-10-061-0/+3071
| | | | |
* | | | | MDEV-16662 CMake warnings: CMP0026Sergei Golubchik2018-08-121-1/+0
| | | | |
* | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-06-301-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-0/+7
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-0/+1
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-0/+1
| | | |\ \ \
| | | | * | | MDEV-11036 Add link wsrep_sst_rsync_wan -> wsrep_sst_rsyncbb-sachin-11036Sachin Setiya2017-06-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently galera has capability of using delta transfer algorithm (rsync) for SST. But for using delta transfer we have change/copy wsrep_sst_rsync wsrep_sst_rsync_wan. This patch creates a symbolic link of wsrep_sst_rsync_wan to wsrep_sst_rsync.
| | * | | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2018-06-121-0/+6
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2018-06-101-0/+6
| | | |\ \ \ \ | | | | |/ / / | | | |/| | / | | | | | |/ | | | | |/|
| | | | * | Also ignore macOS .DS_Store Finder junk.Teodor Mircea Ionita2018-06-101-0/+3
| | | | | |
| | | | * | Ignore .cbp QtCreator && CodeBlocks project filesTeodor Mircea Ionita2018-06-101-0/+3
| | | | |/
| | | * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-1/+1
| | | |\ \ | | | | |/
| | | | * MDEV-12074 selinux build failure on Fedora 24Sergei Golubchik2017-02-271-1/+1
| | | | |
* | | | | .gitignoreSergei Golubchik2018-06-161-2/+2
| | | | | | | | | | | | | | | | | | | | after 4461b0f9b30
* | | | | Merge branch 'github/10.2' into 10.3Sergei Golubchik2018-05-221-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | .gitignoreSergei Golubchik2018-05-201-0/+2
| | | | |
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-041-0/+1
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2018-01-011-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/make_dist.cmake.in mysql-test/r/func_json.result mysql-test/r/ps.result mysql-test/t/func_json.test mysql-test/t/ps.test sql/item_cmpfunc.h
| | * | | | Ignore generated file rdb_source_revision.hMonty2018-01-011-0/+1
| | | | | |
* | | | | | Misc: updated .gitignoreAleksey Midenkov2017-12-151-0/+8
|/ / / / /
* | | | | ignore generated fileSergei Golubchik2017-09-231-0/+1
| | | | |
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-191-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | update .gitignoreAlexander Kuleshov2017-07-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during build on 10.2 following files are generated: * scripts/galera_new_cluster * scripts/galera_recovery * support-files/mariadb.service * support-files/mariadb.pp and they are untracked for git. Let's add them to .gitignore
* | | | | Merge tag 'mariadb-10.2.6' into bb-10.2-extAlexander Barkov2017-05-261-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-061-0/+7
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | Also, include fixes by Vladislav Vaintroub to the aws_key_management plugin. The AWS C++ SDK specifically depends on OPENSSL_LIBRARIES, not generic SSL_LIBRARIES (such as YaSSL).
| | * | | .gitignore mariabackupSergei Golubchik2017-04-271-0/+3
| | | | |
| | * | | update gitignore with commonly used (by me) out-of-source builddir namesVladislav Vaintroub2017-04-271-0/+4
| | | | |
* | | | | Adding an alternative grammar file sql_yacc_ora.yy for sql_mode=ORACLEAlexander Barkov2017-04-051-0/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adding a new grammar file sql_yacc_ora.yy, which is currently almost a full copy of sql_yacc.yy. Note, it's now assumed that sql_yacc.yy and sql_yacc_ora.yy use the same set of %token directives and exactly the same %union directive. These declarations should eventually be moved into a shared included file, to make sure that sql_yacc.h and sql_yacc_ora.h are compatible. - Removing the "-p MYSQL" flag from cmake/bison.cmake, using the %name-prefix directive inside sql_yacc.yy and sql_yacc_ora.yy instead - Adding other CMake related changes to build sql_yacc_ora.o form sql_yacc_ora.yy - Adding NUMBER(M,N) as a synonym to DECIMAL(M,N) as the first Oracle compatibility syntax understood in sql_mode=ORACLE. - Adding prototypes to functions add_virtual_expression() and handle_sql2003_note184_exception(), so they can be used in both sql_yacc.yy and sql_yacc_ora.yy. - Adding a new test suite compat/oracle, with the first test "type_number". Use this: ./mtr compat/oracle.type_number # to run a single test ./mtr --suite=compat/oracle # to run the entire new suite - Adding compat/oracle into the list of default suites, so BuildBot can run it automatically on pushes.
* | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocksSergei Petrunia2017-04-041-0/+3
|\ \ \ \
| * \ \ \ Merge 10.1 into 10.2Marko Mäkelä2017-04-041-0/+3
| |\ \ \ \ | | |/ / /
| | * | | put all aws_key_management plugin files into plugin/aws_key_managementSergei Golubchik2017-03-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | that is, download AWS SDK there, not into the builddir root. and .gitignore them all.
* | | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocksSergei Petrunia2017-03-111-0/+6
|\ \ \ \ \ | |/ / / /
View Lorry Controller Status