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

Docs/manual.texi

@@ -36083,8 +36083,9 @@ The parameters are specified as follows:
 @item
 The first parameter should be the address of an existing @code{MYSQL}
 structure.  Before calling @code{mysql_real_connect()} you must call
-@code{mysql_init()} to initialize the @code{MYSQL} structure.  See the
-example below.
+@code{mysql_init()} to initialize the @code{MYSQL} structure. You can
+change a lot of connect options with the @code{mysql_options()}
+call. @xref{mysql_options}.
 
 @item
 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.
 @appendixsubsec Changes in release 3.23.30
 @itemize @bullet
 @item
+Fixed a problem with replication when the binary log file went over 2G
+on 32 bit systems.
+@item
 @code{LOCK TABLES} will now automaticly start a new transaction.
 @item
 Changed BDB tables to not use internal subtransactions and reuse open files to

scripts/make_binary_distribution.sh

@@ -52,8 +52,8 @@ done
 
 for i in extra/comp_err extra/replace extra/perror extra/resolveip \
  extra/my_print_defaults isam/isamchk isam/pack_isam myisam/myisamchk myisam/myisampack sql/mysqld sql/mysqlbinlog \
- client/mysql sql/mysqld client/mysqlshow client/mysqladmin client/mysqldump \
- client/mysqlimport client/mysqltest \
+ client/mysql sql/mysqld sql/mysqld.sym.gz client/mysqlshow \
+ client/mysqladmin client/mysqldump client/mysqlimport client/mysqltest \
  client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin client/.libs/mysqldump client/.libs/mysqlimport client/.libs/mysqltest
 do
   cp -p $i $BASE/bin
@@ -70,13 +70,13 @@ rm -f $BASE/share/mysql/Makefile* $BASE/share/mysql/*/*.OLD
 rm -rf $BASE/share/SCCS  $BASE/share/*/SCCS 
 
 cp -p mysql-test/mysql-test-run mysql-test/install_test_db $BASE/mysql-test/
+cp -p mysql-test/create-test-result $BASE/mysql-test
 cp -p mysql-test/README $BASE/mysql-test/README
 cp -p mysql-test/include/*.inc $BASE/mysql-test/include
 cp -p mysql-test/std_data/*.dat  mysql-test/std_data/*.frm \
       mysql-test/std_data/*.MRG  $BASE/mysql-test/std_data
 cp -p mysql-test/t/*.test mysql-test/t/*.opt $BASE/mysql-test/t
 cp -p mysql-test/r/*.result mysql-test/r/*.require $BASE/mysql-test/r
-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
 
 cp -p scripts/* $BASE/bin
 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

@@ -87,8 +87,9 @@ select_range_prefix                   19.00    6.65    2.24    0.00   25010
 select_simple                          1.00    0.31    0.80    0.00   10000 
 select_simple_join                     2.00    0.62    0.39    0.00     500 
 update_big                            26.00    0.00    0.00    0.00      10 
-update_of_key                         48.00    3.60    3.12    0.00   50256 
+update_of_key                         27.00    3.58    3.11    0.00   50000 
 update_of_key_big                     19.00    0.04    0.03    0.00     501 
+update_of_primary_key_many_keys       21.00    0.02    0.01    0.00     256 
 update_with_key                      135.00   21.98   17.77    0.00  300000 
 update_with_key_prefix                42.00    7.22    5.96    0.00  100000 
 wisc_benchmark                         4.00    1.71    0.98    0.00     114 

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

@@ -87,8 +87,9 @@ select_range_prefix                   20.00    6.82    1.38    0.00   25010
 select_simple                          2.00    0.47    0.71    0.00   10000 
 select_simple_join                     2.00    0.68    0.19    0.00     500 
 update_big                            64.00    0.00    0.00    0.00      10 
-update_of_key                         88.00    2.82    2.30    0.00   50256 
+update_of_key                         23.00    2.80    2.29    0.00   50000 
 update_of_key_big                     33.00    0.11    0.03    0.00     501 
+update_of_primary_key_many_keys       65.00    0.02    0.01    0.00     256 
 update_with_key                      113.00   17.01   12.17    0.00  300000 
 update_with_key_prefix                32.00    5.68    4.36    0.00  100000 
 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

@@ -67,8 +67,9 @@ select_range_prefix                   18.00    6.07    1.50    0.00   25010
 select_simple                          2.00    0.52    0.49    0.00   10000 
 select_simple_join                     2.00    0.63    0.32    0.00     500 
 update_big                            65.00    0.01    0.00    0.00     500 
-update_of_key                         92.00    2.51    2.24    0.00     756 
+update_of_key                         25.00    2.51    2.23    0.00     500 
 update_of_key_big                     33.00    0.06    0.00    0.00     501 
+update_of_primary_key_many_keys       67.00    0.00    0.01    0.00     256 
 update_with_key                      109.00   13.71   11.48    0.00  100000 
 wisc_benchmark                         4.00    1.75    0.68    0.00     114 
 TOTALS                              3920.00  438.58  200.19    0.00 1594242 

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

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

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

@@ -86,8 +86,9 @@ select_range_prefix                   36.00   10.05    5.36   15.41   25010
 select_simple                          4.00    0.84    1.47    2.31   10000 
 select_simple_join                     3.00    1.28    0.98    2.26     500 
 update_big                            69.00    0.00    0.00    0.00      10 
-update_of_key                        144.00    3.57    4.61    8.18   50256 
+update_of_key                         38.00    3.56    4.58    8.14   50000 
 update_of_key_big                     45.00    0.02    0.02    0.04     501 
+update_of_primary_key_many_keys      106.00    0.01    0.03    0.04     256 
 update_with_key                      177.00   18.82   27.57   46.39  300000 
 wisc_benchmark                         9.00    3.67    2.50    6.17     114 
 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

@@ -80,8 +80,9 @@ select_range_prefix                 24419.00    9.69    0.80    0.00   25000 ++
 select_simple                          4.00    2.96    0.45    0.00   10000 
 select_simple_join                     3.00    0.69    0.04    0.00     500 
 update_big                          1894.00    0.02    0.00    0.00      10 
-update_of_key                       3624.00   15.41    3.10    0.00   50256 
+update_of_key                       2460.00   15.33    3.09    0.00   50000 
 update_of_key_big                    444.00    0.20    0.00    0.00     501 
+update_of_primary_key_many_keys     1164.00    0.08    0.01    0.00     256 
 update_with_key                     14806.00   89.73   16.29    0.00  300000 
 wisc_benchmark                        18.00    3.04    0.25    0.00     114 
 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

@@ -69,8 +69,9 @@ select_range_prefix                   44.00    6.28    0.79    0.00   25010
 select_simple                          4.00    2.62    0.47    0.00   10000 
 select_simple_join                     3.00    0.79    0.07    0.00     500 
 update_big                          1832.00    0.00    0.00    0.00     500 
-update_of_key                       1588.00   14.08    2.18    0.00     756 
+update_of_key                         97.00   14.01    2.17    0.00     500 
 update_of_key_big                    559.00    0.21    0.01    0.00     501 
+update_of_primary_key_many_keys     1491.00    0.07    0.01    0.00     256 
 update_with_key                      449.00   91.48   14.02    0.00  100000 
 wisc_benchmark                        15.00    3.21    0.28    0.00     114 
 TOTALS                              32657.00  776.58  108.82    0.00 1594267 +++

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

@@ -55,7 +55,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (10000): 241 secs ( 8.58 usr  2.07 sys = 10.65 cpu)
 
 Testing update of keys
-Time for update_of_key (256): 17 secs ( 0.10 usr  0.16 sys =  0.26 cpu)
+Time for update_of_primary_key_many_keys (256): 17 secs ( 0.10 usr  0.16 sys =  0.26 cpu)
 
 Deleting everything from table
 Time for delete_big (2):  4 secs ( 0.00 usr  0.00 sys =  0.00 cpu)

sql-bench/Results/insert-msql-Linux_2.2.10_i686-cmp-msql,mysql

@@ -59,7 +59,7 @@ Insert into table with 5 keys and with a primary key with 5 parts
 Time for insert_key (100000): 40 wallclock secs (12.67 usr  2.51 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing update of keys
-Time for update_of_key (256): 634 wallclock secs ( 0.04 usr  0.02 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for update_of_primary_key_many_keys (256): 634 wallclock secs ( 0.04 usr  0.02 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Deleting everything from table
 Time for delete_big_many_keys (2): 676 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/insert-mysql-3.21-Linux_2.2.1_i686

@@ -43,7 +43,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (100000): 157 wallclock secs (14.40 usr  3.85 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Testing update of keys
-Time for update_of_key (256): 72 wallclock secs ( 0.03 usr  0.03 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
+Time for update_of_primary_key_many_keys (256): 72 wallclock secs ( 0.03 usr  0.03 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Deleting everything from table
 Time for delete_big (2): 133 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)

sql-bench/Results/insert-mysql-HP_UX_B.10.20_9000_778

@@ -68,7 +68,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (100000): 419 wallclock secs (35.34 usr  7.55 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing update of keys
-Time for update_of_key (256): 169 wallclock secs ( 0.05 usr  0.03 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for update_of_primary_key_many_keys (256): 169 wallclock secs ( 0.05 usr  0.03 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Deleting everything from table
 Time for delete_big_many_keys (2): 302 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

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

@@ -43,7 +43,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (10000): 15 secs ( 0.72 usr  1.30 sys =  2.02 cpu)
 
 Testing update of keys
-Time for update_of_key (256):  7 secs ( 0.02 usr  0.04 sys =  0.06 cpu)
+Time for update_of_primary_key_many_keys (256):  7 secs ( 0.02 usr  0.04 sys =  0.06 cpu)
 
 Deleting everything from table
 Time for delete_big (2):  8 secs ( 0.00 usr  0.00 sys =  0.00 cpu)

sql-bench/Results/insert-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid

@@ -43,7 +43,7 @@ Insert into table with 7 keys and with a primary key with 7 parts
 Time for insert_key (100000): 165 wallclock secs (12.53 usr  3.21 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Testing update of keys
-Time for update_of_key (256): 83 wallclock secs ( 0.02 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
+Time for update_of_primary_key_many_keys (256): 83 wallclock secs ( 0.02 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Deleting everything from table
 Time for delete_big (2): 41 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)

sql-bench/Results/insert-mysql-Linux_2.2.10_i686-cmp-msql,mysql

@@ -48,7 +48,7 @@ Insert into table with 5 keys and with a primary key with 5 parts
 Time for insert_key (100000): 80 wallclock secs (15.22 usr  2.82 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing update of keys
-Time for update_of_key (256): 31 wallclock secs ( 0.03 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for update_of_primary_key_many_keys (256): 31 wallclock secs ( 0.03 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Deleting everything from table
 Time for delete_big_many_keys (2): 35 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha

@@ -71,7 +71,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (100000): 96 wallclock secs ( 8.23 usr  5.98 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing update of keys
-Time for update_of_key (256): 21 wallclock secs ( 0.02 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for update_of_primary_key_many_keys (256): 21 wallclock secs ( 0.02 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Deleting rows from the table
 Time for delete_big_many_keys (128): 50 wallclock secs ( 0.01 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686

@@ -71,7 +71,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (100000): 154 wallclock secs (10.52 usr  4.42 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing update of keys
-Time for update_of_key (256): 65 wallclock secs ( 0.02 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for update_of_primary_key_many_keys (256): 65 wallclock secs ( 0.02 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Deleting rows from the table
 Time for delete_big_many_keys (128): 151 wallclock secs ( 0.03 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

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

@@ -50,7 +50,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (100000): 159 wallclock secs ( 8.91 usr  4.08 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing update of keys
-Time for update_of_key (256): 67 wallclock secs ( 0.00 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for update_of_primary_key_many_keys (256): 67 wallclock secs ( 0.00 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Deleting everything from table
 Time for delete_big_many_keys (2): 120 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/insert-mysql-Linux_2.2.1_i686-cmp-adabas,mysql

@@ -43,7 +43,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (10000): 12 wallclock secs ( 1.48 usr  0.37 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Testing update of keys
-Time for update_of_key (256):  6 wallclock secs ( 0.03 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
+Time for update_of_primary_key_many_keys (256):  6 wallclock secs ( 0.03 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Deleting everything from table
 Time for delete_big (2):  7 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)

sql-bench/Results/insert-mysql-NT_4.0

@@ -63,7 +63,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (100000): 1447 wallclock secs (13.78 usr 13.42 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing update of keys
-Time for update_of_key (256): 436 wallclock secs ( 0.01 usr  0.08 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for update_of_primary_key_many_keys (256): 436 wallclock secs ( 0.01 usr  0.08 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Deleting rows from the table
 Time for delete_big_many_keys (128): 1422 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/insert-mysql-SunOS_5.7_sun4m

@@ -87,7 +87,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (100000): 1988 wallclock secs (94.64 usr 58.58 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing update of keys
-Time for update_of_key (256): 349 wallclock secs ( 0.22 usr  0.17 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for update_of_primary_key_many_keys (256): 349 wallclock secs ( 0.22 usr  0.17 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Deleting rows from the table
 Time for delete_big_many_keys (128): 1460 wallclock secs ( 0.13 usr  0.15 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/insert-mysql-SunOS_5.8_sun4u

@@ -69,7 +69,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (100000): 614 wallclock secs (17.07 usr 10.23 sys +  0.00 cusr  0.00 csys = 27.30 CPU)
 
 Testing update of keys
-Time for update_of_key (256): 106 wallclock secs ( 0.01 usr  0.03 sys +  0.00 cusr  0.00 csys =  0.04 CPU)
+Time for update_of_primary_key_many_keys (256): 106 wallclock secs ( 0.01 usr  0.03 sys +  0.00 cusr  0.00 csys =  0.04 CPU)
 
 Deleting rows from the table
 Time for delete_big_many_keys (128): 299 wallclock secs ( 0.03 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.03 CPU)

sql-bench/Results/insert-mysql-win98

@@ -59,7 +59,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (100000): 364 wallclock secs (363.72 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing update of keys
-Time for update_of_key (256): 58 wallclock secs (58.22 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for update_of_primary_key_many_keys (256): 58 wallclock secs (58.22 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Deleting everything from table
 Time for delete_big_many_keys (2): 112 wallclock secs (112.11 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/insert-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql

@@ -47,7 +47,7 @@ Insert into table with 5 keys and with a primary key with 5 parts
 Time for insert_key (100000): 68 wallclock secs (13.88 usr  2.39 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing update of keys
-Time for update_of_key (256): 29 wallclock secs ( 0.02 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for update_of_primary_key_many_keys (256): 29 wallclock secs ( 0.02 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Deleting everything from table
 Time for delete_big_many_keys (2):  8 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/insert-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg

@@ -50,7 +50,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (100000): 91 wallclock secs ( 8.12 usr  4.12 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing update of keys
-Time for update_of_key (256): 54 wallclock secs ( 0.04 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for update_of_primary_key_many_keys (256): 54 wallclock secs ( 0.04 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Deleting everything from table
 Time for delete_big_many_keys (2):  1 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/insert-mysql_odbc-win98

@@ -49,7 +49,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (100000): 648 wallclock secs (648.40 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing update of keys
-Time for update_of_key (256): 110 wallclock secs (109.57 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for update_of_primary_key_many_keys (256): 110 wallclock secs (109.57 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Deleting everything from table
 Time for delete_big (2): 169 wallclock secs (168.73 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/insert-oracle-Linux_2.0.36_i686-cmp-mysql,oracle

@@ -61,7 +61,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (100000): 647 wallclock secs (78.18 usr  9.80 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Testing update of keys
-Time for update_of_key (256): 445 wallclock secs ( 0.19 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
+Time for update_of_primary_key_many_keys (256): 445 wallclock secs ( 0.19 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Deleting everything from table
 Time for delete_big (2): 544 wallclock secs ( 0.00 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)

sql-bench/Results/insert-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle

@@ -89,7 +89,7 @@ Time for insert_key (100000): 677 wallclock secs (78.14 usr  9.36 sys +  0.00 cu
 Time for book-keeping (1): 24 wallclock secs ( 0.01 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Testing update of keys
-Time for update_of_key (256): 601 wallclock secs ( 0.18 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
+Time for update_of_primary_key_many_keys (256): 601 wallclock secs ( 0.18 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Time for book-keeping (1): 111 wallclock secs ( 0.01 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 

sql-bench/Results/insert-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid

@@ -64,7 +64,7 @@ Insert into table with 7 keys and with a primary key with 7 parts
 Time for insert_key (100000): 944 wallclock secs (57.30 usr  6.79 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Testing update of keys
-Time for update_of_key (256): 3569 wallclock secs ( 0.14 usr  0.03 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
+Time for update_of_primary_key_many_keys (256): 3569 wallclock secs ( 0.14 usr  0.03 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Deleting everything from table
 Time for delete_big (2): 33 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)

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

@@ -87,7 +87,7 @@ Insert into table with 16 keys and with a primary key with 16 parts
 Time for insert_key (100000): 3693 wallclock secs (33.29 usr  5.64 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing update of keys
-Time for update_of_key (256): 1164 wallclock secs ( 0.08 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for update_of_primary_key_many_keys (256): 1164 wallclock secs ( 0.08 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Deleting rows from the table
 Time for delete_big_many_keys (128): 30 wallclock secs ( 0.07 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/insert-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid

@@ -80,7 +80,7 @@ Time for insert_key (100000): 956 wallclock secs (57.05 usr  7.08 sys +  0.00 cu
 Time for book-keeping (1): 17 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Testing update of keys
-Time for update_of_key (256): 2292 wallclock secs ( 0.21 usr  0.03 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
+Time for update_of_primary_key_many_keys (256): 2292 wallclock secs ( 0.21 usr  0.03 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Time for book-keeping (1): 1829 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 

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

@@ -71,7 +71,7 @@ NOTICE:  Vacuum: table not found
 Time for book-keeping (1):  8 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 Testing update of keys
-Time for update_of_key (256): 1491 wallclock secs ( 0.07 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
+Time for update_of_primary_key_many_keys (256): 1491 wallclock secs ( 0.07 usr  0.01 sys +  0.00 cusr  0.00 csys =  0.00 CPU)
 
 NOTICE:  Vacuum: table not found
 Time for book-keeping (1): 2489 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU)

sql-bench/Results/insert-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid

@@ -55,7 +55,7 @@ Insert into table with 7 keys and with a primary key with 7 parts
 Time for insert_key (100000): 1153 wallclock secs (85.87 usr  7.46 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Testing update of keys
-Time for update_of_key (256): 3015 wallclock secs ( 0.28 usr  0.02 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
+Time for update_of_primary_key_many_keys (256): 3015 wallclock secs ( 0.28 usr  0.02 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)
 
 Deleting everything from table
 Time for delete_big (2): 163 wallclock secs ( 0.00 usr  0.00 sys +  0.00 cusr  0.00 csys =  0.00 CPU secs)

sql-bench/test-insert.sh

@@ -1285,7 +1285,7 @@ for ($i=0 ; $i< 256; $i++)
     or die "Got error $DBI::errstr with query: update bench1 set field5=1 where field1=$i\n";
 }
 $end_time=new Benchmark;
-print "Time for update_of_key (256): " .
+print "Time for update_of_primary_key_many_keys (256): " .
   timestr(timediff($end_time, $loop_time),"all") . "\n\n";
 
 if ($server->small_rollback_segment())

sql/mysqlbinlog.cc

@@ -62,12 +62,12 @@ static struct option long_options[] =
 void sql_print_error(const char *format,...);
 
 static bool short_form = 0;
-static int offset = 0;
+static longlong offset = 0;
 static const char* host = "localhost";
 static int port = MYSQL_PORT;
 static const char* user = "test";
 static const char* pass = "";
-static long position = 0;
+static longlong position = 0;
 static bool use_remote = 0;
 static short binlog_flags = 0; 
 static MYSQL* mysql = NULL;
@@ -166,11 +166,11 @@ static int parse_args(int *argc, char*** argv)
       break;
 
     case 'o':
-      offset = atoi(optarg);
+      offset = atoll(optarg);
       break;
 
     case 'j':
-      position = atoi(optarg);
+      position = atoll(optarg);
       break;
 
     case 'h':

sql/slave.cc

@@ -526,7 +526,7 @@ int init_master_info(MASTER_INFO* mi)
 	  return 1;
 	}
 
-      mi->pos = atoi(buf);
+      mi->pos = atoll(buf);
       mi->fd = fd;
       if(init_strvar_from_file(mi->host, sizeof(mi->host), &mi->file,
 			    master_host) ||