Commit graph

52757 commits

Author SHA1 Message Date
unknown
464245c992 Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my51-bug31004
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-runtime


client/CMakeLists.txt:
  Auto merged
client/mysqltest.c:
  Auto merged
2008-02-07 14:07:41 +01:00
unknown
0ae3d1947e Merge bk-internal:/home/bk/mysql-5.1-runtime
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-runtime


sql-common/client.c:
  Auto merged
2008-02-07 12:44:01 +01:00
unknown
178f33e05b Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my50-bug31004
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-runtime


client/mysqltest.c:
  Auto merged
2008-02-07 12:42:49 +01:00
unknown
1b6b7010a6 Bug#32633 Can not create any routine if SQL_MODE=no_engine_substitution
The problem is that one can not create a stored routine if sql_mode
contains NO_ENGINE_SUBSTITUTION or PAD_CHAR_TO_FULL_LENGTH. Also when
a event is created, the mode is silently lost if sql_mode contains one
of the aforementioned.  This was happening because the table definitions
which stored sql_mode values weren't being updated to accept new values
of sql_mode.

The solution is to update, in a backwards compatible manner, the various
table definitions (columns) that store the sql_mode value to take into
account the new possible values. One incompatible change is that if a event
that is being created can't be stored to the mysql.event table, an error
will be raised.

The tests case also ensure that new SQL modes will be added to the mysql.proc
and mysql.event tables, otherwise the tests will fail.


mysql-test/r/events_bugs.result:
  Add test case result for Bug#32633
mysql-test/r/information_schema.result:
  Update the sql_mode column definition.
mysql-test/r/sp.result:
  Add test case result for Bug#32633
mysql-test/r/system_mysql_db.result:
  Update the sql_mode column definition.
mysql-test/t/events_bugs.test:
  Add test case for Bug#32633
mysql-test/t/sp.test:
  Add test case for Bug#32633
mysql-test/t/system_mysql_db_fix50117.test:
  Update the sql_mode column definition.
scripts/mysql_system_tables.sql:
  Update the sql_mode column definition.
scripts/mysql_system_tables_fix.sql:
  Update the sql_mode column definition.
sql/event_db_repository.cc:
  Reset and restore SQL modes when storing and loading a
  event from the data dictionary. Also throw out a error
  if a store fails.
sql/mysqld.cc:
  Add warning to avoid this problem in the future.
sql-common/my_user.c:
  Truncate length if user name or host name does not fit
  in the buffer.
sql/sp.cc:
  SQL mode of the thread must not effect data dictionary operations.
2008-02-07 08:47:39 -02:00
unknown
7fa01f84e3 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-07 10:02:59 +01:00
unknown
db14c0ec07 Merge bk-internal:/home/bk/mysql-5.1-build
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-07 10:02:22 +01:00
unknown
9c5fe5e8d1 Merge pilot.mysql.com:/data/msvensson/mysql/bug32025/my50-bug32025
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
2008-02-07 10:01:36 +01:00
unknown
661f586391 Merge pilot.mysql.com:/data/msvensson/mysql/bug25988/my51-bug25988
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-07 10:00:34 +01:00
unknown
2d88db9555 Merge pilot.mysql.com:/data/msvensson/mysql/bug25988/my50-bug25988
into  pilot.mysql.com:/data/msvensson/mysql/bug25988/my51-bug25988


vio/viossl.c:
  Auto merged
2008-02-07 09:55:49 +01:00
unknown
f58f8c94aa Merge pilot.mysql.com:/data/msvensson/mysql/bug25988/my50-bug25988
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
2008-02-07 09:55:12 +01:00
unknown
8d040352d9 Bug#33050 5.0.50 fails many SSL testcases 2008-02-07 08:48:28 +01:00
unknown
9f85d0dc6b Merge pilot.mysql.com:/data/msvensson/mysql/bug32025/my50-bug32025
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build


storage/ndb/tools/waiter.cpp:
  Manual merge from 5.0
2008-02-07 08:12:25 +01:00
unknown
5c73339493 Bug#32025 ndb_waiter does too many roundtrips to ndb_mgmd
ndb/tools/waiter.cpp:
  - Only contact ndb_mgmd once per loop
  - Program only cares about ndbd nodes -> remove the api and mgm vectors
  - Program can not wait for "starting" -> remove that code
  - Remove unused includes
  - Protect against SIGPIPE(writing to a socket where the mgmsrv was
    gone, silently killed the program)
  - Don't sleep one second if if all nodes are in the wanted state  
  - Use 100 milliseconds sleep between each poll
2008-02-07 08:08:43 +01:00
unknown
14d2ebe667 Merge hh-nb.hungers:/work/merge/mysql-5.1-build
into  hh-nb.hungers:/work/merge/mysql-5.1-bug34190
2008-02-06 15:56:29 +01:00
unknown
13678ac2e7 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  5.0 version changes don't propagate to 5.1, "use local".
2008-02-06 15:55:18 +01:00
unknown
2a6ea13dd7 Merge mysql.com:/Users/davi/mysql/bugs/21801-5.1
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-06 12:50:22 -02:00
unknown
2ce65dea10 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged
2008-02-06 15:49:23 +01:00
unknown
0c0c346010 Merge pilot.mysql.com:/data/msvensson/mysql/bug32044/my51-bug32044
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-06 14:56:32 +01:00
unknown
c6099bac27 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-06 11:22:18 -02:00
unknown
3616b9136f Bug#32710: SHOW INNODB STATUS requires SUPER
Changed "SHOW ENGINE ... STATUS" and "SHOW ENGINE ... MUTEX"
to require the PROCESS privilege, instead of SUPER.

Fixed by Damien Katz


mysql-test/r/show_check.result:
  Add test case result for Bug#32710
mysql-test/t/show_check.test:
  Add test case for Bug#32710
sql/sql_parse.cc:
  Require PROCESS privilege instead of SUPER.
2008-02-06 11:20:15 -02:00
unknown
047d7d0791 Raise version number after cloning 5.0.56 2008-02-06 14:18:26 +01:00
unknown
7fb34527df Merge mysql.com:/data0/mysqldev/my/mysql-5.0
into  mysql.com:/data0/mysqldev/my/build-200802061048-5.0.56/mysql-5.0-release


configure.in:
  Merge from main.
2008-02-06 14:13:05 +01:00
unknown
9f8fb5ed04 Add a test case for Bug#21380: DEFAULT definition not always
transfered by CREATE TABLE/SELECT to the new table.


mysql-test/r/create.result:
  Update result file.
2008-02-06 14:55:19 +03:00
unknown
7335532a50 Merge pilot.mysql.com:/data/msvensson/mysql/bug19911/my51-bug19911
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build


sql/ha_ndbcluster_binlog.cc:
  Auto merged
2008-02-06 12:52:11 +01:00
unknown
ee42ff6398 Bug#34311 main.lock_multi.test fails
Re-enable the test case for Bug 30331.


mysql-test/r/lock_multi.result:
  Update the test case result for Bug#30331
mysql-test/t/lock_multi.test:
  Re-enable the test case for Bug#30331
2008-02-06 09:40:59 -02:00
unknown
66fa5cb968 Bug#19911 ndb does not work on sol10 x86
sql/ha_ndbcluster_binlog.cc:
  Change 'assert' to 'DBUG_ASSERT' to avoid that the assert is triggered in the optimized version
  on solaris 10 for x86
2008-02-06 11:44:07 +01:00
unknown
4c5fb788f8 Fixed differences in STATE in result file for bug#34190.
BitKeeper/etc/ignore:
  Added mysql-test/suite/funcs_1.tar.zip to the ignore list
2008-02-06 11:02:45 +01:00
unknown
8d5a63f0ac Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

Also use the opportunity to fix a bad merge (remove
duplicate code in mysql-test-run.pl).


mysql-test/mysql-test-run.pl:
  Fix bad merge (remove duplicate code adding --user=root arg)
2008-02-05 23:20:12 -07:00
unknown
40f2a6ae99 Minor typo fix for mysql-test-run.pl
mysql-test/mysql-test-run.pl:
  Fix typo (missing $prefix arg to mtr_add_arg(--user=root))
2008-02-05 23:16:52 -07:00
unknown
292477d9f9 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-05 22:42:06 -07:00
unknown
8456c5ffa3 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-05 22:41:10 -07:00
unknown
0994b19002 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-05 22:40:40 -07:00
unknown
4c2cdf00cf Merge solace.(none):/home/mtaylor/src/mysql-5.0-build
into  solace.(none):/home/mtaylor/src/mysql-5.1-build


BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Auto merged
2008-02-06 05:33:25 +01:00
unknown
52da7a4e1b Strip comments from queries before explaining them. Fixes BUG#34339 2008-02-06 04:33:27 +01:00
unknown
3a59d7af38 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-05 16:32:03 -07:00
unknown
7e212f5107 Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51


scripts/make_binary_distribution.sh:
  Auto merged
2008-02-05 16:15:07 -07:00
unknown
f328142cdb Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-05 16:04:07 -07:00
unknown
4df3bc0c3d Disabling test case.
Bug 34311: main.lock_multi.test fails.


mysql-test/r/lock_multi.result:
  Update result file.
mysql-test/t/lock_multi.test:
  Disabled test case for Bug#30331.
2008-02-05 18:08:02 +03:00
unknown
fb9c0158b2 Merge pilot.mysql.com:/data/msvensson/mysql/bug31239/my50-bug31239
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
2008-02-05 14:06:59 +01:00
unknown
20b9785284 Merge pilot.mysql.com:/data/msvensson/mysql/bug31239/my51-bug31239
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-05 13:53:40 +01:00
unknown
df2cf8c78d Adding some more filtering for tests that kills queries and
cause sporadic, but benign, errors.


mysql-test/lib/mtr_report.pl:
  Filtering out sporadic but benign error in rpl_err_ignoredtable.
2008-02-05 13:31:57 +01:00
unknown
9c58c0b20f Merge pilot.mysql.com:/data/msvensson/mysql/bug31239/my50-bug31239
into  pilot.mysql.com:/data/msvensson/mysql/bug31239/my51-bug31239


storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged
2008-02-05 12:45:42 +01:00
unknown
4db374eb8a Bug#31239 Test "ndb_views" returns NDB error 4259 "Invalid set of range scan bounds"
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Move the increment to next line to avoid icc optimization problem that
  caused the "b" reference to be incremented
2008-02-05 12:44:57 +01:00
unknown
4e1be6221e Fix merge: fix test. 2008-02-05 12:27:52 +03:00
unknown
57c599b3d4 Disabling test case binlog_old_version for embedded server.
mysql-test/lib/mtr_report.pl:
  Ignoring benign error message (killing query causes unpredictable
  error messages).
mysql-test/suite/binlog/t/binlog_old_versions.test:
  Disabling test case for embedded server.
sql/rpl_rli.cc:
  Inititializing uninitialized variable causing valgrind warning.
2008-02-05 08:22:27 +01:00
unknown
4e8ef9c8a2 Patch clean up.
Fixed interference between tests: Users were added but not properly removed.
This caused later tests to fail.


mysql-test/r/grant.result:
  Fixed interference between tests: Users were added but not properly removed.
  This caused later tests to fail.
mysql-test/t/grant.test:
  Fixed interference between tests: Users were added but not properly removed.
  This caused later tests to fail.
2008-02-04 19:55:36 +01:00
unknown
ff8651c4ec Bug#21801 SQL exception handlers and warnings
The problem is that deprecated syntax warnings were not being
suppressed when the stored routine is being parsed for the first
execution. It's doesn't make sense to print out deprecated
syntax warnings when the routine is being executed because this
kind of warning only matters when the routine is being created.

The solution is to suppress deprecated syntax warnings when
parsing the stored routine for loading into the cache (might
mean that the routine is being executed for the first time).


mysql-test/r/sp-error.result:
  Add test case result for Bug#21801
mysql-test/t/sp-error.test:
  Add test case for Bug#21801
sql/sp.cc:
  Implement a internal error handler to catch deprecated
  syntax warnings when loading a stored procedure into the
  cache.
2008-02-04 16:39:55 -02:00
unknown
99f67290ad Fixing result change after merge.
mysql-test/suite/rpl/r/rpl_user.result:
  Result change.
2008-02-04 14:29:23 +01:00
unknown
5716a69961 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/suite/rpl/r/rpl_user.result:
  Manual merge.
2008-02-04 13:23:20 +01:00
unknown
74bd1b0faf Updating result file.
mysql-test/r/rpl_user.result:
  Result change.
2008-02-04 13:19:29 +01:00