Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RONDB-782 Merge 22.10-dev into 24.10-main #587

Merged
merged 11 commits into from
Dec 3, 2024
Merged

RONDB-782 Merge 22.10-dev into 24.10-main #587

merged 11 commits into from
Dec 3, 2024

Conversation

svenssonaxel
Copy link
Collaborator

@svenssonaxel svenssonaxel commented Dec 3, 2024 •
edited by jira bot
Loading

Merge structure:

364f5997d94 *   svenssonaxel/RONDB-782 Merge branch '22.10-dev' into RONDB-782
            |\  
65c582db139 * \   Null merge
            |\ \  
b9a71011dce * \ \   Merge commit '0ff1ddb8007' into rondb-782
            |\ \ \  
0e85bdf0aa1 | | | * 22.10-dev logicalclocks/22.10-dev Merge pull request #581 from smkniazi/adding_missing_commits
            | | |/| 
dba074cf2da * | | |   logicalclocks/24.10-main Merge pull request #579 from svenssonaxel/rdrs
            |\ \ \ \  
35a70d57c18 | * | | | svenssonaxel/rdrs [RONDB-751] have_util_curl.inc
0cfe357bbe9 | * | | | [RONDB-754] Cleanup
9decc5aa232 | * | | | [RONDB-783] mtr: Wait for rdrs2 to begin listening
5efa0ab8979 | * | | | [RONDB-751] ronsql: Fix assert bug in ronsql_ctrl.cpp
b4e032789e0 | * | | | [RONDB-751] Fix out-of-bounds access bug in NdbAggregator
14ec257cb8b | * | | | [RONDB-751] Debug prints for RonSQL and related
d6a5aa0b4a2 | * | | | [RONDB-751] Let mysql-test/suite/ronsql use rdrs2
428a2db195f | * | | | [RONDB-773] RonSQL: Fix null output
d3c0683f448 | * | | | [RONDB-772] rdrs2: Fix encoding and space trimming
bbe15e59ca0 | * | | | [RONDB-751] Rename test suite rdrs2 -> rdrs2-golang
400be19a0c7 | * | | | [RONDB-751] Rename test suite rdrs2 -> rdrs2-golang: Rename files
20101934a6a | * | | | [RONDB-752] Delete bench.sh
            |/ / / /  
222c81e9be3 * | | | RONDB-785: Allocate signal numbers for Set LocationDomainId from ndb_mgm
1f5f73bef3f | | | * smkniazi/adding_missing_commits RONDB-668: Fix RDRS build. Load image to local Docker image repository (#468)
9e4138a4a9b | | | * RONDB-646: Updated RDRS Makefile to Run Benchmarks (#454)
ce6c6cca2ce | | | * RONDB-612 Update API specification for rest server (#441)
3cb8ba8e8b7 | | | * RONDB-590: Select branch to build and tar ball location in Jenkins build (#431)
            | | |/  
7d7235db8f4 | | * mronstro/22.10-dev RONDB-781: Remove RDRS2 from 22.10 brach as RDRS2 is only maintained in 24.10 branch (#580)
            | |/  
3742be56557 * |   24.10-main smkniazi/RONDB-779-24.10 Merge pull request #578 from KernelMaker/PATCH_6_feature_RONDB-753_TTL_BUGFIX
            |\ \  
50eefd6811c | * | KernelMaker/PATCH_6_feature_RONDB-753_TTL_BUGFIX RONDB-753 TTL feature [Patch 6 - bugfix]
            |/ /  
0ff1ddb8007 | * RONDB-779: Fixed build. Failing due to MYSQL_VERSION_EXTRA in clusterj jar name (#576)

smkniazi and others added 11 commits November 19, 2024 10:03
@smkniazi
RONDB-776: RDRS: changed hopsworks.schemas.schema to TEXT (logicalclo…
6701a10 
…cks#573)

* RONDB-776: RDRS: changed hopsworks.schemas.schema to TEXT

* RONDB-776: Fixed malloc. +1 for \0
@smkniazi
RONDB-779: Fixed build. Failing due to MYSQL_VERSION_EXTRA in cluster…
0ff1ddb 
…j jar name (logicalclocks#576)
@smkniazi
RONDB-781: Remove RDRS2 from 22.10 brach as RDRS2 is only maintained …
7d7235d 
…in 24.10 branch (logicalclocks#580)
@smkniazi
RONDB-590: Select branch to build and tar ball location in Jenkins bu…
3cb8ba8 
…ild (logicalclocks#431)

* RONDB-590: Select branch to build and tar ball location in Jenkins build

* Fixed Docker files for -p flag

* more fixes

* add repository and rdrs build param

* added docker image selection

* Do not deploy clusterj for non public releases

* return --> exit in bash
@641bill @smkniazi
RONDB-612 Update API specification for rest server (logicalclocks#441)
ce6c6cc
@smkniazi
RONDB-646: Updated RDRS Makefile to Run Benchmarks (logicalclocks#454)
9e4138a
@smkniazi
RONDB-668: Fix RDRS build. Load image to local Docker image repository (
1f5f73b 
logicalclocks#468)
@mronstro
Merge pull request logicalclocks#581 from smkniazi/adding_missing_com…
0e85bdf 
…mits

RONDB-782: Adding missing commits. RONDB-590, RONDB-612, RONDB-646, RONDB-668
@svenssonaxel
Merge commit '0ff1ddb8007' into rondb-782
b9a7101 
Commit "0ff1ddb8007 RONDB-779: Fixed build. Failing due to
MYSQL_VERSION_EXTRA in clusterj jar name (logicalclocks#576)" is the commit right
before RONDB-781 (Remove RDRS2), which will be null merged.
@svenssonaxel
Null merge
65c582d
@svenssonaxel
Merge branch '22.10-dev' into RONDB-782
364f599
@svenssonaxel svenssonaxel merged commit 6fddb75 into logicalclocks:24.10-main Dec 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mronstro mronstro mronstro approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@svenssonaxel @mronstro @smkniazi @641bill