diff options
| author | unknown <venu@myvenu.com> | 2003-07-13 09:53:31 -0700 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-07-13 09:53:31 -0700 |
| commit | 0465279561895b5312d058dc560ab29f03d38cd7 (patch) | |
| tree | d8941f15db70a9aebc39e7cce8d38d60579d9704 | |
| parent | 2bc79e0876d1456471a2c66bf7edc7da546e99cf (diff) | |
| parent | 768ab1e47e363dffc8ee450d48ebbf976efb3d65 (diff) | |
| download | mariadb-git-0465279561895b5312d058dc560ab29f03d38cd7.tar.gz | |
Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
sql/item_strfunc.cc:
Auto merged
| -rw-r--r-- | mysql-test/r/rpl_rotate_logs.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/rpl_rotate_logs.test | 5 | ||||
| -rw-r--r-- | sql/item_strfunc.cc | 1 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 11 |
4 files changed, 18 insertions, 6 deletions
diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result index 66209d2b852..c3c83947578 100644 --- a/mysql-test/r/rpl_rotate_logs.result +++ b/mysql-test/r/rpl_rotate_logs.result @@ -41,11 +41,16 @@ insert into t2 values(NULL); set global sql_slave_skip_counter=1; start slave; purge master logs to 'master-bin.000002'; +show master logs; +Log_name +master-bin.000002 +master-bin.000003 +purge binary logs to 'master-bin.000002'; show binary logs; Log_name master-bin.000002 master-bin.000003 -purge logs before now(); +purge master logs before now(); show binary logs; Log_name master-bin.000003 diff --git a/mysql-test/t/rpl_rotate_logs.test b/mysql-test/t/rpl_rotate_logs.test index 8ad5109d2c6..df506c08e71 100644 --- a/mysql-test/t/rpl_rotate_logs.test +++ b/mysql-test/t/rpl_rotate_logs.test @@ -90,9 +90,12 @@ connection master; sync_slave_with_master; connection master; purge master logs to 'master-bin.000002'; +show master logs; +# we just tests if synonyms are accepted +purge binary logs to 'master-bin.000002'; show binary logs; --sleep 1; -purge logs before now(); +purge master logs before now(); show binary logs; insert into t2 values (65); sync_slave_with_master; diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 92a68002b9e..b25619d0bb1 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2428,7 +2428,6 @@ String* Item_func_export_set::val_str(String* str) void Item_func_export_set::fix_length_and_dec() { - uint i; uint length=max(args[1]->max_length,args[2]->max_length); uint sep_length=(arg_count > 3 ? args[3]->max_length : 1); max_length=length*64+sep_length*63; diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 3098bd18b2d..c836cb414e0 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3742,7 +3742,7 @@ show_param: Lex->mi.pos = $12; Lex->mi.server_id = $16; } - | BINARY LOGS_SYM + | master_or_binary LOGS_SYM { Lex->sql_command = SQLCOM_SHOW_BINLOGS; } @@ -3802,6 +3802,8 @@ show_param: { Lex->sql_command= SQLCOM_SHOW_CHARSETS; } | COLLATION_SYM wild { Lex->sql_command= SQLCOM_SHOW_COLLATIONS; } + | BERKELEY_DB_SYM LOGS_SYM + { Lex->sql_command= SQLCOM_SHOW_LOGS; } | LOGS_SYM { Lex->sql_command= SQLCOM_SHOW_LOGS; } | GRANTS FOR_SYM user @@ -3832,6 +3834,10 @@ show_param: Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT; }; +master_or_binary: + MASTER_SYM + | BINARY; + opt_db: /* empty */ { $$= 0; } | from_or_in ident { $$= $2.str; }; @@ -3949,8 +3955,7 @@ purge: ; purge_options: - LOGS_SYM purge_option - | MASTER_SYM LOGS_SYM purge_option + master_or_binary LOGS_SYM purge_option ; purge_option: |