Skip to content

M
mariadb
Commit 16e86df6 authored by knielsen@production.mysql.com's avatar knielsen@production.mysql.com
Browse files
Options

Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  production.mysql.com:/usersnfs/knielsen/mysql-5.0
parents b7c11c87 44012d40
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
bdb/dist/gen_rec.awk
View file @ 16e86df6
...@@ -180,7 +180,7 @@ BEGIN { ...@@ -180,7 +180,7 @@ BEGIN {
t = types[i]; t = types[i];
if (modes[i] == "POINTER") { if (modes[i] == "POINTER") {
ndx = index(t, "*"); ndx = index(t, "*");
t = substr(types[i], 0, ndx - 2); t = substr(types[i], 1, ndx - 2);
} }
printf("\t%s\t%s;\n", t, vars[i]) >> HFILE printf("\t%s\t%s;\n", t, vars[i]) >> HFILE
} }
......
sql/sql_class.h
View file @ 16e86df6
...@@ -218,7 +218,6 @@ class MYSQL_LOG: public TC_LOG ...@@ -218,7 +218,6 @@ class MYSQL_LOG: public TC_LOG
uint file_id; uint file_id;
uint open_count; // For replication uint open_count; // For replication
int readers_count; int readers_count;
bool reset_pending;
bool write_error, inited; bool write_error, inited;
bool need_start_event; bool need_start_event;
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7