diff options
| author | unknown <serg@serg.mylan> | 2004-04-06 21:35:26 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-04-06 21:35:26 +0200 |
| commit | c62705434021f8ed7b7cfdf9dbba5b1751ebd6f2 (patch) | |
| tree | 49936e67024c8911d22de045aa8314e5f88d506b /sql/sql_acl.cc | |
| parent | f463848913ab86ec9d87cb24dd77d8c17a0e1deb (diff) | |
| download | mariadb-git-c62705434021f8ed7b7cfdf9dbba5b1751ebd6f2.tar.gz | |
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
Field::val_str simplification, comment
include/my_base.h:
typos fixed
mysql-test/r/myisam.result:
alter table enable/disable keys
mysql-test/t/help.test:
cleanup
mysql-test/t/myisam.test:
alter table enable/disable keys
sql/field.cc:
Field::val_str() simplification
sql/field.h:
Field::val_str() simplification and comment
sql/field_conv.cc:
Field::val_str() simplification
sql/ha_berkeley.cc:
::reset(), HA_FAST_KEY_READ
sql/ha_berkeley.h:
::reset(), HA_FAST_KEY_READ
sql/ha_heap.cc:
::reset(), HA_FAST_KEY_READ
sql/ha_heap.h:
::reset(), HA_FAST_KEY_READ
sql/ha_innodb.cc:
::reset(), HA_FAST_KEY_READ
sql/ha_innodb.h:
::reset(), HA_FAST_KEY_READ
sql/ha_isam.cc:
::reset(), HA_FAST_KEY_READ
sql/ha_isam.h:
::reset(), HA_FAST_KEY_READ
sql/ha_isammrg.cc:
::reset(), HA_FAST_KEY_READ
sql/ha_isammrg.h:
::reset(), HA_FAST_KEY_READ
sql/ha_myisam.cc:
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
sql/ha_myisam.h:
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
sql/ha_myisammrg.cc:
::reset(), HA_FAST_KEY_READ
sql/ha_myisammrg.h:
::reset(), HA_FAST_KEY_READ
sql/handler.h:
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
sql/item.cc:
Field::val_str() simplification
sql/item_sum.cc:
Field::val_str() simplification
sql/key.cc:
Field::val_str() simplification
sql/opt_range.cc:
Field::val_str() simplification
sql/protocol.cc:
Field::val_str() simplification
sql/records.cc:
HA_FAST_KEY_READ
sql/sql_acl.cc:
Field::val_str() simplification
sql/sql_base.cc:
::reset
sql/sql_insert.cc:
::reset(), start_bulk_insert(), end_bulk_insert()
sql/sql_load.cc:
start_bulk_insert(), end_bulk_insert()
sql/sql_show.cc:
Field::val_str() simplification
sql/sql_table.cc:
disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
sql/table.cc:
Field::val_str() simplification
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 3add540f9a9..378a5be078d 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -505,7 +505,7 @@ static ulong get_access(TABLE *form, uint fieldnr) ((Field_enum*) (*pos))->typelib->count == 2 ; pos++ , bit<<=1) { - (*pos)->val_str(&res,&res); + (*pos)->val_str(&res); if (my_toupper(&my_charset_latin1, res[0]) == 'Y') access_bits|= bit; } @@ -1787,7 +1787,7 @@ public: String *res,column_name; GRANT_COLUMN *mem_check; /* As column name is a string, we don't have to supply a buffer */ - res=col_privs->field[4]->val_str(&column_name,&column_name); + res=col_privs->field[4]->val_str(&column_name); ulong priv= (ulong) col_privs->field[6]->val_int(); if (!(mem_check = new GRANT_COLUMN(*res, fix_rights_for_column(priv)))) @@ -1990,7 +1990,7 @@ static int replace_column_table(GRANT_TABLE *g_t, privileges&= ~rights; table->field[6]->store((longlong) get_rights_for_column(privileges)); - table->field[4]->val_str(&column_name,&column_name); + table->field[4]->val_str(&column_name); grant_column = column_hash_search(g_t, column_name.ptr(), column_name.length()); |