Commit graph

31031 commits

Author SHA1 Message Date
unknown
5eb66770fd Bug#14354 Partitions: data directory clause fails
- Use "system" to execute rm, mkdir etc
 - Use MYSQLTEST_VARDIR


mysql-test/t/partition_mgm_err.test:
  Use system to execute "unix" command.
  Use MYSQLTEST_VARDIR
2006-02-21 17:09:09 +01:00
unknown
d49e47700c Merge neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Merge
mysql-test/t/mysqldump.test:
  Merge
2006-02-21 15:57:56 +01:00
unknown
7c5a234937 Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871
into  neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Merge
mysql-test/t/mysqldump.test:
  Merge
2006-02-21 15:03:15 +01: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
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
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
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
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
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
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
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
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
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
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
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
unknown
281cd0f300 Bug #17559 ndb_gis test failure
- test tables use blobs without PK, and was not handled correctly
2006-02-20 12:36:10 +01:00
unknown
2ce03bb5ba ndb - rbr blobs etc: set db/schema in injector_ndb before calling NDB
storage/ndb/src/ndbapi/NdbBlob.cpp:
  DBUG
storage/ndb/include/ndbapi/Ndb.hpp:
  method to set db/schema from table name + format check in internalize_table_name
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  method to set db/schema from table name + format check in internalize_table_name
storage/ndb/src/ndbapi/Ndb.cpp:
  method to set db/schema from table name + format check in internalize_table_name
sql/ha_ndbcluster_binlog.cc:
  set injector_ndb db/schema before calling NDB (may be more cases..).  only place to get it is table internal name
2006-02-20 12:07:12 +01:00
unknown
e46f214fd9 Fix typo
client/mysqltest.c:
  Typo % should be %s
2006-02-20 12:05:45 +01:00
unknown
b4c13a79ca fix the output. now only 1 space in PK definition 2006-02-20 11:20:31 +01:00
unknown
140c91643b post-merge fixes. 2006-02-20 10:30:32 +01:00
unknown
b14a6af821 Merge mysql.com:/usr/local/mysql/mysql-5.0-fixtest
into  mysql.com:/usr/local/mysql/mysql-5.1-new


mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Manual merge.
2006-02-20 09:52:22 +01:00
unknown
8aac108d91 Remove hard-coded ../var/.. path in test mix_innodb_myisam_binlog,
fails with --vardir option.
2006-02-20 09:34:02 +01:00
unknown
7256f14cb6 ndb -
Fix online ordered index build of varsize table


storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  Fix online ordered index build of varsize table
2006-02-20 09:03:52 +01:00
unknown
2a4ca93d8e Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-02-20 08:40:24 +01:00
unknown
0bc0097505 Merge rurik.mysql.com:/home/igor/mysql-5.1
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/subselect.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-02-19 19:26:25 -08:00
unknown
5581583585 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-02-20 03:14:33 +01:00
unknown
5fed9f4626 mysql.spec.sh:
Reintroduced a max build
  Limited testing of 'debug' and 'max' servers
  Berkeley DB only in 'max'


support-files/mysql.spec.sh:
  Reintroduced a max build
  Limited testing of 'debug' and 'max' servers
  Berkeley DB only in 'max'
2006-02-20 03:10:08 +01:00
unknown
36d400911b Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-02-20 00:36:40 +01:00
unknown
8cab8c82c8 mysql-test-run.pl:
Added --restart-cleanup option
drop-on-restart.inc:
  DROP commands to cleanup on restart
  new file
mysqltest.c:
  Added option --include=<sql-file>


client/mysqltest.c:
  Added option --include=<sql-file>
mysql-test/include/drop-on-restart.inc:
  DROP commands to cleanup on restart
mysql-test/mysql-test-run.pl:
  Added --restart-cleanup option
2006-02-20 00:32:07 +01:00
unknown
424ade5c81 Merge 2006-02-19 23:57:49 +01:00
unknown
77d7fd80d0 Merge
client/Makefile.am:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
client/mysqlimport.c:
  SCCS merged
2006-02-19 23:47:00 +01:00