Skip to content

Commit ac0ceaf

Browse files
author
[email protected]
committed
Fix for replication when binary log goes over 2G
Split update_of_key into separate tests Updated make_binary_distribution to generate symbol file for mysqld
1 parent b443871 commit ac0ceaf

37 files changed

Lines changed: 55 additions & 44 deletions

‎Docs/manual.texi‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36083,8 +36083,9 @@ The parameters are specified as follows:
3608336083
@item
3608436084
The first parameter should be the address of an existing @code{MYSQL}
3608536085
structure. Before calling @code{mysql_real_connect()} you must call
36086-
@code{mysql_init()} to initialize the @code{MYSQL} structure. See the
36087-
example below.
36086+
@code{mysql_init()} to initialize the @code{MYSQL} structure. You can
36087+
change a lot of connect options with the @code{mysql_options()}
36088+
call. @xref{mysql_options}.
3608836089

3608936090
@item
3609036091
The value of @code{host} may be either a hostname or an IP address. If
@@ -40033,6 +40034,9 @@ though, so Version 3.23 is not released as a stable version yet.
4003340034
@appendixsubsec Changes in release 3.23.30
4003440035
@itemize @bullet
4003540036
@item
40037+
Fixed a problem with replication when the binary log file went over 2G
40038+
on 32 bit systems.
40039+
@item
4003640040
@code{LOCK TABLES} will now automaticly start a new transaction.
4003740041
@item
4003840042
Changed BDB tables to not use internal subtransactions and reuse open files to

‎scripts/make_binary_distribution.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ done
5252

5353
for i in extra/comp_err extra/replace extra/perror extra/resolveip \
5454
extra/my_print_defaults isam/isamchk isam/pack_isam myisam/myisamchk myisam/myisampack sql/mysqld sql/mysqlbinlog \
55-
client/mysql sql/mysqld client/mysqlshow client/mysqladmin client/mysqldump \
56-
client/mysqlimport client/mysqltest \
55+
client/mysql sql/mysqld sql/mysqld.sym.gz client/mysqlshow \
56+
client/mysqladmin client/mysqldump client/mysqlimport client/mysqltest \
5757
client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqltest
5858
do
5959
cp -p $i $BASE/bin
@@ -70,13 +70,13 @@ rm -f $BASE/share/mysql/Makefile* $BASE/share/mysql/*/*.OLD
7070
rm -rf $BASE/share/SCCS $BASE/share/*/SCCS
7171

7272
cp -p mysql-test/mysql-test-run mysql-test/install_test_db $BASE/mysql-test/
73+
cp -p mysql-test/create-test-result $BASE/mysql-test
7374
cp -p mysql-test/README $BASE/mysql-test/README
7475
cp -p mysql-test/include/*.inc $BASE/mysql-test/include
7576
cp -p mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
7677
mysql-test/std_data/*.MRG $BASE/mysql-test/std_data
7778
cp -p mysql-test/t/*.test mysql-test/t/*.opt $BASE/mysql-test/t
7879
cp -p mysql-test/r/*.result mysql-test/r/*.require $BASE/mysql-test/r
79-
cp -p mysql-test/README* mysql-test/mysql-test-run mysql-test/create-test-result mysql-test/install_test_db mysql-test/mysql-test-run $BASE/mysql-test
8080

8181
cp -p scripts/* $BASE/bin
8282
rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution $BASE/bin/setsomevars $BASE/support-files/Makefile* $BASE/support-files/*.sh

‎sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,9 @@ select_range_prefix 19.00 6.65 2.24 0.00 25010
8787
select_simple 1.00 0.31 0.80 0.00 10000
8888
select_simple_join 2.00 0.62 0.39 0.00 500
8989
update_big 26.00 0.00 0.00 0.00 10
90-
update_of_key 48.00 3.60 3.12 0.00 50256
90+
update_of_key 27.00 3.58 3.11 0.00 50000
9191
update_of_key_big 19.00 0.04 0.03 0.00 501
92+
update_of_primary_key_many_keys 21.00 0.02 0.01 0.00 256
9293
update_with_key 135.00 21.98 17.77 0.00 300000
9394
update_with_key_prefix 42.00 7.22 5.96 0.00 100000
9495
wisc_benchmark 4.00 1.71 0.98 0.00 114

‎sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,9 @@ select_range_prefix 20.00 6.82 1.38 0.00 25010
8787
select_simple 2.00 0.47 0.71 0.00 10000
8888
select_simple_join 2.00 0.68 0.19 0.00 500
8989
update_big 64.00 0.00 0.00 0.00 10
90-
update_of_key 88.00 2.82 2.30 0.00 50256
90+
update_of_key 23.00 2.80 2.29 0.00 50000
9191
update_of_key_big 33.00 0.11 0.03 0.00 501
92+
update_of_primary_key_many_keys 65.00 0.02 0.01 0.00 256
9293
update_with_key 113.00 17.01 12.17 0.00 300000
9394
update_with_key_prefix 32.00 5.68 4.36 0.00 100000
9495
wisc_benchmark 4.00 1.80 0.69 0.00 114

‎sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ select_range_prefix 18.00 6.07 1.50 0.00 25010
6767
select_simple 2.00 0.52 0.49 0.00 10000
6868
select_simple_join 2.00 0.63 0.32 0.00 500
6969
update_big 65.00 0.01 0.00 0.00 500
70-
update_of_key 92.00 2.51 2.24 0.00 756
70+
update_of_key 25.00 2.51 2.23 0.00 500
7171
update_of_key_big 33.00 0.06 0.00 0.00 501
72+
update_of_primary_key_many_keys 67.00 0.00 0.01 0.00 256
7273
update_with_key 109.00 13.71 11.48 0.00 100000
7374
wisc_benchmark 4.00 1.75 0.68 0.00 114
7475
TOTALS 3920.00 438.58 200.19 0.00 1594242

‎sql-bench/Results/RUN-mysql-SunOS_5.7_sun4m‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Benchmark DBD suite: 2.10
22
Date of test: 2000-12-17 17:44:49
3-
Running tests on: SunOS 5.7 Sparcstation-10, sun4m 2xcpu: TI,TMS390Z55 (mid 8 impl 0x0 ver 0x1 clock 40MHz)
3+
Running tests on: TI,TMS390Z55 (mid 8 impl 0x0 ver 0x1 clock 40MHz)
44
Arguments: -O key_buffer=!6M
55
Comments: gcc 2.95, 196M memory
66
Limits from:
@@ -86,8 +86,9 @@ select_range_prefix 181.00 55.31 26.09 0.00 25010
8686
select_simple 19.00 4.00 6.52 0.00 10000
8787
select_simple_join 21.00 7.16 3.20 0.00 500
8888
update_big 384.00 0.01 0.00 0.00 10
89-
update_of_key 624.00 33.71 29.06 0.00 50256
89+
update_of_key 275.00 33.49 28.89 0.00 50000
9090
update_of_key_big 209.00 0.30 0.33 0.00 501
91+
update_of_primary_key_many_keys 349.00 0.22 0.17 0.00 256
9192
update_with_key 1136.00 171.26 157.65 0.00 300000
9293
wisc_benchmark 42.00 17.93 7.18 0.00 114
9394
TOTALS 40688.00 5188.04 3327.69 0.00 1946237 ++++++++++++

‎sql-bench/Results/RUN-mysql-SunOS_5.8_sun4u‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@ select_range_prefix 36.00 10.05 5.36 15.41 25010
8686
select_simple 4.00 0.84 1.47 2.31 10000
8787
select_simple_join 3.00 1.28 0.98 2.26 500
8888
update_big 69.00 0.00 0.00 0.00 10
89-
update_of_key 144.00 3.57 4.61 8.18 50256
89+
update_of_key 38.00 3.56 4.58 8.14 50000
9090
update_of_key_big 45.00 0.02 0.02 0.04 501
91+
update_of_primary_key_many_keys 106.00 0.01 0.03 0.04 256
9192
update_with_key 177.00 18.82 27.57 46.39 300000
9293
wisc_benchmark 9.00 3.67 2.50 6.17 114
9394
TOTALS 10539.00 863.66 694.75 1558.42 1946237 +

‎sql-bench/Results/RUN-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ select_range_prefix 24419.00 9.69 0.80 0.00 25000 ++
8080
select_simple 4.00 2.96 0.45 0.00 10000
8181
select_simple_join 3.00 0.69 0.04 0.00 500
8282
update_big 1894.00 0.02 0.00 0.00 10
83-
update_of_key 3624.00 15.41 3.10 0.00 50256
83+
update_of_key 2460.00 15.33 3.09 0.00 50000
8484
update_of_key_big 444.00 0.20 0.00 0.00 501
85+
update_of_primary_key_many_keys 1164.00 0.08 0.01 0.00 256
8586
update_with_key 14806.00 89.73 16.29 0.00 300000
8687
wisc_benchmark 18.00 3.04 0.25 0.00 114
8788
TOTALS 130055.00 832.98 125.55 0.00 1844991 ++++++++++

‎sql-bench/Results/RUN-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ select_range_prefix 44.00 6.28 0.79 0.00 25010
6969
select_simple 4.00 2.62 0.47 0.00 10000
7070
select_simple_join 3.00 0.79 0.07 0.00 500
7171
update_big 1832.00 0.00 0.00 0.00 500
72-
update_of_key 1588.00 14.08 2.18 0.00 756
72+
update_of_key 97.00 14.01 2.17 0.00 500
7373
update_of_key_big 559.00 0.21 0.01 0.00 501
74+
update_of_primary_key_many_keys 1491.00 0.07 0.01 0.00 256
7475
update_with_key 449.00 91.48 14.02 0.00 100000
7576
wisc_benchmark 15.00 3.21 0.28 0.00 114
7677
TOTALS 32657.00 776.58 108.82 0.00 1594267 +++

‎sql-bench/Results/insert-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
5555
Time for insert_key (10000): 241 secs ( 8.58 usr 2.07 sys = 10.65 cpu)
5656

5757
Testing update of keys
58-
Time for update_of_key (256): 17 secs ( 0.10 usr 0.16 sys = 0.26 cpu)
58+
Time for update_of_primary_key_many_keys (256): 17 secs ( 0.10 usr 0.16 sys = 0.26 cpu)
5959

6060
Deleting everything from table
6161
Time for delete_big (2): 4 secs ( 0.00 usr 0.00 sys = 0.00 cpu)

0 commit comments

Comments
 (0)