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

[paul]

Author: paul
Date: 2006-05-23 22:45:36 +0200 (Tue, 23 May 2006)
New Revision: 2179

Log:
 r9914@polar:  paul | 2006-05-23 15:49:02 -0500
 Revise menagerie README.


Modified:
   trunk/
   trunk/sample-data/menagerie/README.txt


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:9912
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10624
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:10624
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-23 19:17:48 UTC (rev 2178)
+++ trunk/sample-data/menagerie/README.txt	2006-05-23 20:45:36 UTC (rev 2179)
@@ -2,42 +2,77 @@
 database that is used in the tutorial chapter of the MySQL Reference
 Manual.
 
-First, you should create the database. In the mysql program, issue
-this statement:
+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.
 
+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.)
+
+For the mysql and mysqlimport commands, supply any connection parameters
+necessary (host, user, password) on the command line before the database
+name.
+
+First, you must create the menagerie database.  Invoke the mysql program,
+and then issue this statement:
+
     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
-examples.  For the mysql and mysqlimport commands, supply any connection
-parameters necessary (host, user, password) on the command line before the
-database name.
+instructions.
 
-To create the pet table:
+Select the menagerie database as the default database:
 
-    shell> mysql menagerie < cr_pet_tbl.sql
+    mysql> USE menagerie;
 
-To load the pet table, use this command in mysql:
+Create the pet table:
 
+    mysql> SOURCE cr_pet_tbl.sql
+
+Load the pet table:
+
     mysql> LOAD DATA LOCAL INFILE 'pet.txt' INTO TABLE pet;
 
-Or either of these commands from your command interpreter:
+To add Puffball's record, use this command:
 
+    mysql> SOURCE ins_puff_rec.sql
+
+Create the event table:
+
+    mysql> SOURCE cr_event_tbl.sql
+
+Load the event table:
+
+    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>"
+represents your command interpreter prompt.
+
+Create the pet table:
+
+    shell> mysql menagerie < cr_pet_tbl.sql
+
+To load the pet table, either of these commands from your command
+interpreter:
+
     shell> mysql menagerie < load_pet_tbl.sql
     shell> mysqlimport --local menagerie pet.txt
 
-To add Puffy's record, use this command:
+To add Puffball's record, use this command:
 
     shell> mysql menagerie < ins_puff_rec.sql
 
-To create the event table:
+Create the event table:
 
     shell> mysql menagerie < cr_event_tbl.sql
 
-To load the event table, use this command in mysql:
+Load the event table:
 
-    mysql> LOAD DATA LOCAL INFILE 'event.txt' INTO TABLE event;
-
-Or this command from your command interpreter:
-
     shell> mysqlimport --local menagerie event.txt