Commit 9c7412ca authored by unknown's avatar unknown
Browse files

WL#1324 table name to file name encoding 

- Encoding itself, implemented as a charset
  "filename". Originally planned to use '.'
  as an escape character, but now changed to '@'
  for two reasons: "ls" does not return
  file names starting with '.' considering them
  as a kind of hidden files; some platforms
  do not allow several dots in a file name.
- replacing many calls of my_snprintf() and
  strnxmov() to the new build_table_filename().
- Adding MY_APPEND_EXT mysys flag, to append
  an extention rather that replace it.
- Replacing all numeric constants in fn_format
  flag arguments to their mysys definitions, e.g.
  MY_UNPACK_FILENAME,
- Predictability in several function/methods:
  when a table name can appear with or withot .frm
  extension. Some functions/methods were changed
  so accept names strictly with .frm, other - strictly
  without .frm extensions. Several DBUG_ASSERTs were
  added to check whether an extension is passed.
Many files:
  table name to file name encoding
mysql_priv.h:
  Prototypes for new table name encoding tools.
ctype-utf8.c:
  Implementing "filename" charset for
  table name to file name encoding.
row0mysql.c:
  Fixing table name prefix.
mf_format.c:
  Adding MY_APPEND_EXT processing.
Many files:
  Fixing tests.
my_sys.h:
  Adding new flag to append rather than replace an extension.
m_ctype.h:
  Adding "filename" charset definition.


include/m_ctype.h:
  Adding "filename" charset definition.
include/my_sys.h:
  Adding new flag to append rather than replace an extension.
mysql-test/t/alter_table.test:
  Fixing tests.
mysql-test/t/create.test:
  Fixing tests.
mysql-test/t/show_check.test:
  Fixing tests.
mysql-test/r/alter_table.result:
  Fixing tests.
mysql-test/r/create.result:
  Fixing tests.
mysql-test/r/mysqldump.result:
  Fixing tests.
mysys/mf_format.c:
  Adding MY_APPEND_EXT processing.
sql/discover.cc:
  table name to file name encoding
sql/ha_berkeley.cc:
  table name to file name encoding
sql/ha_innodb.cc:
  table name to file name encoding
sql/ha_myisam.cc:
  table name to file name encoding
sql/ha_myisammrg.cc:
  table name to file name encoding
sql/ha_ndbcluster.cc:
  table name to file name encoding
sql/ha_partition.cc:
  table name to file name encoding
sql/handler.cc:
  table name to file name encoding.
sql/init.cc:
  table name to file name encoding
sql/mysqld.cc:
  table name to file name encoding
sql/parse_file.cc:
  table name to file name encoding
sql/sql_acl.cc:
  table name to file name encoding
sql/sql_base.cc:
  table name to file name encoding
sql/sql_db.cc:
  table name to file name encoding
sql/sql_delete.cc:
  table name to file name encoding
sql/sql_rename.cc:
  table name to file name encoding
sql/sql_show.cc:
  table name to file name encoding
sql/sql_table.cc:
  table name to file name encoding
sql/sql_trigger.cc:
  table name to file name encoding
sql/sql_view.cc:
  table name to file name encoding
sql/strfunc.cc:
  table name to file name encoding
sql/table.cc:
  table name to file name encoding
sql/unireg.cc:
  table name to file name encoding
storage/innobase/row/row0mysql.c:
  Fixing table name prefix.
  ,
storage/myisam/mi_create.c:
  table name to file name encoding
storage/myisam/mi_delete_table.c:
  table name to file name encoding
storage/myisam/mi_open.c:
  table name to file name encoding
storage/myisam/mi_rename.c:
  table name to file name encoding
strings/ctype-utf8.c:
  Implementing "filename" charset for
  table name to file name encoding.
sql/mysql_priv.h:
  Prototypes for new table name encoding tools.
storage/myisammrg/myrg_create.c:
  table name to file name encoding
storage/myisammrg/myrg_open.c:
  table name to file name encoding
parent 80d3e734

include/m_ctype.h

+1 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ extern CHARSET_INFO my_charset_ujis_bin; 
extern CHARSET_INFO my_charset_utf8_general_ci;

extern CHARSET_INFO my_charset_utf8_bin;

extern CHARSET_INFO my_charset_cp1250_czech_ci;

extern CHARSET_INFO my_charset_filename;



/* declarations for simple charsets */

extern int  my_strnxfrm_simple(CHARSET_INFO *, uchar *, uint, const uchar *,

include/my_sys.h

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ extern int NEAR my_errno; /* Last error in mysys */ 
#define MY_RETURN_REAL_PATH	32	/* return full path for file */

#define MY_SAFE_PATH		64	/* Return NULL if too long path */

#define MY_RELATIVE_PATH	128	/* name is relative to 'dir' */

#define MY_APPEND_EXT           256     /* add 'ext' as additional extension*/





	/* My seek flags */

#define MY_SEEK_SET	0

mysql-test/r/alter_table.result

+4 −4
Original line number Diff line number Diff line
@@ -373,10 +373,10 @@ t1 0 PRIMARY 2 User A 0 NULL NULL BTREE 
t1	1	Host	1	Host	A	NULL	NULL	NULL		BTREE	disabled

DROP TABLE t1;

create table t1 (a int);

alter table t1 rename to `t1\\`;

ERROR 42000: Incorrect table name 't1\\'

rename table t1 to `t1\\`;

ERROR 42000: Incorrect table name 't1\\'

alter table t1 rename to ``;

ERROR 42000: Incorrect table name ''

rename table t1 to ``;

ERROR 42000: Incorrect table name ''

drop table t1;

drop table if exists t1, t2;

Warnings:

mysql-test/r/create.result

+8 −3
Original line number Diff line number Diff line
@@ -41,7 +41,14 @@ ERROR 42000: Incorrect table definition; there can be only one auto column and i 
create table not_existing_database.test (a int);

ERROR 42000: Unknown database 'not_existing_database'

create table `a/a` (a int);

ERROR 42000: Incorrect table name 'a/a'

show create table `a/a`;

Table	Create Table

a/a	CREATE TABLE `a/a` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

create table t1 like `a/a`;

drop table `a/a`;

drop table `t1`;

create table `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa int);

ERROR 42000: Incorrect table name 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'

create table a (`aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` int);
@@ -360,8 +367,6 @@ create table t3 like non_existing_table; 
ERROR 42S02: Unknown table 'non_existing_table'

create temporary table t3 like t1;

ERROR 42S01: Table 't3' already exists

create table t3 like `a/a`;

ERROR 42000: Incorrect table name 'a/a'

drop table t1, t2, t3;

drop table t3;

drop database mysqltest;

mysql-test/r/mysqldump.result

+1 −1
Original line number Diff line number Diff line
@@ -1627,7 +1627,7 @@ mysqldump: Couldn't find table: "T_" 
test_sequence

------ Testing with illegal database names ------

mysqldump: Got error: 1049: Unknown database 'mysqldump_test_d' when selecting the database

mysqldump: Got error: 1102: Incorrect database name 'mysqld\ump_test_db' when selecting the database

mysqldump: Got error: 1049: Unknown database 'mysqld\ump_test_db' when selecting the database

drop table t1, t2, t3;

drop database mysqldump_test_db;

use test;