Commit graph

30906 commits

Author SHA1 Message Date
unknown
a660fd11c4 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-17 08:41:10 -06:00
unknown
b8c01c573e Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqlcheck.c:
  Auto merged
2006-02-17 08:33:47 -06:00
unknown
128e5df7e9 mysqlcheck.c:
Tweak --check-upgrade help text.


client/mysqlcheck.c:
  Tweak --check-upgrade help text.
2006-02-17 08:32:52 -06:00
unknown
55ae27a5eb configure.in:
Updated version number to 5.1.8


configure.in:
  Updated version number to 5.1.8
2006-02-17 14:54:06 +01:00
unknown
189b687d48 Surprising change: "mysqld-max" is resurrected in 5.1, but in a common package. 2006-02-17 14:14:56 +01:00
unknown
6fb99780cb Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-17 07:10:55 -06:00
unknown
d3840054fb Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.16234
2006-02-17 16:39:42 +04:00
unknown
2d71412912 merging 2006-02-17 14:39:38 +04:00
unknown
423f134041 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.16234
2006-02-17 13:38:01 +04:00
unknown
ca417a74a7 WL#2645 (CHECK FOR UPGRADE)
5.1-related fixes


BitKeeper/etc/ignore:
  Added scripts/mysql_upgrade to the ignore list
sql/ha_partition.cc:
  ha_check and ha_repair now to be called
sql/handler.cc:
  code modified to be 5.1 compliant
2006-02-17 13:37:37 +04:00
unknown
36a0a13da7 upgrade.result, upgrade.test:
new file:
  Adding a test case for "Migration tool for 5.1 table name encoding"
2006-02-17 13:19:26 +04:00
unknown
83c1f257ec client_priv.h:
Sorry, forgot to push in the previous changeset.


client/client_priv.h:
  Sorry, forgot to push in the previous changeset.
2006-02-17 13:10:12 +04:00
unknown
5a26706dff mysqlcheck.c:
WL#3046  Migration tool for 5.1 table-name encoding


client/mysqlcheck.c:
  WL#3046  Migration tool for 5.1 table-name encoding
2006-02-17 12:10:36 +04:00
unknown
4e5c55e579 reported bugs and disabled corresponding tests
disabled non deterministic test
2006-02-17 09:02:11 +01:00
unknown
53cf5e6000 Merging 5.0->5.1
include/myisam.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
include/my_base.h:
  merging
scripts/Makefile.am:
  merging
sql/handler.cc:
  merging
sql/share/errmsg.txt:
  merging
sql/sql_yacc.yy:
  merging
2006-02-17 11:26:03 +04:00
unknown
aec6b1765b Merge mysql.com:/home/hf/work/mysql-5.0.clean
into mysql.com:/home/hf/work/mysql-5.1.w2645


mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
2006-02-17 11:12:05 +04:00
unknown
96b4449370 Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.w2645


sql/sql_table.cc:
  Auto merged
2006-02-17 10:56:54 +04:00
unknown
bf84040458 WL#2645 (CHECK TABLE FOR UPGRADE)
necessary implementation in the server
mysql_upgrade script added


client/mysqlcheck.c:
  --check-upgrade option added
include/my_base.h:
  errcode added
include/myisam.h:
  option added
scripts/Makefile.am:
  mysql_upgrade script added
sql/handler.cc:
  checks for old types/bugs added
sql/handler.h:
  declarations regarding checks for upgrade
sql/lex.h:
  sym added
sql/share/errmsg.txt:
  error message added
sql/slave.cc:
  now ha_repair is for public use
sql/sql_table.cc:
  upgrade in ha_repair implemented
sql/sql_yacc.yy:
  CHECK ... FOR UPGRADE added to syntax
2006-02-17 10:52:32 +04:00
unknown
bd5e7cef54 Test case
mysql-test/r/rpl_stm_log.result:
  Fixing test case
2006-02-17 00:54:00 +01:00
unknown
1a1b6ea00d Updated result files
mysql-test/r/rpl_row_blob_innodb.result:
  Updated results files
mysql-test/r/rpl_row_blob_myisam.result:
  Updated results files
2006-02-16 23:10:52 +01:00
unknown
221cbd5c4e Test cleanup
mysql-test/t/disabled.def:
  Updated
mysql-test/extra/rpl_tests/rpl_log.test:
  Updated and moved drop of tables to end of test to help bin log be more deterministic
mysql-test/r/rpl_row_log.result:
  Updated results
mysql-test/r/rpl_row_log_innodb.result:
  Updated results
mysql-test/r/rpl_ndb_log.result:
  Updated results
2006-02-16 21:50:05 +01:00
unknown
aa97db1922 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
2006-02-16 21:42:45 +01:00
unknown
3554d87f84 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug8841
2006-02-16 19:23:37 +01:00
unknown
adb30dd537 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-16 10:27:48 -06:00
unknown
ed8b745909 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-16 17:27:47 +01:00
unknown
22b4ced45e 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-16 17:27:46 +01:00
unknown
931f4d74bb Bug #17459 Cluster row based replication not setup if backup is ongoing
- also accept setting up binlog for tables in stateBackup
2006-02-16 17:25:28 +01:00
unknown
55383493e0 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-16 10:01:16 -06:00
unknown
74f6299efd mysqlcheck.c:
Fix out of order options.


client/mysqlcheck.c:
  Fix out of order options.
2006-02-16 10:00:14 -06:00
unknown
14a4824194 Test updates
mysql-test/t/ndb_dd_backuprestore.test:
  Updated with suggestions from Jonas
mysql-test/include/ndb_restore_master.inc:
  corrected issues with using cygwin to create
mysql-test/include/ndb_backup.inc:
  corrected issues with using cygwin to create
2006-02-16 16:33:46 +01:00
unknown
e0cbeea11f ndb - wl#3023 : pass tables per GCI to injector at epoch start
sql/ha_ndbcluster_binlog.cc:
  use_table at beginning of epoch
storage/ndb/include/ndbapi/Ndb.hpp:
  getGCIEventOperations: return distinct event ops at epoch start
storage/ndb/src/ndbapi/Ndb.cpp:
  getGCIEventOperations: return distinct event ops at epoch start
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  getGCIEventOperations: return distinct event ops at epoch start
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  getGCIEventOperations: return distinct event ops at epoch start
2006-02-16 14:54:30 +01:00
unknown
5cdf49f0ce Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 14:53:38 +01:00
unknown
b5e971dd1f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-16 14:53:37 +01:00
unknown
5e98e21a6e Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 14:53:37 +01:00
unknown
b0232826ae 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-02-16 14:53:36 +01:00
unknown
e0ffcea886 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1


client/mysqldump.c:
  Auto merged
2006-02-16 14:53:36 +01:00
unknown
b1249dd8d7 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16406


sql/sql_show.cc:
  Auto merged
2006-02-16 14:53:36 +01:00
unknown
79e26c1fb3 Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/ndb_msg-5.1 2006-02-16 14:53:35 +01:00
unknown
42f8c2d2ea Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/dev/mysql-5.1-wl3148


sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
2006-02-16 16:53:34 +03:00
unknown
99ea15c93f The patch adds PROCESSLIST information schema
mysql-test/r/information_schema.result:
  Fixing results after PROCESSLIST information schema is added.
mysql-test/r/information_schema_db.result:
  Fixing results after PROCESSLIST information schema is added.
mysql-test/t/information_schema.test:
  Test case to check PROCESSLIST information schema.
    (Note that selecting other fields from PROCESSLIST
    can make the test unstable).
sql/sql_show.cc:
  Code for PROCESSLIST information schema
sql/table.h:
  Added for PROCESSLIST informarion schema
2006-02-16 16:45:05 +03:00
unknown
b4e7b365b5 Updates from review
mysql-test/include/ndb_backup.inc:
  We are writting test cases that use the ndb backup. This new include contains all the code needed to start the backup and grab the backup ID for the test. By moving the code here it will be easy to reuse
mysql-test/include/ndb_restore_master.inc:
  We are writting test cases that use the ndb backup and restore. This new include contains all the code needed to restore a master cluster from the backup done with ndb_backup.inc. By moving the code here it will be easy to reuse
mysql-test/t/ndb_dd_backuprestore.test:
  Updated with suggestions from Jonas
2006-02-16 14:24:47 +01:00
unknown
9b0dcd4104 Fix for solaris compiler 2006-02-16 13:12:25 +01:00
unknown
c80a0d7171 fix bug in show events which shows
| INTERVAL_VALUE | INTERVAL_FIELD |
| 20             | 20 MINUTE      |
the second one should be without the value


mysql-test/r/events.result:
  update test result to be as they should be
sql/event_timed.cc:
  manually append the name of the interval because it's no more appended
  by reconstruct_value
2006-02-16 13:11:16 +01:00
unknown
8916aa35bc missing DBUG_RETURN 2006-02-16 12:31:33 +01:00
unknown
ec2485c302 Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/ndb_msg-5.1 2006-02-16 12:14:03 +01:00
unknown
57aeec9a5c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-clean
2006-02-16 10:41:07 +01:00
unknown
920b9275bb Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug8841
2006-02-16 10:31:32 +01:00
unknown
3eacd48420 Merge msvensson@devsrv-b:/space/magnus/my51-bug17386
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/disabled.def:
  Auto merged
2006-02-16 10:24:50 +01:00
unknown
23b5e83ca4 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:23:33 +01:00
unknown
9f6be31796 Merge neptunus.(none):/home/msvensson/mysql/bug16333/my51-bug16333
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:22:04 +01:00