diff options
| author | unknown <petr/cps@owlet.local> | 2006-08-23 16:48:39 +0400 |
|---|---|---|
| committer | unknown <petr/cps@owlet.local> | 2006-08-23 16:48:39 +0400 |
| commit | e9ef2ae59db2fee95f8567ca96fffde3115deb1e (patch) | |
| tree | 0d1cd7ed26393110ada2fa8335a375baf96cfa01 /sql/handler.cc | |
| parent | 865be0c62dae044cf6c85c0d075a7f3a934c4238 (diff) | |
| parent | 10e0b276ac4a8043abcc6cf996e5abd14208200e (diff) | |
| download | mariadb-git-e9ef2ae59db2fee95f8567ca96fffde3115deb1e.tar.gz | |
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/handler.cc:
manual merge
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index d67acf69d14..cb0f6ee323f 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -72,10 +72,10 @@ ulong savepoint_alloc_size= 0; static const LEX_STRING sys_table_aliases[]= { - {(char*)STRING_WITH_LEN("INNOBASE")}, {(char*)STRING_WITH_LEN("INNODB")}, - {(char*)STRING_WITH_LEN("NDB")}, {(char*)STRING_WITH_LEN("NDBCLUSTER")}, - {(char*)STRING_WITH_LEN("HEAP")}, {(char*)STRING_WITH_LEN("MEMORY")}, - {(char*)STRING_WITH_LEN("MERGE")}, {(char*)STRING_WITH_LEN("MRG_MYISAM")}, + { C_STRING_WITH_LEN("INNOBASE") }, { C_STRING_WITH_LEN("INNODB") }, + { C_STRING_WITH_LEN("NDB") }, { C_STRING_WITH_LEN("NDBCLUSTER") }, + { C_STRING_WITH_LEN("HEAP") }, { C_STRING_WITH_LEN("MEMORY") }, + { C_STRING_WITH_LEN("MERGE") }, { C_STRING_WITH_LEN("MRG_MYISAM") }, {NullS, 0} }; |