Author: mcbrown
Date: 2006-09-11 17:06:07 +0200 (Mon, 11 Sep 2006)
New Revision: 3314
Log:
Fixing some width issues in program listings
Modified:
trunk/refman-5.1/custom-engine.xml
trunk/refman-5.1/installing.xml
trunk/refman-5.1/mysql-cluster.xml
trunk/refman-5.1/partitioning.xml
trunk/refman-5.1/pluggable-storage.xml
trunk/refman-5.1/se-innodb.xml
Modified: trunk/refman-5.1/custom-engine.xml
===================================================================
--- trunk/refman-5.1/custom-engine.xml 2006-09-11 12:15:44 UTC (rev 3313)
+++ trunk/refman-5.1/custom-engine.xml 2006-09-11 15:06:07 UTC (rev 3314)
Changed blocks: 8, Lines Added: 55, Lines Deleted: 34; 6439 bytes
@@ -249,7 +249,9 @@
int (*start_consistent_snapshot)(THD *thd);
bool (*flush_logs)();
bool (*show_status)(THD *thd, stat_print_fn *print, enum ha_stat_type stat);
- int (*repl_report_sent_binlog)(THD *thd, char *log_file_name, my_off_t end_offset);
+ int (*repl_report_sent_binlog)(THD *thd,
+ char *log_file_name,
+ my_off_t end_offset);
uint32 flags;
} handlerton;
</programlisting>
@@ -1025,15 +1027,24 @@
TL_UNLOCK, /* UNLOCK ANY LOCK */
TL_READ, /* Read lock */
TL_READ_WITH_SHARED_LOCKS,
- TL_READ_HIGH_PRIORITY, /* High prior. than TL_WRITE. Allow concurrent insert */
- TL_READ_NO_INSERT, /* READ, Don't allow concurrent insert */
- TL_WRITE_ALLOW_WRITE, /* Write lock, but allow other threads to read / write. */
- TL_WRITE_ALLOW_READ, /* Write lock, but allow other threads to read / write. */
- TL_WRITE_CONCURRENT_INSERT, /* WRITE lock used by concurrent insert. */
- TL_WRITE_DELAYED, /* Write used by INSERT DELAYED. Allows READ locks */
- TL_WRITE_LOW_PRIORITY, /* WRITE lock that has lower priority than TL_READ */
- TL_WRITE, /* Normal WRITE lock */
- TL_WRITE_ONLY /* Abort new lock request with an error */
+ TL_READ_HIGH_PRIORITY,
+ /* High prior. than TL_WRITE. Allow concurrent insert */
+ TL_READ_NO_INSERT,
+ /* READ, Don't allow concurrent insert */
+ TL_WRITE_ALLOW_WRITE,
+ /* Write lock, but allow other threads to read / write. */
+ TL_WRITE_ALLOW_READ,
+ /* Write lock, but allow other threads to read / write. */
+ TL_WRITE_CONCURRENT_INSERT,
+ /* WRITE lock used by concurrent insert. */
+ TL_WRITE_DELAYED,
+ /* Write used by INSERT DELAYED. Allows READ locks */
+ TL_WRITE_LOW_PRIORITY,
+ /* WRITE lock that has lower priority than TL_READ */
+ TL_WRITE,
+ /* Normal WRITE lock */
+ TL_WRITE_ONLY
+ /* Abort new lock request with an error */
};
</programlisting>
@@ -2053,7 +2064,9 @@
</para>
<programlisting>
-ha_rows ha_foo::records_in_range(uint inx, key_range *min_key, key_range *max_key)
+ha_rows ha_foo::records_in_range(uint inx,
+ key_range *min_key,
+ key_range *max_key)
</programlisting>
<para>
@@ -2207,7 +2220,10 @@
</para>
<programlisting>
-int ha_foo::index_read(byte * buf, const byte * key, uint key_len, enum ha_rkey_function find_flag)
+int ha_foo::index_read(byte * buf,
+ const byte * key,
+ uint key_len,
+ enum ha_rkey_function find_flag)
</programlisting>
<para>
@@ -8176,16 +8192,18 @@
</para>
<programlisting>
- #define HA_OPEN_KEYFILE 1
- #define HA_OPEN_RNDFILE 2
- #define HA_GET_INDEX 4
- #define HA_GET_INFO 8 /* do a ha_info() after open */
- #define HA_READ_ONLY 16 /* File opened as readonly */
- #define HA_TRY_READ_ONLY 32 /* Try readonly if can't open with read and write */
- #define HA_WAIT_IF_LOCKED 64 /* Wait if locked on open */
- #define HA_ABORT_IF_LOCKED 128 /* skip if locked on open.*/
- #define HA_BLOCK_LOCK 256 /* unlock when reading some records */
- #define HA_OPEN_TEMPORARY 512
+#define HA_OPEN_KEYFILE 1
+#define HA_OPEN_RNDFILE 2
+#define HA_GET_INDEX 4
+#define HA_GET_INFO 8 /* do a ha_info() after open */
+#define HA_READ_ONLY 16 /* File opened as readonly */
+#define HA_TRY_READ_ONLY 32
+ /* Try readonly if can't open with read and write */
+#define HA_WAIT_IF_LOCKED 64 /* Wait if locked on open */
+#define HA_ABORT_IF_LOCKED 128 /* skip if locked on open.*/
+#define HA_BLOCK_LOCK 256
+ /* unlock when reading some records */
+#define HA_OPEN_TEMPORARY 512
</programlisting>
<para>
@@ -11698,16 +11716,18 @@
</para>
<programlisting>
- #define HA_OPEN_KEYFILE 1
- #define HA_OPEN_RNDFILE 2
- #define HA_GET_INDEX 4
- #define HA_GET_INFO 8 /* do a ha_info() after open */
- #define HA_READ_ONLY 16 /* File opened as readonly */
- #define HA_TRY_READ_ONLY 32 /* Try readonly if can't open with read and write */
- #define HA_WAIT_IF_LOCKED 64 /* Wait if locked on open */
- #define HA_ABORT_IF_LOCKED 128 /* skip if locked on open.*/
- #define HA_BLOCK_LOCK 256 /* unlock when reading some records */
- #define HA_OPEN_TEMPORARY 512
+#define HA_OPEN_KEYFILE 1
+#define HA_OPEN_RNDFILE 2
+#define HA_GET_INDEX 4
+#define HA_GET_INFO 8 /* do a ha_info() after open */
+#define HA_READ_ONLY 16 /* File opened as readonly */
+#define HA_TRY_READ_ONLY 32
+ /* Try readonly if can't open with read and write */
+#define HA_WAIT_IF_LOCKED 64 /* Wait if locked on open */
+#define HA_ABORT_IF_LOCKED 128 /* skip if locked on open */
+#define HA_BLOCK_LOCK 256
+ /* unlock when reading some records */
+#define HA_OPEN_TEMPORARY 512
</programlisting>
<para>
@@ -13962,7 +13982,7 @@
scan_rows--;
statistic_increment(table->in_use->status_var.ha_read_rnd_next_count,
- &LOCK_status);
+ &LOCK_status);
current_position= gztell(archive);
rc= get_row(archive, buf);
@@ -15415,7 +15435,8 @@
</para>
<programlisting>
-for (ptr= table->s->blob_field, end= ptr + table->s->blob_fields ; ptr != end ; ptr++)
+for (ptr= table->s->blob_field, end= ptr + table->s->blob_fields ;
+ ptr != end ; ptr++)
{
char *data_ptr;
uint32 size= ((Field_blob*)table->field[*ptr])->get_length();
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-09-11 12:15:44 UTC (rev 3313)
+++ trunk/refman-5.1/installing.xml 2006-09-11 15:06:07 UTC (rev 3314)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 555 bytes
@@ -9413,7 +9413,8 @@
</para>
<programlisting>
-win\configure WITH_INNOBASE_STORAGE_ENGINE WITH_PARTITION_STORAGE_ENGINE MYSQL_SERVER_SUFFIX=-pro
+win\configure WITH_INNOBASE_STORAGE_ENGINE WITH_PARTITION_STORAGE_ENGINE »
+ MYSQL_SERVER_SUFFIX=-pro
</programlisting>
</listitem>
Modified: trunk/refman-5.1/mysql-cluster.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster.xml 2006-09-11 12:15:44 UTC (rev 3313)
+++ trunk/refman-5.1/mysql-cluster.xml 2006-09-11 15:06:07 UTC (rev 3314)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 6; 1451 bytes
@@ -13841,7 +13841,7 @@
INSERT INTO dogs VALUES
('', 'Lassie', 'collie'),
('', 'Scooby-Doo', 'Great Dane'),
- ('', 'Rin-Tin-Tin', 'German Shepherd'),
+ ('', 'Rin-Tin-Tin', Alsation),
('', 'Rosscoe', 'Mutt');
</programlisting>
@@ -13852,11 +13852,11 @@
<programlisting>
shell> <userinput>./ndb_select_all -d ctest1 dogs -o ix -z --gci --disk</userinput>
-GCI id name breed DISK_REF
-834461 2 [Scooby-Doo] [Great Dane] [ m_file_no: 0 m_page: 98 m_page_idx: 0 ]
-834878 4 [Rosscoe] [Mutt] [ m_file_no: 0 m_page: 98 m_page_idx: 16 ]
-834463 3 [Rin-Tin-Tin] [German Shepherd] [ m_file_no: 0 m_page: 34 m_page_idx: 0 ]
-835657 1 [Lassie] [Collie] [ m_file_no: 0 m_page: 66 m_page_idx: 0 ]
+GCI id name breed DISK_REF
+834461 2 [Scooby-Doo] [Great Dane] [ m_file_no: 0 m_page: 98 m_page_idx: 0 ]
+834878 4 [Rosscoe] [Mutt] [ m_file_no: 0 m_page: 98 m_page_idx: 16 ]
+834463 3 [Rin-Tin-Tin] [Alsation] [ m_file_no: 0 m_page: 34 m_page_idx: 0 ]
+835657 1 [Lassie] [Collie] [ m_file_no: 0 m_page: 66 m_page_idx: 0 ]
4 rows returned
NDBT_ProgramExit: 0 - OK
Modified: trunk/refman-5.1/partitioning.xml
===================================================================
--- trunk/refman-5.1/partitioning.xml 2006-09-11 12:15:44 UTC (rev 3313)
+++ trunk/refman-5.1/partitioning.xml 2006-09-11 15:06:07 UTC (rev 3314)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 680 bytes
@@ -2975,7 +2975,8 @@
mysql> <userinput>ALTER TABLE members</userinput>
> <userinput>ADD PARTITION (</userinput>
> <userinput>PARTITION p3 VALUES LESS THAN (1960));</userinput>
-ERROR 1463 (HY000): VALUES LESS THAN value must be strictly increasing for each partition
+ERROR 1463 (HY000): VALUES LESS THAN value must be strictly »
+ increasing for each partition
</programlisting>
<para>
Modified: trunk/refman-5.1/pluggable-storage.xml
===================================================================
--- trunk/refman-5.1/pluggable-storage.xml 2006-09-11 12:15:44 UTC (rev 3313)
+++ trunk/refman-5.1/pluggable-storage.xml 2006-09-11 15:06:07 UTC (rev 3314)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 471 bytes
@@ -229,7 +229,7 @@
</para>
<informaltable>
- <tgroup cols="7">
+ <tgroup cols="6">
<colspec colwidth="18*"/>
<colspec colwidth="12*"/>
<colspec colwidth="12*"/>
Modified: trunk/refman-5.1/se-innodb.xml
===================================================================
--- trunk/refman-5.1/se-innodb.xml 2006-09-11 12:15:44 UTC (rev 3313)
+++ trunk/refman-5.1/se-innodb.xml 2006-09-11 15:06:07 UTC (rev 3314)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 625 bytes
@@ -494,7 +494,7 @@
innodb_data_home_dir =
#
# Data files must be able to hold your data and indexes
-innodb_data_file_path = /ibdata/ibdata1:2000M;/dr2/ibdata/ibdata2:2000M:autoextend
+innodb_data_file_path = /db/ibdata1:2000M;/dr2/db/ibdata2:2000M:autoextend
#
# Set buffer pool size to 50-80% of your computer's memory,
# but make sure on Linux x86 total memory usage is < 2GB
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r3314 - trunk/refman-5.1 | mcbrown | 11 Sep |
