database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge trift2.:/MySQL/M50/mysql-5.0

Browse Source 
into  trift2.:/MySQL/M50/push-5.0
This commit is contained in:
unknown
2007-12-07 13:51:41 +01:00
parent 21fd6c0f1d f3514dc3c4
commit e12dbcde29
9 changed files with 78 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.bzrignore
View File

@ -1351,3 +1351,5 @@ win/vs71cache.txt
win/vs8cache.txt win/vs8cache.txt
zlib/*.ds? zlib/*.ds?
zlib/*.vcproj zlib/*.vcproj
scripts/make_win_src_distribution_old
server-tools/instance-manager/net_serv.cc

2
Docs/Makefile.am
View File

@ -13,7 +13,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
EXTRA_DIST = mysql.info INSTALL-BINARY EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@
# make sure that "make install" installs the info page, too # make sure that "make install" installs the info page, too
# automake only seems to take care of this automatically, # automake only seems to take care of this automatically,

5
configure.in
View File

@ -2452,10 +2452,15 @@ AC_ARG_WITH(docs,
if test "$with_docs" = "yes" if test "$with_docs" = "yes"
then then
docs_dirs="Docs" docs_dirs="Docs"
if test -f "$srcdir/Docs/manual.chm" ; then
extra_docs="manual.chm"
fi
else else
docs_dirs="" docs_dirs=""
extra_docs=""
fi fi
AC_SUBST(docs_dirs) AC_SUBST(docs_dirs)
AC_SUBST(extra_docs)
# Shall we build the man pages? # Shall we build the man pages?
AC_ARG_WITH(man, AC_ARG_WITH(man,

55
include/my_global.h
View File

@ -109,36 +109,31 @@
The macros below are used to allow build of Universal/fat binaries of The macros below are used to allow build of Universal/fat binaries of
MySQL and MySQL applications under darwin. MySQL and MySQL applications under darwin.
*/ */
#ifdef TARGET_FAT_BINARY #if defined(__APPLE__) && defined(__MACH__)
# undef SIZEOF_CHARP # undef SIZEOF_CHARP
# undef SIZEOF_INT # undef SIZEOF_SHORT
# undef SIZEOF_LONG # undef SIZEOF_INT
# undef SIZEOF_LONG_LONG # undef SIZEOF_LONG
# undef SIZEOF_OFF_T # undef SIZEOF_LONG_LONG
# undef SIZEOF_SHORT # undef SIZEOF_OFF_T
# undef WORDS_BIGENDIAN
#if defined(__i386__) # define SIZEOF_SHORT 2
# undef WORDS_BIGENDIAN # define SIZEOF_INT 4
# define SIZEOF_CHARP 4 # define SIZEOF_LONG_LONG 8
# define SIZEOF_INT 4 # define SIZEOF_OFF_T 8
# define SIZEOF_LONG 4 # if defined(__i386__) || defined(__ppc__)
# define SIZEOF_LONG_LONG 8 # define SIZEOF_CHARP 4
# define SIZEOF_OFF_T 8 # define SIZEOF_LONG 4
# define SIZEOF_SHORT 2 # elif defined(__x86_64__) || defined(__ppc64__)
# define SIZEOF_CHARP 8
#elif defined(__ppc__) # define SIZEOF_LONG 8
# define WORDS_BIGENDIAN # else
# define SIZEOF_CHARP 4 # error Building FAT binary for an unknown architecture.
# define SIZEOF_INT 4 # endif
# define SIZEOF_LONG 4 # if defined(__ppc__) || defined(__ppc64__)
# define SIZEOF_LONG_LONG 8 # define WORDS_BIGENDIAN
# define SIZEOF_OFF_T 8 # endif
# define SIZEOF_SHORT 2 #endif /* defined(__APPLE__) && defined(__MACH__) */
#else
# error Building FAT binary for an unknown architecture.
#endif
#endif /* TARGET_FAT_BINARY */
/* /*

15
mysql-test/suite/funcs_1/r/innodb_views.result
View File

@ -9836,16 +9836,23 @@ f2
two two
SET sql_mode = 'traditional,ansi'; SET sql_mode = 'traditional,ansi';
CREATE OR REPLACE VIEW v1 AS CREATE OR REPLACE VIEW v1 AS
SELECT f3 AS "pure column f3:", f1 + f3 AS "sum of columns f1 + f3 =",
3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1):",
'->' || CAST(f3 AS CHAR) || '<-'
AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):"
FROM t1 WHERE f1 = 2;
CREATE OR REPLACE VIEW v1 AS
SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ", SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ",
3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ", 3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ",
'->' || CAST(f3 AS CHAR) || '<-' '->' || CAST(f3 AS CHAR) || '<-'
AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): " AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): "
FROM t1 WHERE f1 = 2; FROM t1 WHERE f1 = 2;
ERROR 42000: Incorrect column name 'pure column f3: '
SELECT * FROM v1; SELECT * FROM v1;
pure column f3: 2.20000 pure column f3: 2.20000
sum of columns f1 + f3 = 4.20000 sum of columns f1 + f3 = 4.20000
product of constants 3 * (- 0.11111E+1): -3.3333 product of constants 3 * (- 0.11111E+1): -3.3333
expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<- expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<-
SET sql_mode = ''; SET sql_mode = '';
Testcases 3.3.1.55 - 3.3.1.62 Testcases 3.3.1.55 - 3.3.1.62

15
mysql-test/suite/funcs_1/r/memory_views.result
View File

@ -9841,16 +9841,23 @@ f2
two two
SET sql_mode = 'traditional,ansi'; SET sql_mode = 'traditional,ansi';
CREATE OR REPLACE VIEW v1 AS CREATE OR REPLACE VIEW v1 AS
SELECT f3 AS "pure column f3:", f1 + f3 AS "sum of columns f1 + f3 =",
3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1):",
'->' || CAST(f3 AS CHAR) || '<-'
AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):"
FROM t1 WHERE f1 = 2;
CREATE OR REPLACE VIEW v1 AS
SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ", SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ",
3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ", 3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ",
'->' || CAST(f3 AS CHAR) || '<-' '->' || CAST(f3 AS CHAR) || '<-'
AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): " AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): "
FROM t1 WHERE f1 = 2; FROM t1 WHERE f1 = 2;
ERROR 42000: Incorrect column name 'pure column f3: '
SELECT * FROM v1; SELECT * FROM v1;
pure column f3: 2.20000 pure column f3: 2.20000
sum of columns f1 + f3 = 4.20000 sum of columns f1 + f3 = 4.20000
product of constants 3 * (- 0.11111E+1): -3.3333 product of constants 3 * (- 0.11111E+1): -3.3333
expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<- expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<-
SET sql_mode = ''; SET sql_mode = '';
Testcases 3.3.1.55 - 3.3.1.62 Testcases 3.3.1.55 - 3.3.1.62

15
mysql-test/suite/funcs_1/r/myisam_views.result
View File

@ -9858,16 +9858,23 @@ f2
two two
SET sql_mode = 'traditional,ansi'; SET sql_mode = 'traditional,ansi';
CREATE OR REPLACE VIEW v1 AS CREATE OR REPLACE VIEW v1 AS
SELECT f3 AS "pure column f3:", f1 + f3 AS "sum of columns f1 + f3 =",
3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1):",
'->' || CAST(f3 AS CHAR) || '<-'
AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):"
FROM t1 WHERE f1 = 2;
CREATE OR REPLACE VIEW v1 AS
SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ", SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ",
3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ", 3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ",
'->' || CAST(f3 AS CHAR) || '<-' '->' || CAST(f3 AS CHAR) || '<-'
AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): " AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): "
FROM t1 WHERE f1 = 2; FROM t1 WHERE f1 = 2;
ERROR 42000: Incorrect column name 'pure column f3: '
SELECT * FROM v1; SELECT * FROM v1;
pure column f3: 2.20000 pure column f3: 2.20000
sum of columns f1 + f3 = 4.20000 sum of columns f1 + f3 = 4.20000
product of constants 3 * (- 0.11111E+1): -3.3333 product of constants 3 * (- 0.11111E+1): -3.3333
expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<- expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR): ->2.20000<-
SET sql_mode = ''; SET sql_mode = '';
Testcases 3.3.1.55 - 3.3.1.62 Testcases 3.3.1.55 - 3.3.1.62

9
mysql-test/suite/funcs_1/views/views_master.inc
View File

@ -2410,6 +2410,15 @@ SELECT * FROM v1;
# 3.3.1.54 # 3.3.1.54
--vertical_results --vertical_results
SET sql_mode = 'traditional,ansi'; SET sql_mode = 'traditional,ansi';
# due to bug#32496 "no trailing blanks in identifier".
CREATE OR REPLACE VIEW v1 AS
SELECT f3 AS "pure column f3:", f1 + f3 AS "sum of columns f1 + f3 =",
3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1):",
'->' || CAST(f3 AS CHAR) || '<-'
AS "expression with '||'=CONCAT and CAST(DECIMAL column AS CHAR):"
FROM t1 WHERE f1 = 2;
# This error is not conformant with ansi (see bug#32496). hhunger
--error ER_WRONG_COLUMN_NAME
CREATE OR REPLACE VIEW v1 AS CREATE OR REPLACE VIEW v1 AS
SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ", SELECT f3 AS "pure column f3: ", f1 + f3 AS "sum of columns f1 + f3 = ",
3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ", 3 * (- 0.11111E+1) AS "product of constants 3 * (- 0.11111E+1): ",

6
scripts/mysql_install_db.sh
View File

@ -181,14 +181,14 @@ parse_arguments PICK-ARGS-FROM-ARGV "$@"
if test -n "$basedir" if test -n "$basedir"
then then
print_defaults=`find_in_basedir my_print_defaults bin extra` print_defaults=`find_in_basedir my_print_defaults bin extra`
if ! test -x "$print_defaults" if test ! -x "$print_defaults"
then then
missing_in_basedir my_print_defaults missing_in_basedir my_print_defaults
exit 1 exit 1
fi fi
else else
print_defaults="@bindir@/my_print_defaults" print_defaults="@bindir@/my_print_defaults"
if ! test -x "$print_defaults" if test ! -x "$print_defaults"
then then
echo "FATAL ERROR: Could not find $print_defaults" echo "FATAL ERROR: Could not find $print_defaults"
echo echo
@ -223,7 +223,7 @@ else
exit 1 exit 1
fi fi
mysqld=`find_in_basedir mysqld libexec sbin bin` mysqld=`find_in_basedir mysqld libexec sbin bin`
if ! test -x "$mysqld" if test ! -x "$mysqld"
then then
missing_in_basedir mysqld missing_in_basedir mysqld
exit 1 exit 1