diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-25 15:07:51 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-25 15:07:51 +0200 |
| commit | db47e4ca2479a8e7bde91757fa968c462ca2a343 (patch) | |
| tree | ec47c385448c97b6f07f4d2851b745236f7e98dd /sql/item_func.h | |
| parent | f2564f616cc566be748e549e3182ce1485442db1 (diff) | |
| download | mariadb-git-db47e4ca2479a8e7bde91757fa968c462ca2a343.tar.gz | |
Added timeout for wait_for_master_pos
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
mysql-test/r/rpl000009.result:
Fixed replication test after fixing replication of DROP/CREATE DATABASE
mysql-test/t/rpl000009.test:
Fixed replication test after fixing replication of DROP/CREATE DATABASE
sql/item_create.cc:
Added timeout for wait_for_master_pos
sql/item_create.h:
Added timeout for wait_for_master_pos
sql/item_func.cc:
Added timeout for wait_for_master_pos
sql/item_func.h:
Added timeout for wait_for_master_pos
sql/lex.h:
Added timeout for wait_for_master_pos
sql/slave.h:
Added timeout for wait_for_master_pos
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
sql/sql_parse.cc:
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
sql/sql_repl.cc:
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 31310ab564e..be8ae6b57c8 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -865,9 +865,10 @@ class Item_master_pos_wait :public Item_int_func String value; public: Item_master_pos_wait(Item *a,Item *b) :Item_int_func(a,b) {} + Item_master_pos_wait(Item *a,Item *b,Item *c) :Item_int_func(a,b,c) {} longlong val_int(); const char *func_name() const { return "master_pos_wait"; } - void fix_length_and_dec() { max_length=1; maybe_null=1;} + void fix_length_and_dec() { max_length=21; maybe_null=1;} unsigned int size_of() { return sizeof(*this);} }; |