Commit graph

53153 commits

Author SHA1 Message Date
unknown
2a482933b6 Renaming some saved binary log files to avoid 99 characters
limit for v7 tar.


mysql-test/suite/binlog/std_data/ver_5_1_17.001:
  Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1_17.000001 -> mysql-test/suite/binlog/std_data/ver_5_1_17.001
mysql-test/suite/binlog/std_data/ver_5_1_23.001:
  Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1_23.000001 -> mysql-test/suite/binlog/std_data/ver_5_1_23.001
mysql-test/suite/binlog/std_data/ver_5_1-telco.001:
  Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-telco.000001 -> mysql-test/suite/binlog/std_data/ver_5_1-telco.001
mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001:
  Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001 -> mysql-test/suite/binlog/std_data/ver_5_1-wl2325_r.001
mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001:
  Rename: mysql-test/suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001 -> mysql-test/suite/binlog/std_data/ver_5_1-wl2325_s.001
mysql-test/suite/binlog/std_data/bug32407.001:
  Rename: mysql-test/suite/binlog/std_data/binlog-bug32407.000001 -> mysql-test/suite/binlog/std_data/bug32407.001
2008-02-07 12:30:52 +01:00
unknown
0480b40f44 Merge bk-internal:/home/bk/mysql-5.1-rpl
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl


client/mysqltest.c:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
2008-02-07 12:26:13 +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
3b44afb07f Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


sql/slave.cc:
  Auto merged
2008-02-07 08:48:31 +01:00
unknown
8d040352d9 Bug#33050 5.0.50 fails many SSL testcases 2008-02-07 08:48:28 +01:00
unknown
7144184ced Disabling declaration of debug variable for non-debug builds.
sql/slave.cc:
  Disabling declaration in non-debug builds.
2008-02-07 08:41:32 +01:00
unknown
25bddc4de1 Merge pilot.mysql.com:/data/msvensson/mysql/bug32025/my50-bug32025
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-ndb


storage/ndb/tools/waiter.cpp:
  Manual merge from 5.0
2008-02-07 08:14:17 +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
30924a0afc Merge bk-internal:/home/bk/mysql-5.1-new-ndb
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-ndb
2008-02-07 07:38:35 +01:00
unknown
5cb34d741d Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


sql/slave.cc:
  Auto merged
sql/sql_binlog.cc:
  Auto merged
2008-02-07 07:30:06 +01:00
unknown
ea7ecda29b Merge riska.(none):/home/sven/bk/b34355-backslash_in_path_name_under_win/5.0-rpl
into  riska.(none):/home/sven/bk/b34355-backslash_in_path_name_under_win/5.1-new-rpl


client/mysqlbinlog.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
2008-02-06 21:07:45 +01:00
unknown
7b82376f0a Replace windows path separator backslash by unix path separator forward
slash in filenames also for Create_file_log_event.


client/mysqlbinlog.cc:
  BUG#34355: mysqlbinlog outputs backslash as path separator for 4.1 binlogs
  Problem: When the windows version of mysqlbinlog reads 4.1 binlogs
  containing LOAD DATA INFILE, it outputs backslashes as path separators in
  filenames. However, the output is typically piped to a client, and client
  expects forward slashes.
  Fix: Replace '\\' by '/' in filenames.
2008-02-06 20:55:12 +01:00
unknown
263b4ff3de Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result:
  Auto merged
mysql-test/suite/rpl_ndb/t/disabled.def:
  Auto merged
sql/log_event.cc:
  Auto merged
2008-02-06 16:16:49 +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
20fb40b0d6 Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Merge
2008-02-06 15:10:18 +01:00
unknown
cfca20b052 Added random sleeps before retrying temporarly failed DICT signals, to avoid race conditions 2008-02-06 15:08:45 +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
be5a46a69b Patch to eliminate some valgrind warnings in debug printout code.
sql/rpl_rli.cc:
  Adding variable to mark an instance of Relay_log_info as fake.
sql/rpl_rli.h:
  Adding variable to mark an instance of Relay_log_info as fake.
sql/slave.cc:
  Not printing debug information if we are working with a fake
  instance of Relay_log_info. This because the result of calling
  update is nonsense, and trying to print it generates valgrind
  warnings.
sql/sql_binlog.cc:
  Marking newly created instance of Relay_log_info as a fake instance.
2008-02-06 14:44:47 +01:00
unknown
72de77987e Merge bk-internal:/home/bk/mysql-5.1-new-ndb
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-ndb


storage/ndb/src/common/util/OutputStream.cpp:
  Auto merged
2008-02-06 14:38:08 +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
e156d6af4d ndb - bug#34216
During TC-take-over (NF) the new-TC builds up a new transaction state
  And commits operation according to this state.
  However, in the new state that is build, the operations does not have to be in same order, as "real" state
  In the multi-update-case, this means that operations can be commit in "incorrect" order

  i.e update A, delete A, insert A is normally commited in same order as prepared
      but can be committed in any order

  This patch changes TUP handling of these out-order commits, and previous implementation
    could confuse the TUX triggers


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  new method
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  move removeActiveOpList, cause it's now only used by DbtupAbort
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  - move tux-trigger execution *before* check of disk, since ops can be committed during a disk timeslice
  - allow out-of-order commits and use tuple_ptr->m_operation_ptr_i for determening "real" commit
    (instead of re-ordering operations on the fly, which confused tux-triggers)
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  use constant instead of number
storage/ndb/test/run-test/daily-basic-tests.txt:
  "old-51" does not yet support --nologging
2008-02-06 13:06: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
2574d83cc8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2008-02-06 11:42:18 +01:00
unknown
d65318519e ndb - bug#34216
testcases


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  new error codes
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  new error codes
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  new error codes
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  remove assert
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  new testcase
  1) -n Bug34216
     Which tests node diying during multip-op commit
     Very controlled
  
  2) -n mixedmultiop
     Runs several threads "load" of same scenario...not very controlled
storage/ndb/test/run-test/daily-basic-tests.txt:
  new testcases
2008-02-06 11:28:43 +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
6cb9dfed6f Removing duplicate code from mysql-test-run.pl
mysql-test/mysql-test-run.pl:
  Removing duplicate code.
2008-02-06 06:18:06 +01: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