1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge from 5.1 repo.

Browse Source
This commit is contained in:
Andrei Elkin 2012-07-10 12:48:23 +03:00
commit f62bca39cb
7 changed files with 1391 additions and 1356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libmysqld/examples/CMakeLists.txt
View File

@ -17,7 +17,8 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/libmysqld/include ${CMAKE_SOURCE_DIR}/libmysqld/include
${CMAKE_SOURCE_DIR}/regex ${CMAKE_SOURCE_DIR}/regex
${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/zlib
${CMAKE_SOURCE_DIR}/tests
${CMAKE_SOURCE_DIR}/extra/yassl/include) ${CMAKE_SOURCE_DIR}/extra/yassl/include)
# Currently does not work with DBUG, there are missing symbols reported. # Currently does not work with DBUG, there are missing symbols reported.

3
libmysqld/examples/Makefile.am
View File

@ -35,7 +35,7 @@ link_sources:
DEFS = -DEMBEDDED_LIBRARY DEFS = -DEMBEDDED_LIBRARY
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \
-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \ -I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
$(openssl_includes) -I$(top_srcdir)/tests $(openssl_includes)
LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs) LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \
@NDB_SCI_LIBS@ @NDB_SCI_LIBS@
@ -51,6 +51,7 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
mysql_client_test_embedded_LINK = $(CXXLINK) mysql_client_test_embedded_LINK = $(CXXLINK)
nodist_mysql_client_test_embedded_SOURCES = mysql_client_test.c nodist_mysql_client_test_embedded_SOURCES = mysql_client_test.c
mysql_client_test.o: $(top_srcdir)/tests/mysql_client_fw.c
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%

3
mysys/my_access.c
View File

@ -148,7 +148,8 @@ static char reserved_map[256]=
int check_if_legal_tablename(const char *name) int check_if_legal_tablename(const char *name)
{ {
DBUG_ENTER("check_if_legal_tablename"); DBUG_ENTER("check_if_legal_tablename");
DBUG_RETURN((reserved_map[(uchar) name[0]] & 1) && DBUG_RETURN(name[0] != 0 && name[1] != 0 &&
(reserved_map[(uchar) name[0]] & 1) &&
(reserved_map[(uchar) name[1]] & 2) && (reserved_map[(uchar) name[1]] & 2) &&
(reserved_map[(uchar) name[2]] & 4) && (reserved_map[(uchar) name[2]] & 4) &&
str_list_find(&reserved_names[1], name)); str_list_find(&reserved_names[1], name));

4
strings/ctype-utf8.c
View File

@ -4326,6 +4326,10 @@ my_wc_mb_filename(CHARSET_INFO *cs __attribute__((unused)),
{ {
int code; int code;
char hex[]= "0123456789abcdef"; char hex[]= "0123456789abcdef";
if (s >= e)
return MY_CS_TOOSMALL;
if (wc < 128 && filename_safe_char[wc]) if (wc < 128 && filename_safe_char[wc])
{ {
*s= (uchar) wc; *s= (uchar) wc;

1
tests/Makefile.am
View File

@ -47,6 +47,7 @@ LDADD = @CLIENT_EXTRA_LDFLAGS@ \
mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS)
mysql_client_test_SOURCES= mysql_client_test.c\ mysql_client_test_SOURCES= mysql_client_test.c\
$(top_srcdir)/mysys/my_memmem.c $(top_srcdir)/mysys/my_memmem.c
mysql_client_test.o: mysql_client_fw.c
insert_test_SOURCES= insert_test.c insert_test_SOURCES= insert_test.c
select_test_SOURCES= select_test.c select_test_SOURCES= select_test.c

1375
tests/mysql_client_fw.c Normal file
View File

File diff suppressed because it is too large Load Diff

1358
tests/mysql_client_test.c
View File

File diff suppressed because it is too large Load Diff