Skip to content

Commit 0193a6d

Browse files
committed
add mysql 8.0.29 , fix SSL, add ubuntu 22.04
1 parent c0de5ec commit 0193a6d

File tree

10 files changed

+12
-23
lines changed

10 files changed

+12
-23
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ For the library to work correctly, the following server variables must have the
2222

2323
On ubuntu you need install some pakages:
2424

25-
sudo apt install git gcc g++ make cmake rpl libssl-dev libncurses-dev pkg-config bison 9base
25+
sudo apt install git gcc g++ make cmake rpl libssl-dev libncurses-dev pkg-config bison 9base patchelf
2626

2727
To build the library, you need to run the **build.sh** script included in the project.
2828
This script will run the **cmake** utility for the **MySQL 8.0** distribution and after that, by calling the **rpl** utility,

boost/xaa

-32 MB
Binary file not shown.

boost/xab

-32 MB
Binary file not shown.

boost/xac

-32 MB
Binary file not shown.

boost/xad

-28.4 MB
Binary file not shown.

build.sh

+10-20
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#
2121

2222

23-
MYSQL_SOURCE_VERSION="mysql-8.0.27"
23+
MYSQL_SOURCE_VERSION="mysql-8.0.29"
2424

2525
rpl > /dev/null 2>&1;
2626
RPL_TEST_RES="$?"
@@ -84,34 +84,24 @@ else
8484
fi
8585

8686

87+
cd $CURR_DIR/openssl_src
88+
tar -zxvf openssl-1.1.1p.tar.gz
89+
cd $CURR_DIR/openssl_src/openssl-1.1.1p
90+
./config --prefix=$CURR_DIR/openssl --openssldir=$CURR_DIR/openssl/ssl
91+
make
92+
make install
8793

88-
89-
if [ -f $CURR_DIR/mysql_source/boost_1_73_0.tar.gz ]; then
90-
91-
rm $CURR_DIR/mysql_source/boost_1_73_0.tar.gz
92-
fi
93-
cat $CURR_DIR/boost/xaa > $CURR_DIR/mysql_source/boost_1_73_0.tar.gz
94-
cat $CURR_DIR/boost/xab >> $CURR_DIR/mysql_source/boost_1_73_0.tar.gz
95-
cat $CURR_DIR/boost/xac >> $CURR_DIR/mysql_source/boost_1_73_0.tar.gz
96-
cat $CURR_DIR/boost/xad >> $CURR_DIR/mysql_source/boost_1_73_0.tar.gz
97-
98-
if [ -d $CURR_DIR/mysql_source/mysql/boost_1_73_0 ]; then
99-
100-
rm -r -f $CURR_DIR/mysql_source/mysql/boost_1_73_0
101-
fi
102-
mkdir $CURR_DIR/mysql_source/mysql/boost_1_73_0
103-
104-
tar -C $CURR_DIR/mysql_source/mysql/boost_1_73_0 -zxvf $CURR_DIR/mysql_source/boost_1_73_0.tar.gz --strip-components 1
94+
cd $CURR_DIR
10595

10696

10797

10898
rm -r ./mysql_source/build/*
109-
echo "" > ./mysql_source/build/1.txt
99+
echo "" > ./mysql_source/build/.gitkeep
110100

111101

112102

113103
cd ./mysql_source/build
114-
cmake ../mysql -DDOWNLOAD_BOOST=0 -DWITH_BOOST=$CURR_DIR/mysql_source/mysql/boost_1_73_0 -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON
104+
cmake ../mysql -DDOWNLOAD_BOOST=1 -DWITH_BOOST=$CURR_DIR/mysql_source/mysql/boost -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DWITH_SSL=$CURR_DIR/openssl
115105
cd ../../
116106

117107

mysql_source/build/1.txt

-1
This file was deleted.

openssl/.gitkeep

Whitespace-only changes.

openssl_src/openssl-1.1.1p.tar.gz

9.4 MB
Binary file not shown.

rows_log_event_2/rows_log_event_2.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ switch (type) {
765765
}
766766
char buf[MAX_DATE_STRING_REP_LENGTH+1];
767767
memset( buf, 0, MAX_DATE_STRING_REP_LENGTH+1 );
768-
struct timeval tm;
768+
struct my_timeval tm;
769769
my_timestamp_from_binary(&tm, ptr, meta);
770770

771771
my_timeval_to_str(&tm, buf, meta);

0 commit comments

Comments
 (0)