From 19a4a84dbc5b6589cdfe9dd90f2d92daef89b549 Mon Sep 17 00:00:00 2001
From: unknown <guilhem@gbichot2>
Date: Sat, 12 Jul 2003 23:31:21 +0200
Subject: Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS. Added PURGE
 BINARY LOGS as synonym for PURGE MASTER LOGS. Removed PURGE LOGS (now PURGE
 MASTER LOGS). Added SHOW BDB LOGS as synonym for SHOW LOGS. Note: tests
 key_cache.test hanged, rpl_log_pos.test, rpl_rotate_logs.test failed for me.
 For the second and third one I guess this will disappear after merging 4.0.

mysql-test/r/rpl_rotate_logs.result:
  result update
mysql-test/t/rpl_rotate_logs.test:
  added test for synonym PURGE BINARY LOGS, changed PURGE LOGS to
  PURGE MASTER LOGS.
sql/sql_yacc.yy:
  Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS.
  Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
  Removed PURGE LOGS (now PURGE MASTER LOGS).
  Added SHOW BDB LOGS as synonym for SHOW LOGS.
---
 mysql-test/r/rpl_rotate_logs.result |  7 ++++++-
 mysql-test/t/rpl_rotate_logs.test   |  5 ++++-
 sql/sql_yacc.yy                     | 11 ++++++++---
 3 files changed, 18 insertions(+), 5 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/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:
-- 
cgit v1.2.1


From 768ab1e47e363dffc8ee450d48ebbf976efb3d65 Mon Sep 17 00:00:00 2001
From: unknown <miguel@hegel.local>
Date: Sun, 13 Jul 2003 01:20:15 -0400
Subject: Removed unreferenced local variable

---
 sql/item_strfunc.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 2d29f76c2d7..f5cc88e2e4e 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2427,7 +2427,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;
-- 
cgit v1.2.1