Commit graph

30742 commits

Author SHA1 Message Date
unknown
61ca6dc9a6 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
2006-02-14 11:51:44 +01:00
unknown
4e3f2e9d75 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-02-14 12:44:26 +02:00
unknown
a46ef2a8b5 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-14 12:42:27 +02:00
unknown
9236e3c24b BUG#17117: header fille "plugin.h" does not have a namespace prefix
plugin.h has been moved into include/mysql/plugin.h


include/mysql/plugin.h:
  Rename: include/plugin.h -> include/mysql/plugin.h
include/Makefile.am:
  plugin.h has been moved into include/mysql/plugin.h
include/myisam.h:
  plugin.h has been moved into include/mysql/plugin.h
plugin/fulltext/plugin_example.c:
  plugin.h has been moved into include/mysql/plugin.h
sql/sql_plugin.h:
  plugin.h has been moved into include/mysql/plugin.h
storage/csv/ha_tina.cc:
  plugin.h has been moved into include/mysql/plugin.h
storage/example/ha_example.cc:
  plugin.h has been moved into include/mysql/plugin.h
storage/myisam/ftdefs.h:
  plugin.h has been moved into include/mysql/plugin.h
2006-02-14 13:51:25 +04:00
unknown
81507408e2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-14 10:00:23 +01:00
unknown
e98c80737f Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-02-14 12:53:49 +04:00
unknown
89f14570ad Bug#16591 Partitions: crash using information_schema.partitions
Bug#16695 Reading I_S.PARTITIONS with pre-5.1.6 partitioned tables crashes server
 issue a warning in case of error during table opening
2006-02-14 12:52:38 +04:00
unknown
c033d138dc Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/16752-bug-5.0-mysql


sql/sql_select.cc:
  Auto merged
2006-02-14 11:33:46 +03:00
unknown
97dedfa4f9 Make sure slave cluster is stopped if there is cluster support
mysql-test/mysql-test-run.pl:
  Turn on $using_ndbcluster_slave before stopping slave cluster if cluster support exists
2006-02-14 09:15:51 +01:00
unknown
d72c08ce76 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-14 09:07:03 +01:00
unknown
99047a1837 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-14 08:33:52 +01:00
unknown
e9b5239619 disabled non deterministic test 2006-02-14 08:32:39 +01:00
unknown
7384eddba7 Merge mysql.com:/usr/home/bar/mysql-5.0.cs_fs
into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs


mysql-test/r/variables.result:
  SCCS merged
mysql-test/t/variables.test:
  SCCS merged
2006-02-14 09:41:34 +04:00
unknown
08c0ed7676 Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs
2006-02-14 08:50:52 +04:00
unknown
3c9952a1ae Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.cs_fs


sql/set_var.cc:
  Auto merged
2006-02-14 08:25:09 +04:00
unknown
7ce3b2a381 Many files:
Backporting character_set_filesystem from 5.0 to 5.1.


sql/mysqld.cc:
  Backporting character_set_filesystem from 5.0 to 5.1.
sql/set_var.cc:
  Backporting character_set_filesystem from 5.0 to 5.1.
sql/set_var.h:
  Backporting character_set_filesystem from 5.0 to 5.1.
sql/sql_class.cc:
  Backporting character_set_filesystem from 5.0 to 5.1.
sql/sql_class.h:
  Backporting character_set_filesystem from 5.0 to 5.1.
sql/sql_yacc.yy:
  Backporting character_set_filesystem from 5.0 to 5.1.
mysql-test/t/variables.test:
  Backporting character_set_filesystem from 5.0 to 5.1.
mysql-test/r/variables.result:
  Backporting character_set_filesystem from 5.0 to 5.1.
2006-02-14 08:24:01 +04:00
unknown
aefe5da549 Fixed comments bug#17239
client/mysqlslap.c:
  Fixed comments.
2006-02-13 19:09:10 -08:00
unknown
81f17615ac Removed version information from test 2006-02-14 02:18:41 +01:00
unknown
3649a68fab Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl


sql/sql_plugin.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
2006-02-13 23:27:51 +01:00
unknown
c4b5ba5643 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-13 23:27:50 +01:00
unknown
58991ee13c Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss115x
2006-02-14 01:27:49 +03:00
unknown
cdaffb61a5 Deleted innodb_unsafe_binlog.test erroneously merged from
the innodb-5.0-ss115 snapshot.


BitKeeper/deleted/.del-innodb_unsafe_binlog.test~8c3e0832ef20aa2:
  Delete: mysql-test/t/innodb_unsafe_binlog.test
BitKeeper/deleted/.del-innodb_unsafe_binlog-master.opt~9cbe1bb3d8696c5b:
  Delete: mysql-test/t/innodb_unsafe_binlog-master.opt
BitKeeper/deleted/.del-innodb_unsafe_binlog.result~7617b075b81d112d:
  Delete: mysql-test/r/innodb_unsafe_binlog.result
2006-02-14 01:25:13 +03:00
unknown
769364c5c8 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0


client/mysql.cc:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
sql/log_event.cc:
  Auto merged
2006-02-13 23:38:12 +02:00
unknown
80006c681f Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0


client/mysql.cc:
  manual merge use local
mysql-test/r/mysqlbinlog.result:
  manual merge use local
mysql-test/t/mysqlbinlog.test:
  manual merge use local
sql/log_event.cc:
  manual merge use local
2006-02-13 23:36:23 +02:00
unknown
f5131b2f11 Bug SHOW CREATE TABLE from second session crashes the server
- no check was made that ndb thd object was allocated


sql/ha_ndbcluster.h:
  Bug   	SHOW CREATE TABLE from second session crashes the server
sql/handler.h:
  Bug   	SHOW CREATE TABLE from second session crashes the server
sql/sql_show.cc:
  Bug   	SHOW CREATE TABLE from second session crashes the server
2006-02-13 21:55:49 +01:00
unknown
f96f911a15 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
2006-02-13 22:00:11 +02:00
unknown
4d012f5a9e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-02-13 20:52:43 +01:00
unknown
9724365123 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-13 20:52:42 +01:00
unknown
3cebcd159e Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
2006-02-13 21:47:23 +02:00
unknown
8292e1e6d7 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-13 21:37:32 +02:00
unknown
74d84bc856 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-13 20:35:35 +01:00
unknown
7e4559e101 Bug schema creation fails
-flag was set on field intable share instead of table


mysql-test/r/ndb_basic.result:
  Bug   	schema creation fails
mysql-test/t/ndb_basic.test:
  Bug   	schema creation fails
2006-02-13 20:34:36 +01:00
unknown
cf217b9cf5 mysqlimport.c:
Removed C++ comment, changed types for pthread_create() usage


client/mysqlimport.c:
  Removed C++ comment, changed types for pthread_create() usage
2006-02-13 20:21:15 +01:00
unknown
6a1e7d8c93 BUG#17339: Missed line in previous patch
mysql-test/r/rpl_loaddata_s.result:
  Missed line
2006-02-13 19:52:57 +01:00
unknown
c6fbbe72db Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-bug17339
2006-02-13 19:46:53 +01:00
unknown
a310380b2e Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-02-13 19:42:34 +01:00
unknown
37d0dda4bb Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-bug17339
2006-02-13 19:39:44 +01:00
unknown
f560252bdb Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/cleanup-5.1
2006-02-13 10:26:31 -08:00
unknown
8b3850df50 Fix for bad merge.
mysql-test/t/disabled.def:
  Removed reference to  failed test.
sql/ha_archive.cc:
  This fixes the optimize problem introduced in a bad merge.
2006-02-13 10:21:33 -08:00
unknown
1431fe7e40 support-files/mysql.spec.sh : Use "-i" on "make test-force", add missing changelog notes.
support-files/mysql.spec.sh:
  - Use "-i" on "make test-force",
  - document other recent changes in the changelog section (where notes were missing).
2006-02-13 19:07:40 +01:00
unknown
d364bf85bc BUG#17339: Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
For this particular bug report it was rpl_loadfile.test that did not make proper cleanup, but the patch
includes fixes for other tests aswell.


mysql-test/r/rpl_loaddata2.result:
  Cleanup
mysql-test/r/rpl_redirect.result:
  Cleanup
mysql-test/r/rpl_slave_status.result:
  Cleanup
mysql-test/t/rpl_LD_INFILE.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_drop_temp.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_ignore_table.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata2.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata_m.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata_s.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loadfile.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_multi_update4.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_ndb_basic.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_redirect.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_func001.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_func002.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp001.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp005.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp008.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp009.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp010.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp011.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp012.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_trig001.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_trig002.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_skip_error.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_slave_status.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_sp.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_sp004.test:
  Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
2006-02-13 19:03:12 +01:00
unknown
54de515d5b Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-02-13 18:44:43 +01:00
unknown
0b24ac5d1b Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone3
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


sql/set_var.cc:
  manual merge.
2006-02-13 11:42:48 -06:00
unknown
bdb953bd9d Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/rpmspec-4.1
2006-02-13 18:23:08 +01:00
unknown
10c6505550 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
2006-02-13 11:22:49 -06:00
unknown
01e880ede6 set_var.cc:
Fix out-of-order system variable.


sql/set_var.cc:
  Fix out-of-order system variable.
2006-02-13 11:20:15 -06:00
unknown
217d1723f9 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
2006-02-13 19:17:02 +02:00
unknown
32d32b6eca Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
2006-02-13 19:15:02 +02:00
unknown
c1d26f55d6 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-02-13 19:13:33 +02:00
unknown
d263d8b0d6 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/rpmspec-5.0
2006-02-13 18:04:30 +01:00