svn commit - mysqldoc@docsrva: r2187 - in trunk: . sample-data/menagerie

[paul]

Author: paul
Date: 2006-05-24 15:43:56 +0200 (Wed, 24 May 2006)
New Revision: 2187

Log:
 r10691@frost:  paul | 2006-05-24 08:41:29 -0500
 Update menagerie README.
 tabs -> spaces in .sql files.


Modified:
   trunk/
   trunk/sample-data/menagerie/README.txt
   trunk/sample-data/menagerie/cr_event_tbl.sql
   trunk/sample-data/menagerie/cr_pet_tbl.sql


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:9914
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10676
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7517
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:9914
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10691
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7517

Modified: trunk/sample-data/menagerie/README.txt
===================================================================
--- trunk/sample-data/menagerie/README.txt	2006-05-24 10:44:43 UTC (rev 2186)
+++ trunk/sample-data/menagerie/README.txt	2006-05-24 13:43:56 UTC (rev 2187)
@@ -2,77 +2,85 @@
 database that is used in the tutorial chapter of the MySQL Reference
 Manual.
 
-These instructions assume that your current working directory is the
-directory that contains the files created by unpacking the menagerie.zip
-or menagerie.tar.gz distribution, and than you invoke the MySQL programs
-(mysql and mysqlimport) from that directory.
+These instructions assume that your current working directory is
+the directory that contains the files created by unpacking the
+menagerie.zip or menagerie.tar.gz distribution. Any MySQL programs
+that you use (such as mysql or mysqlimport) should be invoked from
+that directory.
 
-To invoke mysql or mysqlimport, either specify the full pathname to the
-program, or set your PATH environment variable to the bin directory
-that contains the programs so that you can invoke them from anywhere
-without specifying the full pathname. (See your operating system's help
-instructions for environment variables.)
+To invoke mysql or mysqlimport, either specify the full pathname
+to the program, or set your PATH environment variable to the bin
+directory that contains the programs so that you can invoke them
+from anywhere without specifying their full pathname. (See your
+operating system's help instructions for environment variables.)
+The full pathname to the programs depends on where MySQL is installed.
 
 For the mysql and mysqlimport commands, supply any connection parameters
 necessary (host, user, password) on the command line before the database
-name.
+name.  For more information, see:
 
+  http://dev.mysql.com/doc/mysql/en/invoking-programs.html
+
+
 First, you must create the menagerie database.  Invoke the mysql program,
 and then issue this statement:
 
-    mysql> CREATE DATABASE menagerie;
+  mysql> CREATE DATABASE menagerie;
 
-If you use a different name for the database in the CREATE DATABASE
-statement, use that same name wherever you see menagerie in the following
-instructions.
+If you use a database name different from menagerie in the CREATE
+DATABASE statement, use that same name wherever you see menagerie
+in the following instructions.
 
 Select the menagerie database as the default database:
 
-    mysql> USE menagerie;
+  mysql> USE menagerie;
 
 Create the pet table:
 
-    mysql> SOURCE cr_pet_tbl.sql
+  mysql> SOURCE cr_pet_tbl.sql
 
 Load the pet table:
 
-    mysql> LOAD DATA LOCAL INFILE 'pet.txt' INTO TABLE pet;
+  mysql> LOAD DATA LOCAL INFILE 'pet.txt' INTO TABLE pet;
 
 To add Puffball's record, use this command:
 
-    mysql> SOURCE ins_puff_rec.sql
+  mysql> SOURCE ins_puff_rec.sql
 
 Create the event table:
 
-    mysql> SOURCE cr_event_tbl.sql
+  mysql> SOURCE cr_event_tbl.sql
 
 Load the event table:
 
-    mysql> LOAD DATA LOCAL INFILE 'event.txt' INTO TABLE event;
+  mysql> LOAD DATA LOCAL INFILE 'event.txt' INTO TABLE event;
 
 
-If you want to create and load the tables from your command interpreter,
-use the following commands after creating the menagerie database. "shell>"
+Alternate procedure:
+
+If you want to create and load the tables from your command interpreter
+(cmd.exe or command.com in Windows, or your shell in Unix), use the
+following commands after using CREATE DATABASE as shown earlier to
+create the menagerie database. In these instructions, "shell>"
 represents your command interpreter prompt.
 
 Create the pet table:
 
-    shell> mysql menagerie < cr_pet_tbl.sql
+  shell> mysql menagerie < cr_pet_tbl.sql
 
-To load the pet table, either of these commands from your command
-interpreter:
+To load the pet table, use either of these commands:
 
-    shell> mysql menagerie < load_pet_tbl.sql
-    shell> mysqlimport --local menagerie pet.txt
+  shell> mysql menagerie < load_pet_tbl.sql
+  shell> mysqlimport --local menagerie pet.txt
 
 To add Puffball's record, use this command:
 
-    shell> mysql menagerie < ins_puff_rec.sql
+  shell> mysql menagerie < ins_puff_rec.sql
 
 Create the event table:
 
-    shell> mysql menagerie < cr_event_tbl.sql
+  shell> mysql menagerie < cr_event_tbl.sql
 
 Load the event table:
 
-    shell> mysqlimport --local menagerie event.txt
+  shell> mysqlimport --local menagerie event.txt

Modified: trunk/sample-data/menagerie/cr_event_tbl.sql
===================================================================
--- trunk/sample-data/menagerie/cr_event_tbl.sql	2006-05-24 10:44:43 UTC (rev 2186)
+++ trunk/sample-data/menagerie/cr_event_tbl.sql	2006-05-24 13:43:56 UTC (rev 2187)
@@ -4,8 +4,8 @@
 
 CREATE TABLE event
 (
-	name	VARCHAR(20),
-	date	DATE,
-	type	VARCHAR(15),
-	remark	VARCHAR(255)
+  name   VARCHAR(20),
+  date   DATE,
+  type   VARCHAR(15),
+  remark VARCHAR(255)
 );

Modified: trunk/sample-data/menagerie/cr_pet_tbl.sql
===================================================================
--- trunk/sample-data/menagerie/cr_pet_tbl.sql	2006-05-24 10:44:43 UTC (rev 2186)
+++ trunk/sample-data/menagerie/cr_pet_tbl.sql	2006-05-24 13:43:56 UTC (rev 2187)
@@ -4,10 +4,10 @@
 
 CREATE TABLE pet
 (
-	name	VARCHAR(20),
-	owner	VARCHAR(20),
-	species	VARCHAR(20),
-	sex		CHAR(1),
-	birth	DATE,
-	death	DATE
+  name    VARCHAR(20),
+  owner   VARCHAR(20),
+  species VARCHAR(20),
+  sex     CHAR(1),
+  birth   DATE,
+  death   DATE
 );