diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-09-21 21:36:23 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-09-21 21:36:23 +0300 |
| commit | b804e278c876314de8ff5ae10fc54ea68ca06070 (patch) | |
| tree | 082d99e224788fa31d6922be2343af244c44aed6 /sql/sql_table.cc | |
| parent | e4860747ebc5fddac571526d7c9c5e3f7452ab85 (diff) | |
| download | mariadb-git-b804e278c876314de8ff5ae10fc54ea68ca06070.tar.gz | |
Change name -> alias in TABLE_LIST.
Added missing mutex-lock around critical section in GRANT handling.
Docs/manual.texi:
ChangeLog
sql/lock.cc:
Change name -> alias in TABLE_LIST.
sql/slave.cc:
Change name -> alias in TABLE_LIST.
sql/sql_acl.cc:
Added missing mutex-lock around critical section in GRANT handling.
Changed name -> alias
sql/sql_base.cc:
Change name -> alias in TABLE_LIST.
sql/sql_insert.cc:
Change name -> alias in TABLE_LIST.
sql/sql_parse.cc:
Change name -> alias in TABLE_LIST.
sql/sql_show.cc:
Change name -> alias in TABLE_LIST.
sql/sql_table.cc:
Change name -> alias in TABLE_LIST.
sql/sql_udf.cc:
Change name -> alias in TABLE_LIST.
sql/table.h:
Change name -> alias in TABLE_LIST.
tests/grant.pl:
Fixed grant test
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index e947de553cf..c22c6ae9266 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -810,7 +810,7 @@ static int send_check_errmsg(THD* thd, TABLE_LIST* table, String* packet = &thd->packet; packet->length(0); - net_store_data(packet, table->name); + net_store_data(packet, table->alias); net_store_data(packet, (char*)operator_name); net_store_data(packet, "error"); net_store_data(packet, errmsg); @@ -835,7 +835,7 @@ static int prepare_for_restore(THD* thd, TABLE_LIST* table) { char* backup_dir = thd->lex.backup_dir; char src_path[FN_REFLEN], dst_path[FN_REFLEN]; - char* table_name = table->name; + char* table_name = table->real_name; char* db = thd->db ? thd->db : table->db; if (!fn_format(src_path, table_name, backup_dir, reg_ext, 4 + 64)) @@ -922,7 +922,7 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables, char table_name[NAME_LEN*2+2]; char* db = (table->db) ? table->db : thd->db; bool fatal_error=0; - strxmov(table_name,db ? db : "",".",table->name,NullS); + strxmov(table_name,db ? db : "",".",table->real_name,NullS); thd->open_options|= extra_open_options; table->table = open_ltable(thd, table, lock_type); @@ -1754,7 +1754,7 @@ copy_data_between_tables(TABLE *from,TABLE *to, MYF(MY_FAE | MY_ZEROFILL)); bzero((char*) &tables,sizeof(tables)); tables.table = from; - tables.name = tables.real_name= from->real_name; + tables.alias = tables.real_name= from->real_name; tables.db = from->table_cache_key; error=1; |