database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into myvenu.com:/home/venu/work/sql/dev-4.1
This commit is contained in:
venu@myvenu.com
2003-07-13 09:53:31 -07:00
parent fe7dc23f97 0d3a73efb3
commit f4518cdc31
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/rpl_rotate_logs.result
View File

@ -41,11 +41,16 @@ insert into t2 values(NULL);
set global sql_slave_skip_counter=1; set global sql_slave_skip_counter=1;
start slave; start slave;
purge master logs to 'master-bin.000002'; 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; show binary logs;
Log_name Log_name
master-bin.000002 master-bin.000002
master-bin.000003 master-bin.000003
purge logs before now(); purge master logs before now();
show binary logs; show binary logs;
Log_name Log_name
master-bin.000003 master-bin.000003

5
mysql-test/t/rpl_rotate_logs.test
View File

@ -90,9 +90,12 @@ connection master;
sync_slave_with_master; sync_slave_with_master;
connection master; connection master;
purge master logs to 'master-bin.000002'; 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; show binary logs;
--sleep 1; --sleep 1;
purge logs before now(); purge master logs before now();
show binary logs; show binary logs;
insert into t2 values (65); insert into t2 values (65);
sync_slave_with_master; sync_slave_with_master;

1
sql/item_strfunc.cc
View File

@ -2428,7 +2428,6 @@ String* Item_func_export_set::val_str(String* str)
void Item_func_export_set::fix_length_and_dec() void Item_func_export_set::fix_length_and_dec()
{ {
uint i;
uint length=max(args[1]->max_length,args[2]->max_length); uint length=max(args[1]->max_length,args[2]->max_length);
uint sep_length=(arg_count > 3 ? args[3]->max_length : 1); uint sep_length=(arg_count > 3 ? args[3]->max_length : 1);
max_length=length*64+sep_length*63; max_length=length*64+sep_length*63;

11
sql/sql_yacc.yy
View File

@ -3742,7 +3742,7 @@ show_param:
Lex->mi.pos = $12; Lex->mi.pos = $12;
Lex->mi.server_id = $16; Lex->mi.server_id = $16;
} }
| BINARY LOGS_SYM | master_or_binary LOGS_SYM
{ {
Lex->sql_command = SQLCOM_SHOW_BINLOGS; Lex->sql_command = SQLCOM_SHOW_BINLOGS;
} }
@ -3802,6 +3802,8 @@ show_param:
{ Lex->sql_command= SQLCOM_SHOW_CHARSETS; } { Lex->sql_command= SQLCOM_SHOW_CHARSETS; }
| COLLATION_SYM wild | COLLATION_SYM wild
{ Lex->sql_command= SQLCOM_SHOW_COLLATIONS; } { Lex->sql_command= SQLCOM_SHOW_COLLATIONS; }
| BERKELEY_DB_SYM LOGS_SYM
{ Lex->sql_command= SQLCOM_SHOW_LOGS; }
| LOGS_SYM | LOGS_SYM
{ Lex->sql_command= SQLCOM_SHOW_LOGS; } { Lex->sql_command= SQLCOM_SHOW_LOGS; }
| GRANTS FOR_SYM user | GRANTS FOR_SYM user
@ -3832,6 +3834,10 @@ show_param:
Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT; Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
}; };
master_or_binary:
MASTER_SYM
| BINARY;
opt_db: opt_db:
/* empty */ { $$= 0; } /* empty */ { $$= 0; }
| from_or_in ident { $$= $2.str; }; | from_or_in ident { $$= $2.str; };
@ -3949,8 +3955,7 @@ purge:
; ;
purge_options: purge_options:
LOGS_SYM purge_option master_or_binary LOGS_SYM purge_option
| MASTER_SYM LOGS_SYM purge_option
; ;
purge_option: purge_option: