Merge lp:~stewart/drizzle/bug723653 into lp:drizzle

[Stewart Smith]

a bunch of docs updates from an old TODO list.

=== modified file 'docs/functions/current_time_functions.rst'
--- docs/functions/current_time_functions.rst	2012-06-22 06:36:34 +0000
+++ docs/functions/current_time_functions.rst	2013-08-08 06:26:19 +0000
@@ -1,4 +1,26 @@
 CURRENT TIME FUNCTIONS
 =======================
 
-'TODO'
 \ No newline at end of file
+====================    ================================
+Function                           Description
+====================    ================================
+NOW()                   Returns the current time (UTC)
+UTC_TIMESTAMP()         Synonym for NOW()
+CURRENT_TIMESTAMP()     Synonym for NOW()
+====================    ================================
+
+.. _now:
+
+NOW
+---
+
+You can call `NOW()`, `UTC_TIMESTAMP()` or `CURRENT_TIMESTAMP()` to get the current time. All time in Drizzle is UTC.
+
+.. code-block:: mysql
+
+	drizzle> select NOW(), UTC_TIMESTAMP(), CURRENT_TIMESTAMP()\G
+	*************************** 1. row ***************************
+                      now(): 2013-08-08 06:11:41.442568
+	    UTC_timestamp(): 2013-08-08 06:11:41.442568
+	current_timestamp(): 2013-08-08 06:11:41.442568
+	1 row in set (0.000468 sec)
 
=== modified file 'docs/functions/extract_date_functions.rst'
--- docs/functions/extract_date_functions.rst	2012-06-22 06:36:34 +0000
+++ docs/functions/extract_date_functions.rst	2013-08-08 06:26:19 +0000
@@ -8,4 +8,67 @@
 
 	EXTRACT(field FROM source)
 
-'TODO'
 \ No newline at end of file
+You can extract a field from a datetime. The fields you can extract are:
+ * YEAR
+ * YEAR_MONTH (year and month)
+ * QUARTER
+ * MONTH
+ * WEEK
+ * DAY
+ * DAY_HOUR (day and hour)
+ * DAY_MINUTE (day and minute)
+ * DAY_SECOND (day and second)
+ * HOUR
+ * HOUR_MINUTE (hour and minute)
+ * HOUR_SECOND (hour and second)
+ * MINUTE
+ * MINUTE_SECOND (minute and second)
+ * SECOND
+ * MICROSECOND
+ * DAY_MICROSECOND
+ * HOUR_MICROSECOND
+ * MINUTE_MICROSECOND
+ * SECOND_MICROSECOND
+
+Examples
+--------
+
+.. code-block:: mysql
+
+	drizzle> SELECT EXTRACT(YEAR FROM '1982-01-29');
+	+---------------------------------+
+	| EXTRACT(YEAR FROM '1982-01-29') |
+	+---------------------------------+
+	|                            1982 | 
+	+---------------------------------+
+	1 row in set (0.000494 sec)
+
+.. code-block:: mysql
+
+	drizzle> SELECT EXTRACT(MONTH FROM '1982-01-29');
+	+----------------------------------+
+	| EXTRACT(MONTH FROM '1982-01-29') |
+	+----------------------------------+
+	|                                1 | 
+	+----------------------------------+
+	1 row in set (0.000484 sec)
+
+.. code-block:: mysql
+
+	drizzle> SELECT EXTRACT(YEAR_MONTH FROM '1982-01-29');
+	+---------------------------------------+
+	| EXTRACT(YEAR_MONTH FROM '1982-01-29') |
+	+---------------------------------------+
+	|                                198201 | 
+	+---------------------------------------+
+	1 row in set (0.000492 sec)
+
+.. code-block:: mysql
+
+	drizzle> SELECT EXTRACT(SECOND_MICROSECOND FROM NOW());
+	+----------------------------------------+
+	| EXTRACT(SECOND_MICROSECOND FROM NOW()) |
+	+----------------------------------------+
+	|                               13761098 | 
+	+----------------------------------------+
+	1 row in set (0.000499 sec)
 
=== modified file 'docs/mysql_differences.rst'
--- docs/mysql_differences.rst	2012-03-08 00:54:48 +0000
+++ docs/mysql_differences.rst	2013-08-08 06:26:19 +0000
@@ -104,6 +104,10 @@
 Partitioning
 ------------
 
+Drizzle does not support table partitioning at this time. This is due to
+deficiencies in the architecture of MySQL partitioning. We think it should
+be implemented as a rewrite engine rather than a storage engine.
+
 INFORMATION_SCHEMA
 ------------------
 
@@ -134,7 +138,10 @@
 No gotcha of using the unix socket when localhost is specified and then
 connecting you to the wrong database server.
 
-There is no Drizzle admin command.
+After a survey of commands from `mysqladmin` we determined that by adding
+an option to the normal drizzle command line client to shutdown the server
+we could negate the need for a `drizzleadmin` command and so there is none.
+You can achieve all the same results via SQL.
 
 Storage Engines
 ---------------
 
=== modified file 'docs/orderby.rst'
--- docs/orderby.rst	2012-06-22 06:36:34 +0000
+++ docs/orderby.rst	2013-08-08 06:26:19 +0000
@@ -1,7 +1,11 @@
 ORDER BY
 ========
 
-'TODO'
+You can use `ORDER BY` to specify the order of the rows returned for a query.
+Without an `ORDER BY` clause, rows may be returned in any order. Some storage
+engines are more deterministic about the order they return rows than others,
+so while it may appear that you always get rows back in the same order without
+an `ORDER BY` clause, this is a coincidence.
 
 SQL ORDER BY Syntax:
 
@@ -11,4 +15,4 @@
 	FROM table_name
 	ORDER BY column_name(s) ASC|DESC;
 
-'TODO'
 \ No newline at end of file
+You can provide a list of columns and if results should be in ascending or descending order.