diff options
| author | unknown <monty@mysql.com> | 2004-03-12 01:13:04 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-12 01:13:04 +0200 |
| commit | 965158f28fa9527c62b3c316c458a8753a5da4e4 (patch) | |
| tree | 5e4aed5605eda5dab05891e904dddd1af46c1f54 /mysql-test | |
| parent | bebe22a99e0b48b09c4ac69561ede17ff1766b1a (diff) | |
| parent | dd8b25510e11ca35c37bb9949810ac84c6d7ce29 (diff) | |
| download | mariadb-git-965158f28fa9527c62b3c316c458a8753a5da4e4.tar.gz | |
Merge
mysql-test/install_test_db.sh:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
mysql-test/mysql-test-run.sh:
SCCS merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/install_test_db.sh | 11 | ||||
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 2 | ||||
| -rw-r--r-- | mysql-test/r/func_math.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/func_math.test | 8 |
4 files changed, 24 insertions, 3 deletions
diff --git a/mysql-test/install_test_db.sh b/mysql-test/install_test_db.sh index c87cf82088f..3b361b8afec 100644 --- a/mysql-test/install_test_db.sh +++ b/mysql-test/install_test_db.sh @@ -5,9 +5,16 @@ # This scripts creates the privilege tables db, host, user, tables_priv, # columns_priv in the mysql database, as well as the func table. -if [ x$1 = x"-bin" ]; then +if [ x$1 = x"--bin" ]; then shift 1 - execdir=../bin + +# Check if it's a binary distribution or a 'make install' +if test -x ../libexec/mysqld + then + execdir=../libexec + else + execdir=../bin +fi bindir=../bin BINARY_DIST=1 fix_bin=mysql-test diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index cbacedfedb4..a606a492058 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -487,7 +487,7 @@ else MYSQL_MANAGER_CLIENT="$BASEDIR/bin/mysqlmanagerc" MYSQL_MANAGER_PWGEN="$BASEDIR/bin/mysqlmanager-pwgen" MYSQL="$BASEDIR/bin/mysql" - INSTALL_DB="./install_test_db -bin" + INSTALL_DB="./install_test_db --bin" MYSQL_FIX_SYSTEM_TABLES="$BASEDIR/bin/mysql_fix_privilege_tables" if test -d "$BASEDIR/share/mysql/english" then diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result index 46ad7a14e25..1b6a0d43738 100644 --- a/mysql-test/r/func_math.result +++ b/mysql-test/r/func_math.result @@ -59,3 +59,9 @@ ASIN(0.8+0.2) SELECT ASIN(1.2-0.2); ASIN(1.2-0.2) 1.570796 +floor(log(4)/log(2)) +2 +floor(log(8)/log(2)) +3 +floor(log(16)/log(2)) +4 diff --git a/mysql-test/t/func_math.test b/mysql-test/t/func_math.test index 2de692d4389..7057b0ca412 100644 --- a/mysql-test/t/func_math.test +++ b/mysql-test/t/func_math.test @@ -28,3 +28,11 @@ SELECT ACOS(0.2*5.0); SELECT ACOS(0.5*2.0); SELECT ASIN(0.8+0.2); SELECT ASIN(1.2-0.2); + +# +# Bug #3051 FLOOR returns invalid +# + +select floor(log(4)/log(2)); +select floor(log(8)/log(2)); +select floor(log(16)/log(2)); |