List:Internals« Previous MessageNext Message »
From:sinisa Date:September 12 2003 4:17pm
Subject:bk commit into 4.1 tree (1.1613)
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1613 03/09/12 19:17:30 Sinisa@stripped +3 -0
  Fix for a bug #1231
  
  Parse error caused global ORDER BY to be initialized although it should
  not have been.

  sql/sql_yacc.yy
    1.264 03/09/12 19:17:24 Sinisa@stripped +6 -3
    Fix for a bug #1231
    
    Parse error caused global ORDER BY to be initialized although it should
    not have been.

  mysql-test/t/derived.test
    1.25 03/09/12 19:17:23 Sinisa@stripped +2 -0
    Fix for a bug #1231
    
    Parse error caused global ORDER BY to be initialized although it should
    not have been.

  mysql-test/r/derived.result
    1.27 03/09/12 19:17:23 Sinisa@stripped +2 -0
    Fix for a bug #1231
    
    Parse error caused global ORDER BY to be initialized although it should
    not have been.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.1

--- 1.263/sql/sql_yacc.yy	Tue Sep  9 15:23:33 2003
+++ 1.264/sql/sql_yacc.yy	Fri Sep 12 19:17:24 2003
@@ -5267,9 +5267,12 @@
 	    SELECT_LEX *sel= lex->current_select;
 	    SELECT_LEX_UNIT *unit= sel->master_unit();
 	    SELECT_LEX *fake= unit->fake_select_lex;
-	    unit->global_parameters= fake;
-	    fake->no_table_names_allowed= 1;
-	    lex->current_select= fake;
+	    if (fake)
+	    {
+	      unit->global_parameters= fake;
+	      fake->no_table_names_allowed= 1;
+	      lex->current_select= fake;
+	    }
 	    thd->where= "global ORDER clause";
 	  }
 	order_or_limit

--- 1.26/mysql-test/r/derived.result	Thu Sep  4 15:11:52 2003
+++ 1.27/mysql-test/r/derived.result	Fri Sep 12 19:17:23 2003
@@ -204,3 +204,5 @@
 a
 2
 drop table a1;
+select mail_id,  if(folder.f_description!='', folder.f_description, folder.f_name) as folder_name,  date, address_id, phrase, address,  subject from folder, (select  mail.mail_id as mail_id,  date_format(mail.h_date, '%b %e, %Y %h:%i') as date,  mail.folder_id,  sender.address_id as address_id,  sender.phrase as phrase, sender.address as address,    mail.h_subject as subject from    mail left join mxa as mxa_sender on mail.mail_id=mxa_sender.mail_id and mxa_sender.type='from' left join address as sender on mxa_sender.address_id=sender.address_id  mxa as mxa_recipient,   address as recipient, where 1     and mail.mail_id=mxa_recipient.mail_id   and mxa_recipient.address_id=recipient.address_id   and mxa_recipient.type='to'  and  match(sender.phrase, sender.address, sender.comment) against ('jeremy' in boolean mode)   and  match(recipient.phrase, recipient.address, recipient.comment) against ('monty' in boolean mode) order by mail.h_date desc limit 0, 25 ) as query where quer!
y.folder_id=folder.folder_id;
+ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near 'mxa as mxa_recipient,   address as recipient, where 1     and mail.mail_id=mxa_r' at line 1

--- 1.24/mysql-test/t/derived.test	Thu Sep  4 15:11:52 2003
+++ 1.25/mysql-test/t/derived.test	Fri Sep 12 19:17:23 2003
@@ -107,3 +107,5 @@
 use test;
 select 2 as a from (select * from a1) b;
 drop table a1;
+--error 1064
+select mail_id,  if(folder.f_description!='', folder.f_description, folder.f_name) as folder_name,  date, address_id, phrase, address,  subject from folder, (select  mail.mail_id as mail_id,  date_format(mail.h_date, '%b %e, %Y %h:%i') as date,  mail.folder_id,  sender.address_id as address_id,  sender.phrase as phrase, sender.address as address,    mail.h_subject as subject from    mail left join mxa as mxa_sender on mail.mail_id=mxa_sender.mail_id and mxa_sender.type='from' left join address as sender on mxa_sender.address_id=sender.address_id  mxa as mxa_recipient,   address as recipient, where 1     and mail.mail_id=mxa_recipient.mail_id   and mxa_recipient.address_id=recipient.address_id   and mxa_recipient.type='to'  and  match(sender.phrase, sender.address, sender.comment) against ('jeremy' in boolean mode)   and  match(recipient.phrase, recipient.address, recipient.comment) against ('monty' in boolean mode) order by mail.h_date desc limit 0, 25 ) as query where quer!
y.folder_id=folder.folder_id;
Thread
bk commit into 4.1 tree (1.1613)sinisa12 Sep