List:Internals« Previous MessageNext Message »
From:sasha Date:June 4 2002 2:43am
Subject:bk commit into 4.0 tree
View as plain text  
Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated 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@stripped, 2002-06-03 20:43:46-06:00, sasha@stripped
  post-merge fixes

  mysql-test/r/func_math.result
    1.8 02/06/03 20:43:44 sasha@stripped +2 -0
    post-merge fix

  sql/mysqld.cc
    1.313 02/06/03 20:43:44 sasha@stripped +2 -0
    post-merge

  sql/sql_yacc.yy
    1.159 02/06/03 20:43:44 sasha@stripped +1 -0
    post-merge

# 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:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql-multi-master

--- 1.312/sql/mysqld.cc	Sun Jun  2 11:45:59 2002
+++ 1.313/sql/mysqld.cc	Mon Jun  3 20:43:44 2002
@@ -3053,6 +3053,7 @@
   */
   {"memlock", OPT_MEMLOCK, "Lock mysqld in memory", (gptr*) &locked_in_memory,
    (gptr*) &locked_in_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+#ifndef DBUG_OFF  
   {"disconnect-slave-event-count", OPT_DISCONNECT_SLAVE_EVENT_COUNT,
    "Undocumented: Meant for debugging and testing of replication",
    (gptr*) &disconnect_slave_event_count,
@@ -3072,6 +3073,7 @@
   {"safemalloc-mem-limit", OPT_SAFEMALLOC_MEM_LIMIT,
    "Simulate memory shortage when compiled with the --with-debug=full option",
    0, 0, 0, GET_ULL, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#endif  
   {"new", 'n', "Use very new possible 'unsafe' functions", 0, 0, 0, GET_NO_ARG,
    NO_ARG, 0, 0, 0, 0, 0, 0},
 #ifdef NOT_YET

--- 1.158/sql/sql_yacc.yy	Mon May 27 15:21:10 2002
+++ 1.159/sql/sql_yacc.yy	Mon Jun  3 20:43:44 2002
@@ -3094,6 +3094,7 @@
 	| NATIONAL_SYM		{}
 	| NCHAR_SYM		{}
 	| NEXT_SYM		{}
+	| NEW_SYM		{}
 	| NO_SYM		{}
 	| OFF			{}
 	| OPEN_SYM		{}

--- 1.7/mysql-test/r/func_math.result	Sun Jun  2 11:45:59 2002
+++ 1.8/mysql-test/r/func_math.result	Mon Jun  3 20:43:44 2002
@@ -4,8 +4,10 @@
 select ceiling(5.5),ceiling(-5.5);
 ceiling(5.5)	ceiling(-5.5)
 6	-5
+select truncate(52.64,1),truncate(52.64,2),truncate(52.64,-1),truncate(52.64,-2), truncate(-52.64,1),truncate(-52.64,-1);
 truncate(52.64,1)	truncate(52.64,2)	truncate(52.64,-1)	truncate(52.64,-2)	truncate(-52.64,1)	truncate(-52.64,-1)
 52.6	52.64	50	0	-52.6	-50
+select round(5.5),round(-5.5);
 round(5.5)	round(-5.5)
 6	-6
 select round(5.64,1),round(5.64,2),round(5.64,-1),round(5.64,-2);
Thread
bk commit into 4.0 treesasha4 Jun