Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
a885c2e6
Commit
a885c2e6
authored
Jun 05, 2006
by
anjuta@arthur.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into arthur.local:/home/my/mysql-5.0
parents
bd8eef56
16a31b39
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
53 additions
and
14 deletions
+53
-14
.bzrignore
.bzrignore
+12
-10
include/config-win.h
include/config-win.h
+1
-0
include/my_global.h
include/my_global.h
+0
-1
mysql-test/r/create.result
mysql-test/r/create.result
+14
-0
mysql-test/t/create.test
mysql-test/t/create.test
+15
-0
mysys/mf_fn_ext.c
mysys/mf_fn_ext.c
+3
-3
sql/table.cc
sql/table.cc
+8
-0
No files found.
.bzrignore
View file @
a885c2e6
...
...
@@ -276,6 +276,7 @@ bkpush.log
bkpush.log*
build.log
build_tags.sh
client/#mysql.cc#
client/*.ds?
client/*.vcproj
client/completion_hash.cpp
...
...
@@ -290,6 +291,7 @@ client/my_decimal.h
client/my_user.c
client/mysql
client/mysql.cpp
client/mysql_upgrade
client/mysqladmin
client/mysqladmin.c
client/mysqladmin.cpp
...
...
@@ -365,6 +367,9 @@ extra/resolve_stack_dump
extra/resolveip
extra/sql_state.h
extra/tztime.cc
extra/yassl/taocrypt/benchmark/benchmark
extra/yassl/taocrypt/test/test
extra/yassl/testsuite/testsuite
fcns.c
fcns.h
gdbinit
...
...
@@ -382,6 +387,7 @@ include/my_global.h
include/mysql_version.h
include/mysqld_ername.h
include/mysqld_error.h
include/openssl
include/readline
include/readline/*.h
include/readline/readline.h
...
...
@@ -672,6 +678,7 @@ mysql-test/r/bdb-alter-table-2.err
mysql-test/r/bdb-crash.err
mysql-test/r/bdb-deadlock.err
mysql-test/r/bdb.err
mysql-test/r/bdb.log
mysql-test/r/bdb_cache.err
mysql-test/r/client_test.err
mysql-test/r/csv.err
...
...
@@ -679,6 +686,7 @@ mysql-test/r/ctype_ucs.err
mysql-test/r/derived.err
mysql-test/r/exampledb.err
mysql-test/r/func_encrypt.err
mysql-test/r/im_client_port.log
mysql-test/r/index_merge_load.result
mysql-test/r/isam.err
mysql-test/r/lowercase_table2.err
...
...
@@ -727,6 +735,7 @@ mysql-test/r/rpl000016.eval
mysql-test/r/rpl_log.eval
mysql-test/r/slave-running.eval
mysql-test/r/slave-stopped.eval
mysql-test/r/udf.log
mysql-test/share/mysql
mysql-test/std_data/*.pem
mysql-test/t/index_merge.load
...
...
@@ -1051,6 +1060,7 @@ scripts/mysql_install_db
scripts/mysql_secure_installation
scripts/mysql_setpermission
scripts/mysql_tableinfo
scripts/mysql_upgrade
scripts/mysql_zap
scripts/mysqlaccess
scripts/mysqlbug
...
...
@@ -1142,7 +1152,9 @@ sql/pack.c
sql/safe_to_cache_query.txt
sql/share/*.sys
sql/share/charsets/gmon.out
sql/share/fixerrmsg.pl
sql/share/gmon.out
sql/share/iso639-2.txt
sql/share/mysql
sql/share/norwegian-ny/errmsg.sys
sql/share/norwegian/errmsg.sys
...
...
@@ -1273,13 +1285,3 @@ vio/viotest-sslconnect.cpp
vio/viotest.cpp
zlib/*.ds?
zlib/*.vcproj
scripts/mysql_upgrade
include/openssl
mysql-test/r/bdb.log
mysql-test/r/im_client_port.log
mysql-test/r/udf.log
extra/yassl/taocrypt/benchmark/benchmark
extra/yassl/taocrypt/test/test
extra/yassl/testsuite/testsuite
client/mysql_upgrade
client/#mysql.cc#
include/config-win.h
View file @
a885c2e6
...
...
@@ -384,6 +384,7 @@ inline double ulonglong2double(ulonglong value)
#define FN_LIBCHAR '\\'
#define FN_ROOTDIR "\\"
#define FN_DEVCHAR ':'
#define FN_NETWORK_DRIVES
/* Uses \\ to indicate network drives */
#define FN_NO_CASE_SENCE
/* Files are not case-sensitive */
#define OS_FILE_LIMIT 2048
...
...
include/my_global.h
View file @
a885c2e6
...
...
@@ -599,7 +599,6 @@ typedef SOCKET_SIZE_TYPE size_socket;
#define FN_HOMELIB '~'
/* ~/ is used as abbrev for home dir */
#define FN_CURLIB '.'
/* ./ is used as abbrev for current dir */
#define FN_PARENTDIR ".."
/* Parent directory; Must be a string */
#define FN_DEVCHAR ':'
#ifndef FN_LIBCHAR
#ifdef __EMX__
...
...
mysql-test/r/create.result
View file @
a885c2e6
...
...
@@ -773,3 +773,17 @@ Warnings:
Warning 1071 Specified key was too long; max key length is 765 bytes
insert into t1 values('aaa');
drop table t1;
drop table if exists `about:text`;
create table `about:text` (
_id int not null auto_increment,
`about:text` varchar(255) not null default '',
primary key (_id)
);
show create table `about:text`;
Table Create Table
about:text CREATE TABLE `about:text` (
`_id` int(11) NOT NULL auto_increment,
`about:text` varchar(255) NOT NULL default '',
PRIMARY KEY (`_id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table `about:text`;
mysql-test/t/create.test
View file @
a885c2e6
...
...
@@ -674,4 +674,19 @@ create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb
insert
into
t1
values
(
'aaa'
);
drop
table
t1
;
#
# Bug#19479:mysqldump creates invalid dump
#
--
disable_warnings
drop
table
if
exists
`about:text`
;
--
enable_warnings
create
table
`about:text`
(
_id
int
not
null
auto_increment
,
`about:text`
varchar
(
255
)
not
null
default
''
,
primary
key
(
_id
)
);
show
create
table
`about:text`
;
drop
table
`about:text`
;
# End of 5.0 tests
mysys/mf_fn_ext.c
View file @
a885c2e6
...
...
@@ -40,14 +40,14 @@ my_string fn_ext(const char *name)
DBUG_ENTER
(
"fn_ext"
);
DBUG_PRINT
(
"mfunkt"
,(
"name: '%s'"
,
name
));
#if defined(FN_DEVCHAR) || defined(FN_C_AFTER_DIR)
#if defined(FN_DEVCHAR) || defined(FN_C_AFTER_DIR)
|| defined(BASKSLASH_MBTAIL)
{
char
buff
[
FN_REFLEN
];
gpos
=
(
my_string
)
name
+
dirname_part
(
buff
,(
char
*
)
name
);
}
#else
if
(
!
(
gpos
=
strrchr
(
name
,
FN
LIBCHAR
)))
gpos
=
name
;
if
(
!
(
gpos
=
strrchr
(
name
,
FN_
LIBCHAR
)))
gpos
=
(
my_string
)
name
;
#endif
pos
=
strchr
(
gpos
,
FN_EXTCHAR
);
DBUG_RETURN
(
pos
?
pos
:
strend
(
gpos
));
...
...
sql/table.cc
View file @
a885c2e6
...
...
@@ -1614,6 +1614,10 @@ bool check_db_name(char *name)
if
(
*
name
==
'/'
||
*
name
==
'\\'
||
*
name
==
FN_LIBCHAR
||
*
name
==
FN_EXTCHAR
)
return
1
;
#ifdef FN_DEVCHAR
if
(
*
name
==
FN_DEVCHAR
)
return
1
;
#endif
name
++
;
}
return
last_char_is_space
||
(
uint
)
(
name
-
start
)
>
NAME_LEN
;
...
...
@@ -1656,6 +1660,10 @@ bool check_table_name(const char *name, uint length)
#endif
if
(
*
name
==
'/'
||
*
name
==
'\\'
||
*
name
==
FN_EXTCHAR
)
return
1
;
#ifdef FN_DEVCHAR
if
(
*
name
==
FN_DEVCHAR
)
return
1
;
#endif
name
++
;
}
#if defined(USE_MB) && defined(USE_MB_IDENT)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment