Commit graph

29797 commits

Author SHA1 Message Date
unknown
bdcaf4be03 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into debian.(none):/M51/mysql-5.1
2006-01-27 10:10:09 +01:00
unknown
43f6f1b9d5 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16434


sql/event_timed.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
2006-01-27 01:07:34 +01:00
unknown
16478e1a76 post-push fix of fix for bug #16401 (field should be char not varchar)
WL#1034 (Internal CRON)


mysql-test/lib/init_db.sql:
  fix for bug #16401, varchar -> char
mysql-test/r/system_mysql_db.result:
  fix the result of the test after pull (currently system_mysql_db is disabled)
2006-01-26 23:03:46 +01:00
unknown
f89018b7bc Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-new
2006-01-26 22:46:04 +01:00
unknown
cf54bc182d post-commit fix of fix for bug#16419
WL#1034 (Internal CRON)
(not interesting for the Changelog)


mysql-test/r/events.result:
  update result
mysql-test/t/events.test:
  update test after pull after comit of fix for bug 16419
2006-01-26 22:18:40 +01:00
unknown
fe1c9f9e04 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16434


sql/event_timed.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
2006-01-26 22:10:12 +01:00
unknown
8b3b76c6d4 fix for bug#16434 (Events: Illegal dates don't cause errors)
(post-review commit)
WL#1034 (Internal CRON)


sql/event_timed.cc:
  remove bogus check
sql/share/errmsg.txt:
  change error messages
sql/sql_yacc.yy:
  handle error code returned by event_timed::init_starts()
2006-01-26 22:01:34 +01:00
unknown
c0161265cc Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16419


mysql-test/r/events.result:
  Auto merged
mysql-test/t/events.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2006-01-26 21:26:19 +01:00
unknown
3881218dc9 fix for bug#16419 (Events: can't use timestamp in the schedule)
WL #1034 (Internal CRON)


mysql-test/r/events.result:
  update test result
mysql-test/t/events.test:
  add tests
sql/event_timed.cc:
  - remove stupid check of val_int()
  - fix for bug #16419 (Events: can't use timestamp in the schedule)
    => don't use val_int() but only get_date() and use the date!
sql/share/errmsg.txt:
  - fix an error message, one more "einen"
sql/sql_yacc.yy:
  - handle new return value of event_timed::init_execute_at()
2006-01-26 21:21:21 +01:00
unknown
d1732a2515 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into debian.(none):/M51/mysql-5.1
2006-01-26 21:01:36 +01:00
unknown
5c974cf184 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16404
2006-01-26 20:47:08 +01:00
unknown
641825b9ff fix for bug #16401 Events: mysql.event.comment is varchar(64)
missed that one in the previos commit
2006-01-26 20:30:12 +01:00
unknown
63fd0bc1c6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-new
2006-01-26 20:23:19 +01:00
unknown
6151b93dfa Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020
2006-01-26 17:32:33 +01:00
unknown
bdf449c55e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into debian.(none):/M51/mysql-5.1
2006-01-26 14:27:23 +01:00
unknown
4fd1419ef7 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1
2006-01-26 06:38:26 -06:00
unknown
cc90212fc9 using const char * as the output of strrchr to make solaris compiler happy. 2006-01-26 06:37:25 -06:00
unknown
1de00282d4 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  selena.:H:/MYSQL/src/#00000-mysql-5.1
2006-01-26 15:28:35 +03:00
unknown
8e52972a14 Fixes a build problem of mysqlslap by adding a dependency to mysqlclient & mysys
VC++Files/client/mysqlslap.vcproj:
  Explicit library specification removed from project file
VC++Files/mysql.sln:
  Dependency to mysqlclient & mysys is added for mysqlslap in mysql.sln
2006-01-26 15:23:53 +03:00
unknown
af48d4a298 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020
2006-01-26 11:14:21 +01:00
unknown
77f51bf11a Bug #16152, create event assertion in debug version, list corruption 2006-01-26 11:14:20 +01:00
unknown
b9f28c9a71 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into debian.(none):/M51/mysql-5.1
2006-01-26 09:03:30 +01:00
unknown
375afff3bd fixed test issues with bug #14354. I had mistakenly included
/var/tmp in my path when testing data diretory.  the var directory
exists in a src tree but may not exist in a different testing
build setup.


mysql-test/r/partition_mgm_err.result:
  added a row insert just to make sure the data and index files are made
mysql-test/t/partition_mgm_err.test:
  removed the /var/tmp path elements since there is not guarantee that
  other build setups will include this path
2006-01-25 21:54:43 -06:00
unknown
456524c060 Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup().
my_stat() gettinng the correct parameter list may be next :)


client/mysqlslap.c:
  rename
extra/comp_err.c:
  rename
include/my_sys.h:
  replace
mysys/mf_tempdir.c:
  replace
mysys/my_malloc.c:
  replace
mysys/safemalloc.c:
  replace
sql/ha_federated.cc:
  replace
sql/log_event.cc:
  replace
sql/set_var.cc:
  replace
sql/set_var.h:
  replace
storage/myisam/ft_stopwords.c:
  replace
2006-01-25 19:54:42 -08:00
unknown
58de75fae8 add myself to checkout:get (should be default for all)
BitKeeper/etc/config:
  why is this not default?
2006-01-25 22:49:31 +01:00
unknown
63a80b964f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51


mysql-test/t/disabled.def:
  Auto merged
2006-01-25 22:39:00 +01:00
unknown
465960c2e3 ndb - wl#2972 rbr blobs: write blob data to binlog
mysql-test/t/disabled.def:
  rbr blobs: write data + dict cache workarounds
sql/ha_ndbcluster.cc:
  rbr blobs: write data + dict cache workarounds
sql/ha_ndbcluster.h:
  rbr blobs: write data + dict cache workarounds
sql/ha_ndbcluster_binlog.cc:
  rbr blobs: write data + dict cache workarounds
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  rbr blobs: write data + dict cache workarounds
storage/ndb/src/ndbapi/NdbBlob.cpp:
  rbr blobs: write data + dict cache workarounds
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  rbr blobs: write data + dict cache workarounds
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  rbr blobs: write data + dict cache workarounds
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  rbr blobs: write data + dict cache workarounds
2006-01-25 22:22:50 +01:00
unknown
0e155240e9 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1-bug14354


mysql-test/r/partition_mgm_err.result:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
mysql-test/t/partition_mgm_err.test:
  SCCS merged
2006-01-25 13:10:00 -06:00
unknown
6efc402201 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into debian.(none):/M51/mysql-5.1
2006-01-25 12:58:23 +01:00
unknown
cbfc0f4c60 Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-25 11:06:36 +01:00
unknown
837723f652 bug#10987 - ndb - unable to find restorable replica
Add massive printout when failure detected


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Add dumping of replica info
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Add dumping of replica info
2006-01-25 11:02:19 +01:00
unknown
a2fa3254e2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-25 09:51:51 +01:00
unknown
8dc5a6c6eb bug#16771 - ndb dd - fix leak of extents
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add debug printouts
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Add debug printouts
  Fix leak of extents
storage/ndb/src/kernel/blocks/pgman.cpp:
  Add debug printouts
2006-01-25 09:47:56 +01:00
unknown
0cb8c58e5b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into debian.(none):/M51/mysql-5.1
2006-01-25 07:59:11 +01:00
unknown
516a6d9375 Compile failure fix for gcc 2.95x: Don't use unnamed union of unnamed
structs in PARTITION_ITERATOR
2006-01-25 06:01:54 +03:00
unknown
d1b9042d25 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into debian.(none):/M51/mysql-5.1
2006-01-24 18:46:10 +01:00
unknown
a2f192f1ef Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020


sql/table.cc:
  Auto merged
2006-01-24 17:46:13 +01:00
unknown
679aef1ba1 fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE)
WL#1034 (Internal CRON)


mysql-test/r/events.result:
  fix results file
mysql-test/t/events.test:
  change test for the fix of bug#16404
sql/lex.h:
  enabled/disabled were only for events, going back to enable/disable
  fix for bug#16404
sql/sql_yacc.yy:
  ENABLED -> ENABLE
  DISABLED -> DISABLE
  fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE)
2006-01-24 16:04:35 +01:00
unknown
8e35b68336 excess space caused "../scripts/mysql_create_system_tables: line 46: : command not found"
when I ran mysql-test-run
2006-01-24 15:50:04 +01:00
unknown
ae2abaef13 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/mysql_src/mysql-5.1-new
2006-01-24 15:38:52 +01:00
unknown
b455ba3f59 Fix for crash of "mysql-test-run --debug mysqldump": don't access dir->str if dir is null.
sql/parse_file.cc:
  since recently, the "dir" parameter can be 0.
2006-01-24 15:37:56 +01:00
unknown
1b77a01972 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push
2006-01-24 16:54:48 +03:00
unknown
1dc1e2e66d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs
2006-01-24 17:34:48 +04:00
unknown
641405241d table.cc:
Try to open an old 5.0 table name
  if encoded name doesn't exist.
  This makes SELECT working without having
  to rename tables with tricky characters
  in name into 5.1 format (simpliefies upgrade).


sql/table.cc:
  Try to open an old 5.0 table name
  if encoded name doesn't exist.
  This makes SELECT working without having
  to rename tables with tricky characters
  in name into 5.1 format (simpliefies upgrade).
2006-01-24 17:33:39 +04:00
unknown
24b8a9828e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push


mysql-test/r/binlog_row_ctype_cp932.result:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
2006-01-24 15:34:02 +03:00
unknown
15645bf597 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-24 13:27:16 +01:00
unknown
fb8376fa20 disabled.def:
Updated to remove ndb_dd_disk2memory
ndb_dd_disk2memory.result:
  Updated results to match change to show create table for NDB tables. WL 2604


mysql-test/r/ndb_dd_disk2memory.result:
  Updated results to match change to show create table for NDB tables. WL 2604
mysql-test/t/disabled.def:
  Updated to remove ndb_dd_disk2memory
2006-01-24 13:26:21 +01:00
unknown
d5e109ea6a bug#16742 - ndb dd - round filesize upwards
storage/ndb/src/kernel/blocks/tsman.cpp:
  Round filesize upwards
2006-01-24 11:41:58 +01:00
unknown
5f7d84930d bug#16738 - ndb dd - out of diskspace
fix typo + add error code to printable list


storage/ndb/include/kernel/signaldata/Extent.hpp:
  Set correct error code
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  err is already negative
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Set correct error code
storage/ndb/src/ndbapi/ndberror.c:
  Add error code to printable list
2006-01-24 10:47:04 +01:00
unknown
464ec791e7 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020


sql/table.cc:
  Auto merged
2006-01-24 10:31:41 +01:00