diff options
author | unknown <monty@donna.mysql.com> | 2001-01-03 00:13:19 +0200 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2001-01-03 00:13:19 +0200 |
commit | 51680c9465d403d6698277d352ab0b04d7064a49 (patch) | |
tree | b233cdafcd7303287cca1b3203deea71ca3349fb /sql | |
parent | 2dac1c9fa62ea98755b844eb136775a0e7e15f2f (diff) | |
download | mariadb-git-51680c9465d403d6698277d352ab0b04d7064a49.tar.gz |
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:
Update for 3.23.30
scripts/make_binary_distribution.sh:
Added sql/mysqld.sym.gz
sql-bench/Results-linux/RUN-mysql_dbug-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/RUN-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/insert-mysql-Linux_2.2.14_5.0_i686-cmp-interbase,mysql:
***MISSING WEAVE***
sql-bench/Results-linux/insert-mysql_dbug-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results-linux/insert-mysql_dbug_full-Linux_2.2.14_my_SMP_i686:
***MISSING WEAVE***
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
Split update_of_key into separate tests
sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Split update_of_key into separate tests
sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686:
Split update_of_key into separate tests
sql-bench/Results/RUN-mysql-SunOS_5.7_sun4m:
Split update_of_key into separate tests
sql-bench/Results/RUN-mysql-SunOS_5.8_sun4u:
Split update_of_key into separate tests
sql-bench/Results/RUN-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Split update_of_key into separate tests
sql-bench/Results/RUN-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Split update_of_key into separate tests
sql-bench/Results/insert-Adabas-Linux_2.0.35_i686-cmp-adabas,mysql:
Split update_of_key into separate tests
sql-bench/Results/insert-msql-Linux_2.2.10_i686-cmp-msql,mysql:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-3.21-Linux_2.2.1_i686:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-HP_UX_B.10.20_9000_778:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-Linux_2.0.35_i686-cmp-adabas,mysql:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-Linux_2.0.36_i686-cmp-mysql,pg,solid:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-Linux_2.2.10_i686-cmp-msql,mysql:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-Linux_2.2.1_i686-cmp-adabas,mysql:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-NT_4.0:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-SunOS_5.7_sun4m:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-SunOS_5.8_sun4u:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql-win98:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql_fast-Linux_2.2.10_i686-cmp-msql,mysql:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Split update_of_key into separate tests
sql-bench/Results/insert-mysql_odbc-win98:
Split update_of_key into separate tests
sql-bench/Results/insert-oracle-Linux_2.0.36_i686-cmp-mysql,oracle:
Split update_of_key into separate tests
sql-bench/Results/insert-oracle_fast-Linux_2.0.36_i686-cmp-mysql,oracle:
Split update_of_key into separate tests
sql-bench/Results/insert-pg-Linux_2.0.36_i686-cmp-mysql,pg,solid:
Split update_of_key into separate tests
sql-bench/Results/insert-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Split update_of_key into separate tests
sql-bench/Results/insert-pg_fast-Linux_2.0.36_i686-cmp-mysql,pg,solid:
Split update_of_key into separate tests
sql-bench/Results/insert-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Split update_of_key into separate tests
sql-bench/Results/insert-solid-Linux_2.0.36_i686-cmp-mysql,pg,solid:
Split update_of_key into separate tests
sql-bench/test-insert.sh:
Split update_of_key into separate tests
sql/mysqlbinlog.cc:
Fix for 2G files
sql/slave.cc:
Fix for 2G files
Diffstat (limited to 'sql')
-rw-r--r-- | sql/mysqlbinlog.cc | 8 | ||||
-rw-r--r-- | sql/slave.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sql/mysqlbinlog.cc b/sql/mysqlbinlog.cc index 087d1029afb..c2978db4883 100644 --- a/sql/mysqlbinlog.cc +++ b/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': diff --git a/sql/slave.cc b/sql/slave.cc index 7ba6d69a204..ffede2c3201 100644 --- a/sql/slave.cc +++ b/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) || |