Commit graph

31280 commits

Author SHA1 Message Date
unknown
1f12107f00 Bug#14857 Reading dump files with single statement stored routines fails.Bug #14857 Reading dump files with single statement stored routines fails.
- Add tests, fixed by patch for 16878


mysql-test/r/mysqldump.result:
  Update test results
mysql-test/t/mysqldump.test:
  Add tests for bug 14857
2006-02-21 13:43:29 +01:00
unknown
0a970b1289 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message
2006-02-21 15:34:54 +03:00
unknown
8a1dd17b5e Fix for Bug #12674 "Instance Manager: IM doesn't handle client
connections correctly".
Recommit with the max timeout value in sync with the comment.


server-tools/instance-manager/options.cc:
  add new option to set wait timeout
server-tools/instance-manager/priv.h:
  add a const for max wait timeout
2006-02-21 15:32:52 +03:00
unknown
15c3702598 Bug#14871 mysqldump: invalid view dump output
- Add comments with embeded veriosn info around the parts of the view syntax that are only supported by a certain version of MySQL Server


client/mysqldump.c:
  Use information_schema.views to gather information about the view, then replace some parts of the output from "SHOW CREATE VIEW" with comment markers with version, to make thos parts of the view syntax become parsed only of MySQL servers that supports it.
  Create common function "open_sql_file_for_table" to open the individual .sql file where to dump the table or view.
mysql-test/r/mysqldump.result:
  Update results
mysql-test/t/mysqldump.test:
  Add test to see that views can be deumped and reloaded alos when they contain "SECURITY TYPE", "CHECK OPTION" and "DEFINER"
2006-02-21 13:21:17 +01:00
unknown
010f9be50c Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG17116/mysql-5.1-new
2006-02-21 16:20:02 +04:00
unknown
a11129afc4 disable tests. failures happen from time to time and stop people from
pushing. the code needs to be more stable.
2006-02-21 13:07:25 +01:00
unknown
5779d562cc Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
client/mysqltest.c:
  Merge
mysql-test/mysql-test-run.pl:
  Merge
mysql-test/t/mysqldump.test:
  Merge
mysql-test/t/mysqltest.test:
  Merge
2006-02-21 10:37:10 +01:00
unknown
3a9f0e7617 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
client/mysqltest.c:
  Merge
mysql-test/mysql-test-run.pl:
  Merge, undo removal
mysql-test/t/mysqldump.test:
  Merge
mysql-test/t/mysqltest.test:
  Merge
2006-02-21 09:40:18 +01:00
unknown
c004864802 Merge neptunus.(none):/home/msvensson/mysql/bug17382/my51-bug17382
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged
2006-02-21 09:28:36 +01:00
unknown
5eadf344fe ndb - enable ndb_dd_backuprestore
mysql-test/t/disabled.def:
  enable ndb_dd_backuprestore
2006-02-21 09:27:20 +01:00
unknown
0e58db7473 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-21 09:27:19 +01:00
unknown
f19241d521 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-21 09:27:18 +01:00
unknown
37684a1e3e fixed test result on ndb_dd_restore whwas not done before 2006-02-21 09:25:50 +01:00
unknown
d736de57ca Merge neptunus.(none):/home/msvensson/mysql/bug13809/my51-bug13809
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
2006-02-21 09:11:59 +01:00
unknown
7e57cbec2f Merge neptunus.(none):/home/msvensson/mysql/bug13809/my50-bug13809
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
2006-02-21 09:11:03 +01:00
unknown
5854239dbd Merge neptunus.(none):/home/msvensson/mysql/bug13809/my50-bug13809
into  neptunus.(none):/home/msvensson/mysql/bug13809/my51-bug13809


client/mysqltest.c:
  Auto merged
2006-02-21 09:09:54 +01:00
unknown
5c77e47ae9 Merge neptunus.(none):/home/msvensson/mysql/bug16557/my51-bug16557
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 09:06:35 +01:00
unknown
f04e21e1be Merge neptunus.(none):/home/msvensson/mysql/bug16557/my50-bug16557
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 08:58:19 +01:00
unknown
eda8a2e9eb Merge neptunus.(none):/home/msvensson/mysql/bug16557/my50-bug16557
into  neptunus.(none):/home/msvensson/mysql/bug16557/my51-bug16557
2006-02-21 08:57:18 +01:00
unknown
8d93d9256c Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
2006-02-21 08:55:13 +01:00
unknown
bc9af12e28 Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795
into  neptunus.(none):/home/msvensson/mysql/bug16795/my51-bug16795


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
2006-02-21 08:54:08 +01:00
unknown
e36762ead8 Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


libmysql/libmysql.c:
  Auto merged
2006-02-21 08:50:26 +01:00
unknown
800e6b008d Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057
into  neptunus.(none):/home/msvensson/mysql/bug14057/my51-bug14057


libmysql/libmysql.c:
  Auto merged
2006-02-21 08:49:21 +01:00
unknown
d1f0fc821c Merge neptunus.(none):/home/msvensson/mysql/bug2845/my51-bug2845
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 08:45:17 +01:00
unknown
ccec6f3e9f Merge neptunus.(none):/home/msvensson/mysql/bug2845/my50-bug2845
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 08:44:27 +01:00
unknown
13a81d455f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-21 05:08:18 +01:00
unknown
5c9afee608 fixed result
mysql-test/r/events.result:
  result fixed
2006-02-21 03:17:53 +01:00
unknown
ae48f5fdf7 fix for bug#16407 (EVENTS: sql_mode)
post-review fixes


mysql-test/r/events_bugs.result:
  fix result
sql/event.cc:
  fix compilation problem on windows
sql/event_executor.cc:
  show the right host in show processlist (should be event_scheduler@localhost)
sql/event_timed.cc:
  a bit more debug infor
  fix a problem introduced with previous push :( . clean everything that's whitespace.
  found because of new test cases which were crashing.
sql/sql_show.cc:
  fix compile problem on windows
2006-02-21 02:40:23 +01:00
unknown
449cc2400b ndb - fix event created by ndb_restore bug#17045 (not really)
mysql-test/t/disabled.def:
  leave ndb_dd_backuprestore disabled until *.result corrected
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  error code was clobbered
storage/ndb/tools/restore/consumer_restore.cpp:
  surprise - ndb_restore creates events
2006-02-21 02:27:23 +01:00
unknown
e41f5cc464 manual merge
sql/event.cc:
  Auto merged
sql/event.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
2006-02-21 00:01:39 +01:00
unknown
203b37effe fix for bug#16407 (Events: Changes in sql_mode won't be taken into account)
WL#1032
sql_mode setting was disregarded during create/alter event and wasn't set during
event execution.
(post-review small fixes)


sql/event.cc:
  store the sql_mode when the body is stored
  - always on create event
  - during alter event if the user changes the body
sql/event.h:
  add sql_mode as member variable
sql/event_timed.cc:
  - exchange thd->variables.sql_mode before and after execution
  - set the sql_mode of the anonymous SP -> event_timed::sphead
sql/sql_show.cc:
  - show real content in I_S.EVENTS.SQL_MODE , disallow NULL
2006-02-20 23:52:22 +01:00
unknown
b36730953c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-02-20 23:29:55 +01:00
unknown
c1473ba882 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
2006-02-20 22:23:02 +01:00
unknown
56d1810d0a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-look
2006-02-21 00:20:44 +03:00
unknown
c7d335a7d2 BUG#15448 (group_min_max test failure): Don't bypass group-min-max optimizer entry point
if we've got a tree of type ALWAYS or MAYBE.


sql/opt_range.cc:
  BUG#15448 (group_min_max test failure): Don't buypass group-min-max optimizer entry point 
  if we've got a tree of type ALWAYS or MAYBE.
  The effect observed by this bug has been introduced by this cset: 
  ChangeSet 1.1967.5.2 2005/12/26 08:40:09 sergefp@mysql.com. The cset introduced PARAM::remove_jump_scans
  which purpose was to avoid making [always unsuccessful] attempts to construct index_merge for construct 
  index_merge for conditions like "t.key1partX=c1 OR t.key1partY=c2". The effect of this change was that some
  queries that previously had produced a SEL_TREE representing candidate for index_merge(X,Y) now started to 
  produce SEL_TREE with type=ALWAYS, and group-min-max analysis for these trees has been bypassed.
  In this fix we make SEL_TREE with type=ALWAYS to be processed in the same way as (SEL_TREE*)NULL, its equivalent.
2006-02-21 00:17:29 +03:00
unknown
fc6416fca7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-vanilla
2006-02-20 23:00:50 +03:00
unknown
5e00b327cd Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406


mysql-test/r/events.result:
  Auto merged
2006-02-20 20:57:44 +01:00
unknown
4ba2e0085f A new error message for deprecated statements.
Fixes failing sp.test


mysql-test/r/backup.result:
  A new error message for deprecated statements.
mysql-test/t/sp.test:
  Disable warnings in the test for Bug#13012
sql/share/errmsg.txt:
  A new error message for deprecated statements.
sql/sql_yacc.yy:
  Use a better worded error message.
2006-02-20 22:51:32 +03:00
unknown
37b1731727 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-20 18:23:30 +01:00
unknown
de83767bd0 ndb - enable rpl_ndb_blob2 bug#17505
mysql-test/extra/rpl_tests/rpl_row_blob.test:
  enable rpl_ndb_blob2 (sleep fixed)
mysql-test/t/disabled.def:
  enable rpl_ndb_blob2 (sleep fixed)
2006-02-20 17:20:54 +01:00
unknown
140c3b8a94 ndb - rbr blobs etc: minor changes bug#17045 bug#17505
sql/ha_ndbcluster_binlog.cc:
  optim: setting db/schema for data events seems unnecessary
storage/ndb/src/ndbapi/Ndb.cpp:
  use NAME_LEN
2006-02-20 16:36:30 +01:00
unknown
17fb7f96a2 fix for bug #16411 Events: Microsecond intervals are allowed
WL#1034


mysql-test/r/events.result:
  output fix
sql/event.cc:
  - handle also INTERVAL_MICROSECOND, was missing.
  - use renamed ER_ code which is generic
sql/event.h:
  add new error code
sql/event_executor.cc:
  - use new ER_ code name
  - handle EVEX_MICROSECOND_UNSUP error code
sql/event_timed.cc:
  forbid MICROSECOND intervals for events
sql/share/errmsg.txt:
  rename error code, it's generic
sql/sql_show.cc:
  use new error code name
sql/sql_yacc.yy:
  bail out if any MICROSECOND interval is specified
2006-02-20 16:06:05 +01:00
unknown
17bab6a57a Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
into  neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace


client/mysqltest.c:
  Auto merged
2006-02-20 15:06:18 +01:00
unknown
b087cd2bd6 Merge fix
client/mysqltest.c:
  Fix merge error
2006-02-20 15:05:23 +01:00
unknown
06d4f8838c Escape \ in "exec"
mysql-test/t/ndb_config.test:
  Add extra \ to escape \. 
  \\\n => \n
2006-02-20 15:03:16 +01:00
unknown
b6ed1294c2 Merge jonas@perch:src/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-20 13:38:26 +01:00
unknown
0934ad5d7f Bug#17382 mysql-test-run mysqldump fails with mysqlimport
client/Makefile.am:
  Use LDADD_R as common variable for programs to be linked with thread safe library.
client/mysqlimport.c:
  Enable "--use-threads"
  Formatting
mysql-test/r/mysqldump.result:
  Update test result
mysql-test/t/disabled.def:
  Enable mysqldump
mysql-test/t/mysqldump.test:
  Enable test for mysqlimport with threads
  Add test for failed mysqlimport
2006-02-20 13:04:40 +01:00
unknown
c8a03c1753 disabled.def: merge
mysql-test/t/disabled.def:
  e
  hate bk
2006-02-20 12:37:28 +01:00
unknown
68ef8a6f18 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
2006-02-20 12:37:27 +01:00
unknown
613d172123 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-20 12:37:26 +01:00