Commit graph

43209 commits

Author SHA1 Message Date
unknown
40c7f723ad Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Additional fixes caused by running without anonymous users


mysql-test/r/federated_server.result:
  There are no default server in mysql.servers anymore
  The test will create it's own test servers
mysql-test/r/rpl_read_only.result:
  Update result
mysql-test/r/rpl_row_USER.result:
  Update test result, it basically checks that the values
  return by USER() and CURRENT_USER() are the
  same on master and slave, so it's doing the correct
  thing. Since connection m_1 is logged in as ''@localhost%
  that is what will end up in the log.
mysql-test/t/ndb_multi_row.test:
  Connect as root instead of '' which would pick currently logged in user
mysql-test/t/rpl_read_only.test:
  Add user test with no privs(no anonymous by default anymore)
2007-02-28 20:33:59 +01:00
unknown
14f581fa95 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 16:46:30 +01:00
unknown
643add3ea8 Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 16:45:54 +01:00
unknown
6ffe8c8a03 Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 16:45:41 +01:00
unknown
3297d47fc3 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-02-28 16:41:30 +01:00
unknown
bd296f16a1 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint-bug20166
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2007-02-28 16:40:50 +01:00
unknown
2a02f9c964 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-02-28 16:40:03 +01:00
unknown
47a824ae4a Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
mysql-test/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
BitKeeper/deleted/.del-init_db.sql:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Auto merged
2007-02-28 16:39:26 +01:00
unknown
acdfc1e9fe Merge pilot.blaudden:/home/msvensson/mysql/bug24878/my41-bug24878
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-02-28 16:38:31 +01:00
unknown
87eee8fcad Bug#24878 mysql server doesn't log incident time in "mysqld got signal 11" error messages
- Add printout of current time when mysqld is killed by an
   unhandled signal


sql/mysqld.cc:
  Add printout of current time before the "mysqld got signal %d" message
  Hopefully we don't crash in the calls to 'time' or 'localtime_r'
  but if that should start to happen we can move the printout of
  time further down. At least it's now below the check for segfault
  inside of segfault handler.
2007-02-28 16:37:50 +01:00
unknown
b1988b0d6f Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Null merge 4.1 patch


mysql-test/Makefile.am:
  Null merge to 4.1 patch
scripts/Makefile.am:
  No need to clean mysql_create_system_tablesa anyomre
2007-02-28 15:15:38 +01:00
unknown
d8fb19e169 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2007-02-28 15:04:20 +01:00
unknown
22cac737ca Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Build lib/init-db.sql from the output of mysql_create_system_tables
 - Remove mysql-test/init_db.sql and mysql-test/lib/init_db.sql
 - Leave netware/init_db.sql until 5.0 where we should soon have possibility
   to test with mysql-test-run.pl


BitKeeper/deleted/.del-init_db.sql:
  Delete: mysql-test/init_db.sql
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Delete: mysql-test/lib/init_db.sql
BitKeeper/etc/ignore:
  Added mysql-test/lib/init_db.sql to the ignore list
mysql-test/Makefile.am:
  Build lib/init_db.sql from the output of mysql_create_system_tables
2007-02-28 15:03:47 +01:00
unknown
af4dcd1fa7 Bug#20166 mysql-test-run.pl does not test system privilege tables creation
scripts/mysql_system_tables_data.sql:
  Update initial data for system tables to 5.1 version format
2007-02-28 14:58:19 +01:00
unknown
c664530d70 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
scripts/mysql_system_tables_fix.sql:
  Auto merged
scripts/mysql_system_tables.sql:
  Manual merge
2007-02-28 14:41:57 +01:00
unknown
838e89dea6 Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Split out initial data in mysql_system_tables.sql to  it's own file
 - Use file from mysql_install_db and mysql-test-run


scripts/mysql_system_tables_fix.sql:
  Rename: scripts/mysql_fix_privilege_tables.sql.in -> scripts/mysql_system_tables_fix.sql
mysql-test/mysql-test-run.pl:
  - Add mysql_system_tables_data.sql as part of the bootstrap
  - Remove the addition of pid to end of bootstrap.sql, now
    to file used for bootstrap will be $opt_vardir/tmp/bootstrap.sql
  - Improve error message descibing how to find cause of a
    failed bootstrap
scripts/Makefile.am:
  - Rename mysql_fix_privileg_tables.sql.in to mysql_system_tables_fix.sql
  - Build mysql_fix_privilege_tables from mysql_system_tables.sql and
    mysql_system_tables_fix.sql
  - Add mysql_system_tables_fix.sql to EXTRA_DIST
scripts/mysql_install_db.sh:
  - Use mysql_system_tables_data.sql file when bootstrapping
    mysql, it will contain initial data for MysQL system tables
scripts/mysql_system_tables.sql:
  Move initial data for system tables to it's own file
scripts/mysql_system_tables_data.sql:
  Move initial data for system tables to it's own file
2007-02-28 14:26:58 +01:00
unknown
cfac917582 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b25834/b25834.5.0
2007-02-28 17:18:19 +04:00
unknown
99f286d5a2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2007-02-28 13:48:43 +01:00
unknown
63b68fa288 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2007-02-28 13:47:59 +01:00
unknown
7624028419 When using a --mem=<dir> the memdir must be removed to assure
afresh start
2007-02-28 13:47:41 +01:00
unknown
24324b2128 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/b25834/b25834.5.1
2007-02-28 14:57:05 +04:00
unknown
cded2b70d6 Merge mysql.com:/home/ram/work/b25834/b25834.5.0
into  mysql.com:/home/ram/work/b25834/b25834.5.1


mysql-test/r/func_group.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
2007-02-28 14:37:09 +04:00
unknown
031e62ecee Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
2007-02-28 11:21:54 +01:00
unknown
65fc58524f Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


sql/item_strfunc.cc:
  Auto merged
2007-02-28 11:21:29 +01:00
unknown
6b890467b5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/lib/mtr_process.pl:
  Auto merged
2007-02-28 10:53:34 +01:00
unknown
37b0e2b6df Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_process.pl:
  Auto merged
2007-02-28 10:53:06 +01:00
unknown
4d49015bf9 Bug#26416 mysql-test-run exits with "Hangup" when piped to grep
- Thanks to Christian for the patch!


mysql-test/lib/mtr_process.pl:
  Avoid printout of "Hangup" when script exits by using
  POSIX::kill
2007-02-28 10:52:51 +01:00
unknown
3124fd37db Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/lib/mtr_process.pl:
  Auto merged
2007-02-28 10:39:47 +01:00
unknown
e63c2e355e Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_process.pl:
  Auto merged
2007-02-28 10:39:12 +01:00
unknown
e40bcac08e Bug#26686 mysql-test-run.pl aborts when waitpid returns -1
- Add error handling for waitpid returns -1 for "simple run of command"


mysql-test/lib/mtr_process.pl:
  - Add error handling for waitpid returns -1
  when a simple command is run.
  - Add missing return
  - Add mtr_errors where the program should never come 
  - Remove an else to improve program readability
  - Change mtr_debug to mtr_warning for "Got EAGAIN from fork()..."
2007-02-28 10:37:32 +01:00
unknown
79d1fc5de6 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2007-02-28 10:07:37 +01:00
unknown
aff6a36ecf Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
2007-02-28 10:07:04 +01:00
unknown
64278d4fc9 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint-without-cygwin
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint


client/mysqltest.c:
  Auto merged
2007-02-28 10:06:21 +01:00
unknown
8c5a862569 Use cygwin for --exec and --system in mysqltest for MySQL before 5.0 2007-02-28 10:05:51 +01:00
unknown
4780c88ff0 Merge pilot.blaudden:/home/msvensson/mysql/bug19410/my50-bug19410
into  pilot.blaudden:/home/msvensson/mysql/bug19410/my51-bug19410


client/mysqltest.c:
  Auto merged
2007-02-28 09:11:56 +01:00
unknown
82eed8b202 Merge pilot.blaudden:/home/msvensson/mysql/bug19410/my50-bug19410
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 09:11:39 +01:00
unknown
a6a71833e7 Merge pilot.blaudden:/home/msvensson/mysql/bug19410/my41-bug19410
into  pilot.blaudden:/home/msvensson/mysql/bug19410/my50-bug19410


client/mysqltest.c:
  Auto merged
2007-02-28 09:11:13 +01:00
unknown
d59d5f18c4 Bug#19410 Test 'kill' fails on Windows + SCO
- Use "mysql_stmt_field_count" to determine if there is a need to
call "mysql_stmt_store_result"


client/mysqltest.c:
  Only call 'mysql_stmt_store_result' if 'mysql_stmt_field_count' is
  greater than 0 indicating that this query has a result set.
  This change is mainly since if mysql_stmt_store_result fails
  the value returned by mysql_stmt_field_count will be reset.
2007-02-28 09:10:38 +01:00
unknown
f1476f4395 Bug#26536 func_time failure on vm-win2003-64-b, occurs every time
- my_time_t is defined as long which means it will not always be the
same size as time_t. See explanation in include/my_time.h


sql/event_queue.cc:
  No need to require that "sizeof(time_t) == sizeof(my_time_t)"
2007-02-27 16:58:40 +01:00
unknown
e9cce1793d Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
scripts/mysql_system_tables.sql:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-02-27 15:29:44 +01:00
unknown
dda46f74f0 Bug#23669 mysql.proc not created in default install
- Remove DEFAULT values for blob's in mysql_system_tables.sql


scripts/mysql_system_tables.sql:
  Remove attempt to set default value for blob columns since
  they can't have any. Depending on 'sql_mode' the default values
  has either been silently dropped or thrown an error as reported
  by the bug.
2007-02-27 15:28:19 +01:00
unknown
ec7a698a83 Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/rpl_temporary.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-02-27 14:55:00 +01:00
unknown
5bc306b220 Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-02-27 14:54:33 +01:00
unknown
8b373971d6 Merge pilot.blaudden:/home/msvensson/mysql/bug26678/my50-bug26678
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-27 14:35:25 +01:00
unknown
b74f45ac78 Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
into  pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166


scripts/mysql_fix_privilege_tables.sql.in:
  Manual merge
scripts/mysql_system_tables.sql:
  Manual merge
2007-02-27 14:25:56 +01:00
unknown
4131465ee5 Merge pilot.blaudden:/home/msvensson/mysql/bug26678/my50-bug26678
into  pilot.blaudden:/home/msvensson/mysql/bug26678/my51-bug26678
2007-02-27 14:21:40 +01:00
unknown
74869268a9 Bug#26678 SSL tests fail on win64
- Import a patch from yaSSL CVS that uses "word" instead
of "unsigned long" in three function's that uses sizeof to find
out the word size being used. NOTE! long is 32 bit also on 
64 bit windows.


extra/yassl/taocrypt/include/misc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/misc.cpp:
  Import patch yassl.diff
2007-02-27 14:18:12 +01:00
unknown
424152a2c9 Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Escape undercore character in mysql.db to only allow
  access test_% and not test%


scripts/mysql_system_tables.sql:
  underscore is a wildcard character so it need to be
  expaed to only match one _
2007-02-27 14:10:27 +01:00
unknown
6133ee079a Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Updates for 5.1


mysql-test/t/lock_multi.test:
  Test need anonymous users
mysql-test/t/rpl_temporary.test:
  Test need anonymous users
scripts/mysql_system_tables.sql:
  Update mysql_system_tables.sql for 5.1
2007-02-27 11:39:29 +01:00
unknown
9bbd385a89 Fix for bug #25834: Test failure in "func_group"
Round the results of std() for some calls with double arguments
to avoid double math precision problems.
2007-02-27 11:01:58 +04:00