Merge lp:~vjsamuel/drizzle/fix-bug-850782 into lp:~drizzle-trunk/drizzle/development

[Vijay Samuel]

=== modified file 'docs/functions/current_time_functions.rst'
--- docs/functions/current_time_functions.rst	2011-03-11 15:54:41 +0000
+++ docs/functions/current_time_functions.rst	2011-09-15 14:46:27 +0000
@@ -14,40 +14,6 @@
 	SELECT CURDATE() + 0;
         	-> 20110213
 
-current_time
---------------
-
-Returns the current time as a value in 'HH:MM:SS' or HHMMSS.uuuuuu format, depending on whether the function is used in a string or numeric context. The value is expressed in the current time zone.
-
-.. code-block:: mysql
-
-	SELECT CURTIME();
-        	-> '10:30:09'
-	SELECT CURTIME() + 0;
-        	-> 103009.000000
-
-
-current_timestamp
-------------------
-
-See :ref:`now`
-
-CURRENT_TIMESTAMP() is a synonym for NOW(). 
-
-localtime
------------
-
-See :ref:`now`
-
-LOCALTIME() is a synonym for NOW(). 
-
-localtimestamp	                   
----------------
-
-See :ref:`now`
-
-LOCALTIMESTAMP() is a synonym for NOW(). 
-
 .. _now:
 
 now()	                            
@@ -92,3 +58,24 @@
 
 When using replication, the binary log will include SET TIMESTAMP entries so that a database can be restored from the binary log. In doing this, values from NOW will be adjusted to the same times as when the original SQL statements were executed. SYSDATE entries will be unaffected by SET TIMESTAMP entries.
 
+current_timestamp
+------------------
+
+See :ref:`now`
+
+CURRENT_TIMESTAMP() is a synonym for NOW(). 
+
+localtime
+-----------
+
+See :ref:`now`
+
+LOCALTIME() is a synonym for NOW(). 
+
+localtimestamp	                   
+---------------
+
+See :ref:`now`
+
+LOCALTIMESTAMP() is a synonym for NOW(). 
+