diff --git a/0001-greatsql-8.0.32-add-loongarch-support.patch b/0001-greatsql-8.0.32-add-loongarch-support.patch deleted file mode 100644 index ee643655c08fbbf51c5607067f8951d2a5e5b5d0..0000000000000000000000000000000000000000 --- a/0001-greatsql-8.0.32-add-loongarch-support.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 77b6310acfd57e500211784806bb60c76c9a6cb2 Mon Sep 17 00:00:00 2001 -From: Huang Yang -Date: Mon, 22 Apr 2024 03:23:18 +0000 -Subject: [PATCH] greatsql 8.0.32 add loongarch support - ---- - CMakeLists.txt | 1 + - extra/duktape/duktape-2.7.0/src/duk_config.h | 12 ++++++++++ - .../source/i18n/double-conversion-utils.h | 3 ++- - storage/ndb/include/portlib/mt-asm.h | 24 +++++++++++++++++++ - 4 files changed, 39 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 71a518d9..b2d9e8bd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -718,6 +718,7 @@ SET(KNOWN_64BIT_ARCHITECTURES - aarch64 - ppc64 - ppc64le -+ loongarch64 - s390x - x86_64 - ) -diff --git a/extra/duktape/duktape-2.7.0/src/duk_config.h b/extra/duktape/duktape-2.7.0/src/duk_config.h -index 77cddc1d..2c919ea9 100644 ---- a/extra/duktape/duktape-2.7.0/src/duk_config.h -+++ b/extra/duktape/duktape-2.7.0/src/duk_config.h -@@ -42,6 +42,7 @@ - * - SPARC 64-bit - * - RISC-V 32-bit - * - RISC-V 64-bit -+ * - loongarch 64-bit - * - SuperH - * - Motorola 68k - * - Emscripten -@@ -303,6 +304,11 @@ - #endif - #endif /* __riscv */ - -+/* loongarch64 */ -+#if defined(__loongarch64) -+#define DUK_F_LOONGARCH64 -+#endif -+ - /* SuperH */ - #if defined(__sh__) || \ - defined(__sh1__) || defined(__SH1__) || \ -@@ -991,6 +997,12 @@ - #define DUK_USE_BYTEORDER 1 - #undef DUK_USE_PACKED_TVAL - #define DUK_F_PACKED_TVAL_PROVIDED -+#elif defined(DUK_F_LOONGARCH64) -+/* --- loongarch 64-bit --- */ -+#define DUK_USE_ARCH_STRING "loongarch64" -+#define DUK_USE_BYTEORDER 1 -+#undef DUK_USE_PACKED_TVAL -+#define DUK_F_PACKED_TVAL_PROVIDED - #elif defined(DUK_F_SUPERH) - /* --- SuperH --- */ - #define DUK_USE_ARCH_STRING "sh" -diff --git a/extra/icu/icu-release-69-1/source/i18n/double-conversion-utils.h b/extra/icu/icu-release-69-1/source/i18n/double-conversion-utils.h -index c9374636..8d95fe89 100644 ---- a/extra/icu/icu-release-69-1/source/i18n/double-conversion-utils.h -+++ b/extra/icu/icu-release-69-1/source/i18n/double-conversion-utils.h -@@ -128,7 +128,8 @@ int main(int argc, char** argv) { - defined(__riscv) || defined(__e2k__) || \ - defined(__or1k__) || defined(__arc__) || \ - defined(__microblaze__) || defined(__XTENSA__) || \ -- defined(__EMSCRIPTEN__) || defined(__wasm32__) -+ defined(__EMSCRIPTEN__) || defined(__wasm32__) || \ -+ defined(__loongarch64) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(__mc68000__) || \ - defined(__pnacl__) || defined(__native_client__) -diff --git a/storage/ndb/include/portlib/mt-asm.h b/storage/ndb/include/portlib/mt-asm.h -index 418b8d9c..f2518eeb 100644 ---- a/storage/ndb/include/portlib/mt-asm.h -+++ b/storage/ndb/include/portlib/mt-asm.h -@@ -156,6 +156,30 @@ xcng(volatile unsigned * addr, int val) - #define wmb() std::atomic_thread_fence(std::memory_order_seq_cst) - - #define cpu_pause() __asm__ __volatile__ ("yield") -+#elif defined(__loongarch64) -+ -+#define NDB_HAVE_MB -+#define NDB_HAVE_RMB -+#define NDB_HAVE_WMB -+//#define NDB_HAVE_XCNG -+ -+// details frome kernel-6.9 arch/loongarch/include/asm/barrier.h -+ -+#define DBAR(hint) __asm__ __volatile__("dbar %0 " : : "I"(hint) : "memory") -+ -+#define crwrw 0b00000 -+#define cr_r_ 0b00101 -+#define c_w_w 0b01010 -+ -+#define c_sync() DBAR(crwrw) -+#define c_rsync() DBAR(cr_r_) -+#define c_wsync() DBAR(c_w_w) -+ -+#define mb() c_sync() -+#define rmb() c_rsync() -+#define wmb() c_wsync() -+ -+#define cpu_pause() __asm__ __volatile__ ("nop") - - #else - #define NDB_NO_ASM "Unsupported architecture (gcc)" --- -2.43.0 - diff --git a/greatsql-8.0.32-25.tar.xz.ac b/greatsql-8.0.32-25.tar.xz.ac deleted file mode 100644 index f1c54280c34b2f647cc6d65a4e9b10a3e1f15229..0000000000000000000000000000000000000000 Binary files a/greatsql-8.0.32-25.tar.xz.ac and /dev/null differ diff --git a/greatsql-8.0.32-25.tar.xz b/greatsql-8.0.32-26.tar.xz similarity index 100% rename from greatsql-8.0.32-25.tar.xz rename to greatsql-8.0.32-26.tar.xz diff --git a/greatsql-8.0.32-25.tar.xz.aa b/greatsql-8.0.32-26.tar.xz.aa similarity index 77% rename from greatsql-8.0.32-25.tar.xz.aa rename to greatsql-8.0.32-26.tar.xz.aa index 430e838e601e0561d676e8cc1869924e391c303b..695090fe74a662d424cebfe774915568d468b9f6 100644 Binary files a/greatsql-8.0.32-25.tar.xz.aa and b/greatsql-8.0.32-26.tar.xz.aa differ diff --git a/greatsql-8.0.32-26.tar.xz.ab b/greatsql-8.0.32-26.tar.xz.ab new file mode 100644 index 0000000000000000000000000000000000000000..988b1e6dd309558f4e1e5c00cc7c4c36a7bb815e Binary files /dev/null and b/greatsql-8.0.32-26.tar.xz.ab differ diff --git a/greatsql-8.0.32-25.tar.xz.ae b/greatsql-8.0.32-26.tar.xz.ac similarity index 78% rename from greatsql-8.0.32-25.tar.xz.ae rename to greatsql-8.0.32-26.tar.xz.ac index 3ee364a39aa2b2047fe2a144747446b48ba4c25f..eab335eb57d5ce2052336db51551d28dc9355dfc 100644 Binary files a/greatsql-8.0.32-25.tar.xz.ae and b/greatsql-8.0.32-26.tar.xz.ac differ diff --git a/greatsql-8.0.32-25.tar.xz.ai b/greatsql-8.0.32-26.tar.xz.ad similarity index 81% rename from greatsql-8.0.32-25.tar.xz.ai rename to greatsql-8.0.32-26.tar.xz.ad index 3285732dfcd04faf547a8e02d866fa7f64ff670f..c48f99a6ecf0f465c91285deb431cdfe84d86181 100644 Binary files a/greatsql-8.0.32-25.tar.xz.ai and b/greatsql-8.0.32-26.tar.xz.ad differ diff --git a/greatsql-8.0.32-25.tar.xz.ah b/greatsql-8.0.32-26.tar.xz.ae similarity index 78% rename from greatsql-8.0.32-25.tar.xz.ah rename to greatsql-8.0.32-26.tar.xz.ae index 6926fc8dec13e3444465cd3e521f153a0674d240..1ac2f9de7e5d853ff143f15d7f73b2a6d7d6e9d0 100644 Binary files a/greatsql-8.0.32-25.tar.xz.ah and b/greatsql-8.0.32-26.tar.xz.ae differ diff --git a/greatsql-8.0.32-25.tar.xz.ag b/greatsql-8.0.32-26.tar.xz.af similarity index 77% rename from greatsql-8.0.32-25.tar.xz.ag rename to greatsql-8.0.32-26.tar.xz.af index 7415fb05490fee30e9bad2cbe054eeaf1e27e295..2ef97fbd8662013755273b0fba2829ae6f98a6f9 100644 Binary files a/greatsql-8.0.32-25.tar.xz.ag and b/greatsql-8.0.32-26.tar.xz.af differ diff --git a/greatsql-8.0.32-25.tar.xz.ad b/greatsql-8.0.32-26.tar.xz.ag similarity index 77% rename from greatsql-8.0.32-25.tar.xz.ad rename to greatsql-8.0.32-26.tar.xz.ag index e6a86dafd4e5bda60d1d4e4479254e6f3581b61f..fe12463ae75427e0a599fe8da856507c1b9fb5ca 100644 Binary files a/greatsql-8.0.32-25.tar.xz.ad and b/greatsql-8.0.32-26.tar.xz.ag differ diff --git a/greatsql-8.0.32-25.tar.xz.ab b/greatsql-8.0.32-26.tar.xz.ah similarity index 78% rename from greatsql-8.0.32-25.tar.xz.ab rename to greatsql-8.0.32-26.tar.xz.ah index 4b7040dd4686a5ff243a56f66278c7dfc9aba5ab..b199b0cf5c8c2b50f2766621e2a795f99f731398 100644 Binary files a/greatsql-8.0.32-25.tar.xz.ab and b/greatsql-8.0.32-26.tar.xz.ah differ diff --git a/greatsql-8.0.32-25.tar.xz.af b/greatsql-8.0.32-26.tar.xz.ai similarity index 79% rename from greatsql-8.0.32-25.tar.xz.af rename to greatsql-8.0.32-26.tar.xz.ai index d2f2b62eec53f82075ccb0618afc12f6b1038891..f39bb6352f24e5bff26be05f9af94c3516dc82ff 100644 Binary files a/greatsql-8.0.32-25.tar.xz.af and b/greatsql-8.0.32-26.tar.xz.ai differ diff --git a/greatsql-8.0.32-25.tar.xz.aj b/greatsql-8.0.32-26.tar.xz.aj similarity index 68% rename from greatsql-8.0.32-25.tar.xz.aj rename to greatsql-8.0.32-26.tar.xz.aj index 0a0a82edea1dc8ad592cd3fbfe368851d7620332..7befb84bad20b1a52aebaf2dc285d4892df03854 100644 Binary files a/greatsql-8.0.32-25.tar.xz.aj and b/greatsql-8.0.32-26.tar.xz.aj differ diff --git a/greatsql.spec b/greatsql.spec index ffdb11774a9f8af7335c9fad7e2312cc90d7382d..804b9deb347f329f0671fdfba969f70384ed7c76 100644 --- a/greatsql.spec +++ b/greatsql.spec @@ -29,10 +29,10 @@ %global mysqldatadir /var/lib/mysql %global mysql_version 8.0.32 -%global greatsql_version 25 -%global revision db07cc5cb73 +%global greatsql_version 26 +%global revision a68b3034c3d %global tokudb_backup_version %{mysql_version}-%{greatsql_version} -%global rpm_release 4 +%global rpm_release 1 %global release %{greatsql_version}.%{rpm_release}%{?dist} @@ -103,18 +103,18 @@ Summary: GreatSQL: a high performance, highly reliable, easy to use, and Group: Applications/Databases Version: %{mysql_version} Release: %{release} -License: Copyright (c) 2000, 2018, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.. -SOURCE0: greatsql-8.0.32-25.tar.xz -SOURCE101: greatsql-8.0.32-25.tar.xz.aa -SOURCE102: greatsql-8.0.32-25.tar.xz.ab -SOURCE103: greatsql-8.0.32-25.tar.xz.ac -SOURCE104: greatsql-8.0.32-25.tar.xz.ad -SOURCE105: greatsql-8.0.32-25.tar.xz.ae -SOURCE106: greatsql-8.0.32-25.tar.xz.af -SOURCE107: greatsql-8.0.32-25.tar.xz.ag -SOURCE108: greatsql-8.0.32-25.tar.xz.ah -SOURCE109: greatsql-8.0.32-25.tar.xz.ai -SOURCE110: greatsql-8.0.32-25.tar.xz.aj +License: GPL-2.0-or-later AND LGPL-2.1-only AND BSL-1.0 AND GPL-1.0-or-later OR Artistic-1.0-Perl AND BSD-2-Clause +SOURCE0: greatsql-8.0.32-26.tar.xz +SOURCE101: greatsql-8.0.32-26.tar.xz.aa +SOURCE102: greatsql-8.0.32-26.tar.xz.ab +SOURCE103: greatsql-8.0.32-26.tar.xz.ac +SOURCE104: greatsql-8.0.32-26.tar.xz.ad +SOURCE105: greatsql-8.0.32-26.tar.xz.ae +SOURCE106: greatsql-8.0.32-26.tar.xz.af +SOURCE107: greatsql-8.0.32-26.tar.xz.ag +SOURCE108: greatsql-8.0.32-26.tar.xz.ah +SOURCE109: greatsql-8.0.32-26.tar.xz.ai +SOURCE110: greatsql-8.0.32-26.tar.xz.aj URL: https://greatsql.cn SOURCE5: mysql_config.sh SOURCE10: boost_1_77_0.tar.xz @@ -124,14 +124,11 @@ SOURCE90: filter-provides.sh SOURCE91: filter-requires.sh SOURCE11: mysqld.cnf Patch0: mysql-5.7-sharedlib-rename.patch -Patch0002: 0001-greatsql-8.0.32-add-loongarch-support.patch BuildRequires: cmake >= 2.8.2 BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: perl -#BuildRequires: perl(Time::HiRes)} -#BuildRequires: perl(Env)} BuildRequires: perl(Carp) BuildRequires: perl(Config) BuildRequires: perl(Cwd) @@ -188,7 +185,6 @@ BuildRequires: m4 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) # For rpm => 4.9 only: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering -#%global __requires_exclude ^perl\\((GD|hostnames|lib::mtr|lib::v1|mtr_|My::) %global __requires_exclude ^perl\\((GD|hostnames|lib::mtr|lib::v1|mtr_|My::|Lmo|Lmo::Meta|Lmo::Object|Lmo::Types|Lmo::Utils|Percona::Toolkit|Quoter|Transformers) %global __provides_exclude_from ^(/usr/share/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so|/usr/include/mysql/.*|/usr/share/man/man.*/mysql.*|/etc/my.cnf|/usr/bin/mysql.*|/usr/sbin/mysqld.*|*libprotobuf*|*libmysqlclient.so*|*libmysqlharness*|*libmysqlrouter*|*mysqlclient*|*libdaemon*|*libfnv*|*libmemcached*|*libmurmur*|*libtest*)$ @@ -403,7 +399,6 @@ cat %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} %{SOURCE105} %{SOURCE106 %setup -q -T -a 0 -a 10 -c -n %{src_dir} pushd %{src_dir} %patch0 -p0 -%patch0002 -p1 cp %{SOURCE11} scripts %build @@ -673,11 +668,14 @@ echo "socket=/var/lib/mysql/mysql.sock" >> /etc/my.cnf echo "log-error=/var/log/mysqld.log" >> /etc/my.cnf echo "pid-file=/var/run/mysqld/mysqld.pid" >> /etc/my.cnf echo "slow_query_log = ON" >> /etc/my.cnf -echo "long_query_time = 1" >> /etc/my.cnf +echo "long_query_time = 0.01" >> /etc/my.cnf echo "log_slow_verbosity = FULL" >> /etc/my.cnf echo "log_error_verbosity = 3" >> /etc/my.cnf echo "innodb_buffer_pool_size = 1G" >> /etc/my.cnf -echo "innodb_log_file_size = 128M" >> /etc/my.cnf +echo "innodb_redo_log_capacity = 256M" >> /etc/my.cnf +echo "innodb_io_capacity = 10000" >> /etc/my.cnf +echo "innodb_io_capacity_max = 20000" >> /etc/my.cnf +echo "innodb_flush_sync = OFF" >> /etc/my.cnf %preun -n greatsql-server %if 0%{?systemd} @@ -1352,6 +1350,9 @@ fi %changelog +* Thu Aug 8 2024 GreatSQL - 8.0.32-26.1 +- Release GreatSQL-8.0.32-26.1 + * Thu Jun 20 2024 zhangxianting - 8.0.32-25.4 - fix install error