diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-27 17:12:44 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-27 17:12:44 +0300 |
| commit | ad6d95d3cb420557cfc7efa658181a8d20b4c154 (patch) | |
| tree | 984bb45ca187a6cc38c7132a9600d91515df564e /netware | |
| parent | 9bc9855c16f815e71223398ef17cd6052becc44e (diff) | |
| parent | 7909541953de43c7b7d16513c8d612cfe405af67 (diff) | |
| download | mariadb-git-ad6d95d3cb420557cfc7efa658181a8d20b4c154.tar.gz | |
Merge with MySQL 5.1.50
- Changed to still use bcmp() in certain cases becasue
- Faster for short unaligneed strings than memcmp()
- Bettern when using valgrind
- Changed to use my_sprintf() instead of sprintf() to get higher portability for old systems
- Changed code to use MariaDB version of select->skip_record()
- Removed -%::SCCS/s.% from Makefile.am:s to remove automake warnings
Diffstat (limited to 'netware')
| -rw-r--r-- | netware/Makefile.am | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/netware/Makefile.am b/netware/Makefile.am index 3d0402ce714..f537022495b 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -115,6 +115,3 @@ test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql @echo "Building $@"; @cat init_db.sql \ $(top_srcdir)/scripts/mysql_test_data_timezone.sql > $@; - -# Don't update the files from bitkeeper -%::SCCS/s.% |