Commit graph

29994 commits

Author SHA1 Message Date
unknown
e2d429572b Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-27 15:13:13 +01:00
unknown
9c46ce872f bug#16842 - ndb dd - drop logfile group crashed after SR
storage/ndb/src/kernel/blocks/lgman.cpp:
  Register thread start also on SR
2006-01-27 15:12:04 +01:00
unknown
92159be598 bug#16495 - ndb dd - dict ref count was not correctly set after SR
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Add dump for object/ref count
  Fix ref count on SR
2006-01-27 15:09:07 +01:00
unknown
e81a01b024 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-debug
2006-01-27 16:30:53 +03:00
unknown
23d107240e Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-27 14:24:20 +01:00
unknown
9ea27d3250 ndb dd - Remove incorrect assertion making it's impossible to only use 1 undo file with "high" load
storage/ndb/src/kernel/blocks/lgman.cpp:
  Remove incorrect assertion making it's impossible to only use 1 undo file with "high" load
2006-01-27 14:23:43 +01:00
unknown
7511a45b92 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-27 14:22:01 +01:00
unknown
a1565cdc11 fix safemalloc warnings
sql/log.cc:
  split logging cleanup function in two
  and do actual delete of the log event
  handlers
sql/log.h:
  split logging cleanup function in two
sql/mysqld.cc:
  split logger cleanup in two phases
2006-01-27 16:10:40 +03:00
unknown
5281729e8c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-merge1
2006-01-27 14:07:08 +03:00
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
d255344c0b 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-27 07:38:39 +01:00
unknown
8d9c619756 Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-27 07:37:31 +01:00
unknown
357cc3ea21 ndb dd -
fix bug in LCP + extent alloc


storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  fix for page allocation
storage/ndb/src/kernel/blocks/pgman.cpp:
  Fix LCP in pgman with more than 32 pages in one bucket
storage/ndb/src/kernel/blocks/tsman.cpp:
  ifdef printouts
2006-01-27 07:34:17 +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
bd2e11f571 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-merge1
2006-01-27 00:08:48 +03: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
0100356c22 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-26 21:00:00 +01:00
unknown
04af4d100f gcc295 fixes for embedded 2006-01-26 20:56:56 +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
9853390f4c Merge mysql.com:/opt/local/work/mysql-5.0-for-merge
into  mysql.com:/opt/local/work/mysql-5.1-merge1


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-01-26 16:36:33 +03: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
d85bdd5893 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG16722/mysql-5.1-new
2006-01-26 15:23:08 +04:00
unknown
1d5185d6ec BUG#16722 - Fulltext: implicit limit for query word number (depends on length of the query)
Remove implicit limit for query word number.


mysql-test/r/fulltext.result:
  Reoder results.
storage/myisam/ft_boolean_search.c:
  Remove implicit limit for query word number. Instead compute
  number of elements and allocate exactly needed memory.
2006-01-26 15:12:59 +04:00
unknown
328f044e49 bug#16787 - ndb dd - fix datafiles with more than 1 extent page
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  qd fix for inconsistency tsman/tup
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Increase extent pool
storage/ndb/src/kernel/blocks/pgman.cpp:
  Increase page entry pool
  Run LCP loop wo/ continueb
storage/ndb/src/kernel/blocks/tsman.cpp:
  Fix creating of datafiles with more than 1 extent page
2006-01-26 12:07:21 +01:00
unknown
f220f89212 Bug #15719 MYSQL_OPT_RECONNECT option is modified by mysql_real_connect
- Move init of "reconnect" variable to mysql_init 
 - Add test case to mysql_client_test.


sql-common/client.c:
  Move initialisation of reconnect variable to mysql_init instead of doing it in mysql_real_connect.
tests/mysql_client_test.c:
  Add test to check that reconnect is not modified by a call to mysql_real_connect
2006-01-26 11:20:59 +01: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
2b4d61cae5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-26 09:51:24 +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
f5205ee8d0 Add storage/example to make_win_src_distribution
scripts/make_win_src_distribution.sh:
  Add storage/example
2006-01-25 18:21:22 -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