|
|
| Applications |
| Mailing Lists |
| Miscellaneous |
| Operating Systems |
| Programming |
bk commit into 6.0-falcon tree (hakank:1.2579)
Date: Fri Aug 31 2007 - 03:37:57 EDT
Below is the list of changes that have just been committed into a local
6.0-falcon repository of hakan. When hakan does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@1.2579, 2007-08-31 09:37:52+02:00, hakank@lu0011.wdf.sap.corp +7 -0 After merge fixes.
mysys/charset.c@1.154, 2007-08-31 09:37:48+02:00, hakank@lu0011.wdf.sap.corp +2 -2 After merge fixes.
scripts/mysql_system_tables.sql@1.12, 2007-08-31 09:37:48+02:00, hakank@lu0011.wdf.sap.corp +19 -0 After merge fixes.
sql/sql_yacc.yy@1.577, 2007-08-31 09:37:48+02:00, hakank@lu0011.wdf.sap.corp +70 -0 After merge fixes.
storage/falcon/InfoTable.cpp@1.7, 2007-08-31 09:37:48+02:00, hakank@lu0011.wdf.sap.corp +1 -1 After merge fixes.
storage/falcon/InfoTable.h@1.8, 2007-08-31 09:37:48+02:00, hakank@lu0011.wdf.sap.corp +2 -2 After merge fixes.
storage/falcon/ha_falcon.cpp@1.218, 2007-08-31 09:37:48+02:00, hakank@lu0011.wdf.sap.corp +61 -61 After merge fixes.
strings/ctype-gbk.c@1.86, 2007-08-31 09:37:48+02:00, hakank@lu0011.wdf.sap.corp +1 -1 After merge fixes.
diff -Nrup a/mysys/charset.c b/mysys/charset.c
--- a/mysys/charset.c 2007-08-30 23:28:51 +02:00@@ -63,6 +63,25 @@ CREATE TABLE IF NOT EXISTS proc (db char
+++ b/mysys/charset.c 2007-08-31 09:37:48 +02:00
@@ -242,8 +242,8 @@ static int add_collation(CHARSET_INFO *c if (cs_copy_data(all_charsets[cs->number],cs)) return MY_XML_ERROR; - new->levels_for_compare= 1; - new->levels_for_order= 1;
+ newcs->levels_for_compare= 1;
+ newcs->levels_for_order= 1;
if (!strcmp(cs->csname,"ucs2") ) { diff -Nrup a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql --- a/scripts/mysql_system_tables.sql 2007-08-30 23:50:05 +02:00
+++ b/scripts/mysql_system_tables.sql 2007-08-31 09:37:48 +02:00
CREATE TABLE IF NOT EXISTS procs_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Routine_name char(64) binary DEFAULT '' NOT NULL, Routine_type enum('FUNCTION','PROCEDURE') NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Timestamp timestamp, PRIMARY KEY (Host,Db,User,Routine_name,Routine_type), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Procedure privileges';
+-- Create general_log if CSV is enabled.
+
+SET @str = IF (@@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS general_log (event_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT, thread_id INTEGER, server_id INTEGER, command_type VARCHAR(64), argument MEDIUMTEXT) engine=CSV CHARACTER SET utf8 comment="General log"', 'SET @dummy = 0');
+
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;
+
+-- Create slow_log if CSV is enabled.
+
+SET @str = IF (@@have_csv = 'YES', 'CREATE TABLE IF NOT EXISTS slow_log (start_time TIMESTAMP NOT NULL, user_host MEDIUMTEXT NOT NULL, query_time TIME NOT NULL, lock_time TIME NOT NULL, rows_sent INTEGER NOT NULL, rows_examined INTEGER NOT NULL, db VARCHAR(512), last_insert_id INTEGER, insert_id INTEGER, server_id INTEGER, sql_text MEDIUMTEXT NOT NULL) engine=CSV CHARACTER SET utf8 comment="Slow log"', 'SET @dummy = 0');
+
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;
+
+CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', name char(64) CHARACTER SET utf8 NOT NULL default '', body longblob NOT NULL, definer char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', execute_at DATETIME default NULL, interval_value int(11) default NULL, interval_field ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') default NULL, created TIMESTAMP NOT NULL, modified TIMESTAMP NOT NULL, last_executed DATETIME default NULL, starts DATETIME default NULL, ends DATETIME default NULL, status ENUM('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL default 'ENABLED', on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP', sql_mode set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','N
OT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') DEFAULT '' NOT NULL, comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', originator int(10) NOT NULL, time_zone char(64) CHARACTER SET latin1 NOT NULL DEFAULT 'SYSTEM', character_set_client char(32) collate utf8_bin, collation_connection char(32) collate utf8_bin, db_collation char(32) collate utf8_bin, body_utf8 longblob, PRIMARY KEY (db, name) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';
+
+
CREATE TABLE IF NOT EXISTS ndb_binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM;
diff -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy 2007-08-30 23:50:05 +02:00+
+++ b/sql/sql_yacc.yy 2007-08-31 09:37:48 +02:00
@@ -5170,6 +5170,74 @@ opt_bin_charset: | charset charset_name { Lex->charset=$2; } ;
+ws_nweights:
+ '(' real_ulong_num
+ {
+ if ($2 == 0)
+ {
+ my_parse_error(ER(ER_SYNTAX_ERROR));
+ MYSQL_YYABORT;
+ }
+ }
+ ')'
+ { $$= $2; }
+ ;
+ws_level_flag_desc:
+ ASC { $$= 0; }
+ | DESC { $$= 1 << MY_STRXFRM_DESC_SHIFT; }
+ ;
+
+ws_level_flag_reverse:
+ REVERSE_SYM { $$= 1 << MY_STRXFRM_REVERSE_SHIFT; } ;
+
+ws_level_flags:
+ /* empty */ { $$= 0; }
+ | ws_level_flag_desc { $$= $1; }
+ | ws_level_flag_desc ws_level_flag_reverse { $$= $1 | $2; }
+ | ws_level_flag_reverse { $$= $1 ; }
+ ;
+
+ws_level_number:
+ real_ulong_num
+ {
+ $$= $1 < 1 ? 1 : ($1 > MY_STRXFRM_NLEVELS ? MY_STRXFRM_NLEVELS : $1);
+ $$--;
+ }
+ ;
+
+ws_level_list_item:
+ ws_level_number ws_level_flags
+ {
+ $$= (1 | $2) << $1;
+ }
+ ;
+
+ws_level_list:
+ ws_level_list_item { $$= $1; }
+ | ws_level_list ',' ws_level_list_item { $$|= $3; }
+ ;
+
+ws_level_range:
+ ws_level_number '-' ws_level_number
+ {
+ uint start= $1;
+ uint end= $3;
+ for ($$= 0; start <= end; start++)
+ $$|= (1 << start);
+ }
+ ;
+
+ws_level_list_or_range:
+ ws_level_list { $$= $1; }
+ | ws_level_range { $$= $1; }
+ ;
+
+opt_ws_levels:
+ /* empty*/ { $$= 0; }
+ | LEVEL_SYM ws_level_list_or_range { $$= $2; }
+ ;
+
opt_primary:
/* empty */
| PRIMARY_SYM
@@ -10575,6 +10643,7 @@ keyword_sp:
| RESOURCES {}
| RESUME_SYM {}
| RETURNS_SYM {}
+ | REVERSE_SYM {}
| ROLLUP_SYM {}
| ROUTINE_SYM {}
| ROWS_SYM {}
@@ -10636,6 +10705,7 @@ keyword_sp:
| WARNINGS {}
| WAIT_SYM {}
| WEEK_SYM {}
+ | WEIGHT_STRING_SYM {}
| WORK_SYM {}
| X509_SYM {}
| YEAR_SYM {}
diff -Nrup a/storage/falcon/InfoTable.cpp b/storage/falcon/InfoTable.cpp
--- a/storage/falcon/InfoTable.cpp 2007-04-23 15:50:35 +02:00
+++ b/storage/falcon/InfoTable.cpp 2007-08-31 09:37:48 +02:00
@@ -22,7 +22,7 @@
#include "mysql_priv.h"
#include "InfoTable.h"
-InfoTableImpl::InfoTableImpl(THD *thd, st_table_list *tables, charset_info_st *scs)
+InfoTableImpl::InfoTableImpl(THD *thd, TABLE_LIST *tables, charset_info_st *scs)
{
table = tables->table; mySqlThread = thd; diff -Nrup a/storage/falcon/InfoTable.h b/storage/falcon/InfoTable.h --- a/storage/falcon/InfoTable.h 2007-07-06 17:49:06 +02:00@@ -24,7 +24,7 @@ typedef long long INT64;
+++ b/storage/falcon/InfoTable.h 2007-08-31 09:37:48 +02:00
class THD;
struct charset_info_st;
-struct st_table_list;
+struct TABLE_LIST;
struct st_table;
class InfoTable
@@ -42,7 +42,7 @@ public:
class InfoTableImpl : public InfoTable
{
public:
- InfoTableImpl(THD *thd, st_table_list *tables, charset_info_st *scs);
+ InfoTableImpl(THD *thd, TABLE_LIST *tables, charset_info_st *scs);
virtual ~InfoTableImpl(void);
virtual void putRecord(void);
diff -Nrup a/storage/falcon/ha_falcon.cpp b/storage/falcon/ha_falcon.cpp
--- a/storage/falcon/ha_falcon.cpp 2007-08-28 18:58:01 +02:00
+++ b/storage/falcon/ha_falcon.cpp 2007-08-31 09:37:48 +02:00
@@ -2346,12 +2346,12 @@ int NfsPluginHandler::call_fillSystemMem
ST_FIELD_INFO memoryDetailFieldInfo[]=
{
- {"FILE", 120, MYSQL_TYPE_STRING, 0, 0, "File"},
- {"LINE", 4, MYSQL_TYPE_LONG, 0, 0, "Line"},
- {"OBJECTS_IN_USE", 4, MYSQL_TYPE_LONG, 0, 0, "Objects in Use"},
- {"SPACE_IN_USE", 4, MYSQL_TYPE_LONG, 0, 0, "Space in Use"},
- {"OBJECTS_DELETED", 4, MYSQL_TYPE_LONG, 0, 0, "Objects Deleted"},
- {"SPACE_DELETED", 4, MYSQL_TYPE_LONG, 0, 0, "Space Deleted"},
+ {"FILE", 120, MYSQL_TYPE_STRING, 0, 0, "File", SKIP_OPEN_TABLE},
+ {"LINE", 4, MYSQL_TYPE_LONG, 0, 0, "Line", SKIP_OPEN_TABLE},
+ {"OBJECTS_IN_USE", 4, MYSQL_TYPE_LONG, 0, 0, "Objects in Use", SKIP_OPEN_TABLE},
+ {"SPACE_IN_USE", 4, MYSQL_TYPE_LONG, 0, 0, "Space in Use", SKIP_OPEN_TABLE},
+ {"OBJECTS_DELETED", 4, MYSQL_TYPE_LONG, 0, 0, "Objects Deleted", SKIP_OPEN_TABLE},
+ {"SPACE_DELETED", 4, MYSQL_TYPE_LONG, 0, 0, "Space Deleted", SKIP_OPEN_TABLE},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
@@ -2389,12 +2389,12 @@ int NfsPluginHandler::call_fillSystemMem
ST_FIELD_INFO memorySummaryFieldInfo[]= {
- {"TOTAL_SPACE", 4, MYSQL_TYPE_LONGLONG, 0, 0, "Total Space"},
- {"FREE_SPACE", 4, MYSQL_TYPE_LONGLONG, 0, 0, "Free Space"},
- {"FREE_SEGMENTS", 4, MYSQL_TYPE_LONG, 0, 0, "Free Segments"},
- {"BIG_HUNKS", 4, MYSQL_TYPE_LONG, 0, 0, "Big Hunks"},
- {"SMALL_HUNKS", 4, MYSQL_TYPE_LONG, 0, 0, "Small Hunks"},
- {"UNIQUE_SIZES", 4, MYSQL_TYPE_LONG, 0, 0, "Unique Sizes"},
+ {"TOTAL_SPACE", 4, MYSQL_TYPE_LONGLONG, 0, 0, "Total Space", SKIP_OPEN_TABLE},
+ {"FREE_SPACE", 4, MYSQL_TYPE_LONGLONG, 0, 0, "Free Space", SKIP_OPEN_TABLE},
+ {"FREE_SEGMENTS", 4, MYSQL_TYPE_LONG, 0, 0, "Free Segments", SKIP_OPEN_TABLE},
+ {"BIG_HUNKS", 4, MYSQL_TYPE_LONG, 0, 0, "Big Hunks", SKIP_OPEN_TABLE},
+ {"SMALL_HUNKS", 4, MYSQL_TYPE_LONG, 0, 0, "Small Hunks", SKIP_OPEN_TABLE},
+ {"UNIQUE_SIZES", 4, MYSQL_TYPE_LONG, 0, 0, "Unique Sizes", SKIP_OPEN_TABLE},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
@@ -2432,12 +2432,12 @@ int NfsPluginHandler::call_fillRecordCac
ST_FIELD_INFO recordDetailFieldInfo[]=
{
- {"FILE", 120, MYSQL_TYPE_STRING, 0, 0, "File"},
- {"LINE", 4, MYSQL_TYPE_LONG, 0, 0, "Line"},
- {"OBJECTS_IN_USE", 4, MYSQL_TYPE_LONG, 0, 0, "Objects in Use"},
- {"SPACE_IN_USE", 4, MYSQL_TYPE_LONG, 0, 0, "Space in Use"},
- {"OBJECTS_DELETED", 4, MYSQL_TYPE_LONG, 0, 0, "Objects Deleted"},
- {"SPACE_DELETED", 4, MYSQL_TYPE_LONG, 0, 0, "Space Deleted"},
+ {"FILE", 120, MYSQL_TYPE_STRING, 0, 0, "File", SKIP_OPEN_TABLE},
+ {"LINE", 4, MYSQL_TYPE_LONG, 0, 0, "Line", SKIP_OPEN_TABLE},
+ {"OBJECTS_IN_USE", 4, MYSQL_TYPE_LONG, 0, 0, "Objects in Use", SKIP_OPEN_TABLE},
+ {"SPACE_IN_USE", 4, MYSQL_TYPE_LONG, 0, 0, "Space in Use", SKIP_OPEN_TABLE},
+ {"OBJECTS_DELETED", 4, MYSQL_TYPE_LONG, 0, 0, "Objects Deleted", SKIP_OPEN_TABLE},
+ {"SPACE_DELETED", 4, MYSQL_TYPE_LONG, 0, 0, "Space Deleted", SKIP_OPEN_TABLE},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
@@ -2475,12 +2475,12 @@ int NfsPluginHandler::call_fillRecordCac
ST_FIELD_INFO recordSummaryFieldInfo[]= {
- {"TOTAL_SPACE", 4, MYSQL_TYPE_LONGLONG, 0, 0, "Total Space"},
- {"FREE_SPACE", 4, MYSQL_TYPE_LONGLONG, 0, 0, "Free Space"},
- {"FREE_SEGMENTS", 4, MYSQL_TYPE_LONG, 0, 0, "Free Segments"},
- {"BIG_HUNKS", 4, MYSQL_TYPE_LONG, 0, 0, "Big Hunks"},
- {"SMALL_HUNKS", 4, MYSQL_TYPE_LONG, 0, 0, "Small Hunks"},
- {"UNIQUE_SIZES", 4, MYSQL_TYPE_LONG, 0, 0, "Unique Sizes"},
+ {"TOTAL_SPACE", 4, MYSQL_TYPE_LONGLONG, 0, 0, "Total Space", SKIP_OPEN_TABLE},
+ {"FREE_SPACE", 4, MYSQL_TYPE_LONGLONG, 0, 0, "Free Space", SKIP_OPEN_TABLE},
+ {"FREE_SEGMENTS", 4, MYSQL_TYPE_LONG, 0, 0, "Free Segments", SKIP_OPEN_TABLE},
+ {"BIG_HUNKS", 4, MYSQL_TYPE_LONG, 0, 0, "Big Hunks", SKIP_OPEN_TABLE},
+ {"SMALL_HUNKS", 4, MYSQL_TYPE_LONG, 0, 0, "Small Hunks", SKIP_OPEN_TABLE},
+ {"UNIQUE_SIZES", 4, MYSQL_TYPE_LONG, 0, 0, "Unique Sizes", SKIP_OPEN_TABLE},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
@@ -2518,13 +2518,13 @@ int NfsPluginHandler::call_fillDatabaseI
ST_FIELD_INFO databaseIOFieldInfo[]=
{
- {"DATABASE", 120, MYSQL_TYPE_STRING, 0, 0, "Database"},
- {"PAGE_SIZE", 4, MYSQL_TYPE_LONG, 0, 0, "Page Size"},
- {"BUFFERS", 4, MYSQL_TYPE_LONG, 0, 0, "Buffers"},
- {"PHYSICAL_READS", 4, MYSQL_TYPE_LONG, 0, 0, "Physical Reads"},
- {"WRITES", 4, MYSQL_TYPE_LONG, 0, 0, "Writes"},
- {"LOGICAL_READS", 4, MYSQL_TYPE_LONG, 0, 0, "Logical Reads"},
- {"FAKES", 4, MYSQL_TYPE_LONG, 0, 0, "Fakes"},
+ {"DATABASE", 120, MYSQL_TYPE_STRING, 0, 0, "Database", SKIP_OPEN_TABLE},
+ {"PAGE_SIZE", 4, MYSQL_TYPE_LONG, 0, 0, "Page Size", SKIP_OPEN_TABLE},
+ {"BUFFERS", 4, MYSQL_TYPE_LONG, 0, 0, "Buffers", SKIP_OPEN_TABLE},
+ {"PHYSICAL_READS", 4, MYSQL_TYPE_LONG, 0, 0, "Physical Reads", SKIP_OPEN_TABLE},
+ {"WRITES", 4, MYSQL_TYPE_LONG, 0, 0, "Writes", SKIP_OPEN_TABLE},
+ {"LOGICAL_READS", 4, MYSQL_TYPE_LONG, 0, 0, "Logical Reads", SKIP_OPEN_TABLE},
+ {"FAKES", 4, MYSQL_TYPE_LONG, 0, 0, "Fakes", SKIP_OPEN_TABLE},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
@@ -2557,9 +2557,9 @@ int NfsPluginHandler::callTablesInfo(THD
ST_FIELD_INFO tablesFieldInfo[]=
{
- {"SCHEMA_NAME", 127, MYSQL_TYPE_STRING, 0, 0, "Schema Name"},
- {"TABLE_NAME", 127, MYSQL_TYPE_STRING, 0, 0, "Table Name"},
- {"TABLESPACE", 127, MYSQL_TYPE_STRING, 0, 0, "Tablespace"},
+ {"SCHEMA_NAME", 127, MYSQL_TYPE_STRING, 0, 0, "Schema Name", SKIP_OPEN_TABLE},
+ {"TABLE_NAME", 127, MYSQL_TYPE_STRING, 0, 0, "Table Name", SKIP_OPEN_TABLE},
+ {"TABLESPACE", 127, MYSQL_TYPE_STRING, 0, 0, "Tablespace", SKIP_OPEN_TABLE},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
@@ -2597,17 +2597,17 @@ int NfsPluginHandler::callTransactionInf
ST_FIELD_INFO transactionInfoFieldInfo[]= {
- {"DATABASE", 120, MYSQL_TYPE_STRING, 0, 0, "Database"},
- {"THREAD_ID", 4, MYSQL_TYPE_LONG, 0, 0, "Thread Id"},
- {"ID", 4, MYSQL_TYPE_LONG, 0, 0, "Id"},
- {"STATE", 10, MYSQL_TYPE_STRING, 0, 0, "State"},
- {"UPDATES", 4, MYSQL_TYPE_LONG, 0, 0, "Has Updates"},
- {"PENDING", 4, MYSQL_TYPE_LONG, 0, 0, "Write Pending"},
- {"DEP", 4, MYSQL_TYPE_LONG, 0, 0, "Dependencies"},
- {"OLDEST", 4, MYSQL_TYPE_LONG, 0, 0, "Oldest Active"},
- {"RECORDS", 4, MYSQL_TYPE_LONG, 0, 0, "Has Records"},
- {"WAITING_FOR", 4, MYSQL_TYPE_LONG, 0, 0, "Waiting For"},
- {"STATEMENT", 120, MYSQL_TYPE_STRING, 0, 0, "Statement"},
+ {"DATABASE", 120, MYSQL_TYPE_STRING, 0, 0, "Database", SKIP_OPEN_TABLE},
+ {"THREAD_ID", 4, MYSQL_TYPE_LONG, 0, 0, "Thread Id", SKIP_OPEN_TABLE},
+ {"ID", 4, MYSQL_TYPE_LONG, 0, 0, "Id", SKIP_OPEN_TABLE},
+ {"STATE", 10, MYSQL_TYPE_STRING, 0, 0, "State", SKIP_OPEN_TABLE},
+ {"UPDATES", 4, MYSQL_TYPE_LONG, 0, 0, "Has Updates", SKIP_OPEN_TABLE},
+ {"PENDING", 4, MYSQL_TYPE_LONG, 0, 0, "Write Pending", SKIP_OPEN_TABLE},
+ {"DEP", 4, MYSQL_TYPE_LONG, 0, 0, "Dependencies", SKIP_OPEN_TABLE},
+ {"OLDEST", 4, MYSQL_TYPE_LONG, 0, 0, "Oldest Active", SKIP_OPEN_TABLE},
+ {"RECORDS", 4, MYSQL_TYPE_LONG, 0, 0, "Has Records", SKIP_OPEN_TABLE},
+ {"WAITING_FOR", 4, MYSQL_TYPE_LONG, 0, 0, "Waiting For", SKIP_OPEN_TABLE},
+ {"STATEMENT", 120, MYSQL_TYPE_STRING, 0, 0, "Statement", SKIP_OPEN_TABLE},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
@@ -2645,12 +2645,12 @@ int NfsPluginHandler::callTransactionSum
ST_FIELD_INFO transactionInfoFieldSummaryInfo[]= {
- {"DATABASE", 120, MYSQL_TYPE_STRING, 0, 0, "Database"},
- {"COMMITTED", 4, MYSQL_TYPE_LONG, 0, 0, "Committed Transaction."},
- {"ROLLED_BACK", 4, MYSQL_TYPE_LONG, 0, 0, "Transactions Rolled Back."},
- {"ACTIVE", 4, MYSQL_TYPE_LONG, 0, 0, "Active Transactions"},
- {"PENDING_COMMIT", 4, MYSQL_TYPE_LONG, 0, 0, "Transaction Pending Commit"},
- {"PENDING_COMPLETION",4, MYSQL_TYPE_LONG, 0, 0, "Transaction Pending Completion"},
+ {"DATABASE", 120, MYSQL_TYPE_STRING, 0, 0, "Database", SKIP_OPEN_TABLE},
+ {"COMMITTED", 4, MYSQL_TYPE_LONG, 0, 0, "Committed Transaction.", SKIP_OPEN_TABLE},
+ {"ROLLED_BACK", 4, MYSQL_TYPE_LONG, 0, 0, "Transactions Rolled Back.", SKIP_OPEN_TABLE},
+ {"ACTIVE", 4, MYSQL_TYPE_LONG, 0, 0, "Active Transactions", SKIP_OPEN_TABLE},
+ {"PENDING_COMMIT", 4, MYSQL_TYPE_LONG, 0, 0, "Transaction Pending Commit", SKIP_OPEN_TABLE},
+ {"PENDING_COMPLETION",4, MYSQL_TYPE_LONG, 0, 0, "Transaction Pending Completion", SKIP_OPEN_TABLE},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
@@ -2689,11 +2689,11 @@ int NfsPluginHandler::callSerialLogInfo(
ST_FIELD_INFO serialSerialLogFieldInfo[]= {
- {"DATABASE", 120, MYSQL_TYPE_STRING, 0, 0, "Database"},
- {"TRANSACTIONS", 4, MYSQL_TYPE_LONG, 0, 0, "Transactions"},
- {"BLOCKS", 8, MYSQL_TYPE_LONGLONG, 0, 0, "Blocks"},
- {"WINDOWS", 4, MYSQL_TYPE_LONG, 0, 0, "Windows"},
- {"BUFFERS", 4, MYSQL_TYPE_LONG, 0, 0, "Buffers"},
+ {"DATABASE", 120, MYSQL_TYPE_STRING, 0, 0, "Database", SKIP_OPEN_TABLE},
+ {"TRANSACTIONS", 4, MYSQL_TYPE_LONG, 0, 0, "Transactions", SKIP_OPEN_TABLE},
+ {"BLOCKS", 8, MYSQL_TYPE_LONGLONG, 0, 0, "Blocks", SKIP_OPEN_TABLE},
+ {"WINDOWS", 4, MYSQL_TYPE_LONG, 0, 0, "Windows", SKIP_OPEN_TABLE},
+ {"BUFFERS", 4, MYSQL_TYPE_LONG, 0, 0, "Buffers", SKIP_OPEN_TABLE},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
@@ -2732,11 +2732,11 @@ int NfsPluginHandler::callSyncInfo(THD *
ST_FIELD_INFO syncInfoFieldInfo[]=
{
- {"CALLER", 120, MYSQL_TYPE_STRING, 0, 0, "Caller"},
- {"SHARED", 4, MYSQL_TYPE_LONG, 0, 0, "Shared"},
- {"EXCLUSIVE", 4, MYSQL_TYPE_LONG, 0, 0, "Exclusive"},
- {"WAITS", 4, MYSQL_TYPE_LONG, 0, 0, "Waits"},
- {"QUEUE_LENGTH", 4, MYSQL_TYPE_LONG, 0, 0, "Queue Length"},
+ {"CALLER", 120, MYSQL_TYPE_STRING, 0, 0, "Caller", SKIP_OPEN_TABLE},
+ {"SHARED", 4, MYSQL_TYPE_LONG, 0, 0, "Shared", SKIP_OPEN_TABLE},
+ {"EXCLUSIVE", 4, MYSQL_TYPE_LONG, 0, 0, "Exclusive", SKIP_OPEN_TABLE},
+ {"WAITS", 4, MYSQL_TYPE_LONG, 0, 0, "Waits", SKIP_OPEN_TABLE},
+ {"QUEUE_LENGTH", 4, MYSQL_TYPE_LONG, 0, 0, "Queue Length", SKIP_OPEN_TABLE},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
};
diff -Nrup a/strings/ctype-gbk.c b/strings/ctype-gbk.c
--- a/strings/ctype-gbk.c 2007-08-30 23:50:06 +02:00
+++ b/strings/ctype-gbk.c 2007-08-31 09:37:48 +02:00
@@ -10089,7 +10089,7 @@ CHARSET_INFO my_charset_gbk_bin= 0, /* min_sort_char */ 255, /* max_sort_char */ ' ', /* pad char */ -
+ 1, /* escape_with_backslash_is_dangerous */
1, /* levels_for_compare */ 1, /* levels_for_order */ &my_charset_handler,
-- MySQL Code Commits Mailing List For list archives: http://lists.mysql.com/commits To unsubscribe: http://lists.mysql.com/commits?unsub=lists@pantek.comReceived on Fri Aug 31 04:59:06 2007
This archive was generated by hypermail 2.1.8 : Sun Oct 07 2007 - 09:01:06 EDT
|
Contact Us Legal Notices Order Services Online Pantek Home Privacy Policy IT news Site Map Pantek Library |