Commit graph

2058 commits

Author SHA1 Message Date
unknown
0b083a0d76 merge
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2001-07-08 06:24:03 +03:00
unknown
24638d06bd post-merge fixes
test SHOW OPEN TABLES


mysql-test/r/show_check.result:
  updated result
mysql-test/t/show_check.test:
  test show open tables
sql/mysql_priv.h:
  post-merge fixes
sql/sql_base.cc:
  post-merge fixes
sql/sql_parse.cc:
  post-merge fixes
2001-07-07 19:15:41 -06:00
unknown
8aac0529c7 merged latest changes in 3.23
sql/slave.h:
  Auto merged
sql/slave.cc:
  Auto merged
Docs/manual.texi:
  merged
sql/sql_base.cc:
  merged
sql/sql_show.cc:
  merged
2001-07-07 15:35:23 -06:00
unknown
5d63584e60 merged
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/spanish/errmsg.txt:
  merged and translated the new 4.0 errors - had to type them in 
  anyway so figured I'd do it in Spanish - Jorge/Miguel - can you do QA
  on my translation?
2001-07-07 15:17:25 -06:00
unknown
cb696ba1f3 Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql 2001-07-07 23:28:51 +03:00
unknown
973c1c44aa dded volatile to replication variable
Docs/manual.texi:
  Changelog
sql/slave.cc:
  Added volatile to replication variable
sql/slave.h:
  Added volatile to replication variable
sql/sql_base.cc:
  Cleanup
sql/sql_show.cc:
  Cleanup
2001-07-07 23:26:06 +03:00
unknown
502806cd50 HUP should not flush everything, just the logs 2001-07-06 15:30:52 -06:00
unknown
c2ed1c114a Merge
Docs/manual.texi:
  SCCS merged
2001-07-05 13:15:04 +03:00
unknown
a19de9adf4 Added new examples to the manual.
Docs/manual.texi:
  Added new example
  Updated 4.0 changelog
2001-07-05 13:06:10 +03:00
unknown
fde78d995a Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-07-04 18:41:17 -06:00
unknown
bb9da6021c SHOW NEW MASTER FOR SLAVE WITH ...
include/mysqld_error.h:
  new error message
mysql-test/r/rpl_log.result:
  updated results
mysql-test/t/rpl_log.test:
  test show new master for slave
sql/lex.h:
  show new master for slave
sql/share/czech/errmsg.txt:
  new error
sql/share/danish/errmsg.txt:
  new error
sql/share/dutch/errmsg.txt:
  new error
sql/share/english/errmsg.txt:
  new error
sql/share/estonian/errmsg.txt:
  new error
sql/share/french/errmsg.txt:
  new error
sql/share/german/errmsg.txt:
  new error
sql/share/greek/errmsg.txt:
  new error
sql/share/hungarian/errmsg.txt:
  new error
sql/share/italian/errmsg.txt:
  new error
sql/share/japanese/errmsg.txt:
  new error
sql/share/korean/errmsg.txt:
  new error
sql/share/norwegian-ny/errmsg.txt:
  new error
sql/share/norwegian/errmsg.txt:
  new error
sql/share/polish/errmsg.txt:
  new error
sql/share/portuguese/errmsg.txt:
  new error
sql/share/romanian/errmsg.txt:
  new error
sql/share/russian/errmsg.txt:
  new error
sql/share/slovak/errmsg.txt:
  new error
sql/share/spanish/errmsg.txt:
  new error
sql/share/swedish/errmsg.txt:
  new error
sql/sql_lex.h:
  show new master for slave
sql/sql_parse.cc:
  show new master for slave
sql/sql_repl.cc:
  show new master for slave
sql/sql_repl.h:
  show new master for slave
sql/sql_yacc.yy:
  show new master for slave
2001-07-04 17:14:31 -06:00
unknown
b5c2e85cac bulk insert optimization documented
mysys/tree.c:
  typo fixed
2001-07-04 17:31:43 +02:00
unknown
9a811481b2 Added support for ANSI SQL X'hex-string' format.
Fixed mysqldump to use -- instead of # as comment characters.
Removed support for the 3.20 protocol format


Docs/manual.texi:
  Update Changelog
client/mysqldump.c:
  Fixed dump to use -- instead of # as comment characters.
libmysql/libmysql.c:
  Removed support for the 3.20 protocol format
myisam/myisamchk.c:
  Fixed typo in printf
mysql-test/r/varbinary.result:
  Test of new hex constant format
mysql-test/t/varbinary.test:
  Test of new hex constant format
sql/sql_lex.cc:
  Added support for ANSI SQL X'hex-string' format.
sql/sql_lex.h:
  Added support for ANSI SQL X'hex-string' format.
sql/sql_yacc.yy:
  Added support for ANSI SQL X'hex-string' format.
2001-07-04 09:39:58 +03:00
unknown
9897da4c47 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
BitKeeper/etc/logging_ok:
  auto-union
2001-07-03 18:00:12 +02:00
unknown
ac3219dc65 bug fixed (sometimes it broke filesort, due to too late maybe_null=1)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
BitKeeper/etc/ignore:
  Added myisam/test1.MYD myisam/test1.MYI to the ignore list
2001-07-03 17:58:47 +02:00
unknown
2da39d8484 Merge work.mysql.com:/home/bk/mysql into white.box:/home/tim/my/3 2001-07-03 10:07:12 -04:00
unknown
2550d5b2ed manual.texi Corrected installation example.
Docs/manual.texi:
  Corrected installation example.
2001-07-02 23:25:23 -05:00
unknown
073e58812b manual.texi Fixed bug for displaying in PDF, added mirror in France.
Docs/manual.texi:
  Fixed bug for displaying in PDF, added mirror in France.
2001-07-02 15:13:21 -05:00
unknown
a1826b5519 merged
include/my_base.h:
  Auto merged
include/myisam.h:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysys/tree.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2001-07-02 21:52:22 +02:00
unknown
2d28c646cb memory-limited tree
bulk inserts optimization: caching keys in binary tree


include/my_base.h:
  bulk inserts optimization: caching keys in binary tree
include/my_tree.h:
  memory-limited tree
include/myisam.h:
  bulk inserts optimization: caching keys in binary tree
isam/isamlog.c:
  memory-limited tree
isam/pack_isam.c:
  memory-limited tree
myisam/ft_boolean_search.c:
  memory-limited tree
myisam/ft_nlq_search.c:
  memory-limited tree
myisam/ft_parser.c:
  memory-limited tree
myisam/ft_stopwords.c:
  memory-limited tree
myisam/mi_extra.c:
  bulk inserts optimization: caching keys in binary tree
myisam/mi_open.c:
  bulk inserts optimization: caching keys in binary tree
myisam/mi_static.c:
  bulk inserts optimization: caching keys in binary tree
myisam/mi_write.c:
  bulk inserts optimization: caching keys in binary tree
myisam/myisamdef.h:
  bulk inserts optimization: caching keys in binary tree
myisam/myisamlog.c:
  memory-limited tree
myisam/myisampack.c:
  memory-limited tree
mysql-test/mysql-test-run.sh:
  memory-limited tree
mysql-test/t/alter_table.test:
  make it faster
mysys/tree.c:
  memory-limited tree
sql/ha_myisam.cc:
  bulk inserts optimization: caching keys in binary tree
sql/item_sum.cc:
  memory-limited tree
sql/mysqld.cc:
  bulk inserts optimization: caching keys in binary tree
sql/sql_analyse.h:
  memory-limited tree
sql/uniques.cc:
  memory-limited tree
2001-07-02 21:18:57 +02:00
unknown
cdfc04fb08 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2001-07-01 13:27:09 +03:00
unknown
b291238171 Making multi-table delete BETA !!
mysql-test/t/multi_update.test:
  Making a test change the order of the tables, so that initalize_tables 
  would be tested properly
mysys/my_compress.c:
  Just changed my e-mail address .... ;o)
sql/filesort.cc:
  Making sure that merge_buffers can not be killed
sql/sql_class.h:
  Added initialize_tables
sql/sql_delete.cc:
  Making final changes for multi table delete, beta version !!
sql/sql_select.cc:
  same as above
BitKeeper/etc/ignore:
  Added locked to the ignore list
2001-07-01 13:20:53 +03:00
unknown
2752103dba forgot to fix one instance of VERSION in rpl_log result
mysql-test/r/rpl_log.result:
  missed version again - next time will use searh and replace
2001-06-30 14:38:47 -06:00
unknown
3eeebfeb2f mysql-test/r/rpl_log.result
fixed left over hard coded version instances in the result 



mysql-test/r/rpl_log.result:
  fixed left over hard coded version instances in the result
2001-06-30 14:32:51 -06:00
unknown
bd286b23f9 support for eval_result and let $var = query syntax in mysql-test
fixes for rpl_log test to make it config-independent


BitKeeper/etc/ignore:
  Added mysql-test/r/rpl_log.eval to the ignore list
client/mysqltest.c:
  support for eval_result and let $var = `query` syntax
mysql-test/Makefile.am:
  import more variables into mysql-test-run
mysql-test/mysql-test-run.sh:
  if we got wrong result on eval_result test case, diff against the
  expanded result, not the template
mysql-test/r/rpl_log.result:
  change config-dependent parts of the result to dynamic variables
mysql-test/t/rpl_log.test:
  get server version from the server
  remove obsoleted replace hack to solve port problem - use eval_result
  instead
2001-06-30 13:08:35 -06:00
unknown
02d0232e73 Merge work.mysql.com:/home/bk/mysql into white.box:/home/tim/my/3
BitKeeper/etc/logging_ok:
  auto-union
2001-06-29 15:28:50 -04:00
unknown
0a6cf93d23 post-merge fix
fixed bug in LOAD DATA FROM MASTER


BitKeeper/etc/ignore:
  Added scripts/mysqld_safe to the ignore list
sql/mysqld.cc:
  post-merge fix
2001-06-29 09:55:21 -06:00
unknown
c0e6d9df4a manual.texi say how to set up filter for mailing list messages
manual.ja.texi	sinisa@coresinc.com -> sinisa@mysql.com (per
manual.ja.texi	Sinisa's request)


Docs/manual.ja.texi:
  sinisa@coresinc.com -> sinisa@mysql.com (per
  Sinisa's request)
Docs/manual.texi:
  say how to set up filter for mailing list messages
2001-06-29 10:23:51 -05:00
unknown
7452fb69cd Merge miguel@work.mysql.com:/home/bk/mysql
into light.local:/home/miguel/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union
2001-06-29 05:18:58 -03:00
unknown
63f3702cda Completed the translation for the errmsg.txt Spanish file.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-29 05:15:54 -03:00
unknown
1ed2bcc888 merged with 3.23 replication updates
mysql-test/r/type_float.result:
  Auto merged
sql/sql_repl.h:
  Auto merged
BitKeeper/triggers/post-commit:
  merged with 3.23 updates
sql/mysqld.cc:
  merged
sql/slave.cc:
  merged
sql/sql_repl.cc:
  merged
2001-06-28 19:48:49 -06:00
unknown
62febccfec Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql


mysql-test/r/type_float.result:
  Auto merged
2001-06-28 19:27:40 -06:00
unknown
76ef5e9fd7 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-06-29 04:21:46 +03:00
unknown
96eb526088 Updated float test result 2001-06-29 04:21:01 +03:00
unknown
6157b55d24 Merge mysql.sashanet.com:/home/sasha/src/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql-fast
2001-06-28 19:20:11 -06:00
unknown
7c7647850b fixed float test result for updated test case
mysql-test/r/type_float.result:
  fixed test result
2001-06-28 19:19:23 -06:00
unknown
09b6895fac Updated test result in float test
mysql-test/r/type_float.result:
  Updated test result
2001-06-29 04:18:02 +03:00
unknown
0a584af461 fixed typo 2001-06-28 19:17:04 -06:00
unknown
b59fcb04c7 Fix ORDER BY ... DESC optimization
Docs/manual.texi:
  Update with changes from old version of the 4.0 manual.
mysql-test/r/order_by.result:
  New tests for ORDER BY ... DESC
mysql-test/t/order_by.test:
  New tests for ORDER BY ... DESC
sql/sql_delete.cc:
  Removed DEBUG code
2001-06-29 04:04:29 +03:00
unknown
656d118a58 chmod +x on post-incoming trigger
BitKeeper/triggers/post-incoming:
  Change mode to -rwxrwxr-x
2001-06-28 18:41:51 -06:00
unknown
d9a86a9ce3 Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2001-06-28 18:23:48 -06:00
unknown
c7e200cdd8 fixed message in post-commit trigger
added debugging options to master to behave sporadically, and a 
test case to make sure the slave can deal with it


BitKeeper/triggers/post-commit:
  fixed message
sql/mysqld.cc:
  added debugging options to force the master to occasionally break
  replication
sql/slave.cc:
  cosmetic change to improve readability
sql/sql_repl.cc:
  support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
sql/sql_repl.h:
  support for --sporadic-binlog-dump-fail and --max-binlog-dump-events
2001-06-28 18:22:29 -06:00
unknown
a94cf89609 Merge work.mysql.com:/home/bk/mysql into white.box:/home/tim/my/3
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-06-28 17:39:53 -04:00
unknown
0640b4b5b4 ha_innobase.cc Update possible row timestamp column also in an update
sql/ha_innobase.cc:
  Update possible row timestamp column also in an update
2001-06-28 17:19:42 +03:00
unknown
05e9925ada merge
BitKeeper/etc/logging_ok:
  auto-union
myisam/myisamchk.c:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/sql_lex.cc:
  Auto merged
2001-06-28 14:51:18 +02:00
unknown
1a5643b4b1 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Docs/manual.texi:
  Auto merged
2001-06-28 15:24:53 +03:00
unknown
9665a34a73 Allow floats of type 1.0e1 2001-06-28 15:24:28 +03:00
unknown
210e864213 safe_mysqld -> mysqld_safe 2001-06-28 12:28:00 +03:00
unknown
93edcc74ef Cleanup
myisam/myisamchk.c:
  --force now implices --update
sql/share/italian/errmsg.txt:
  Update of error messages
2001-06-28 10:58:04 +03:00
unknown
ce77251db6 Merge work:/home/bk/mysql-4.0 into white.box:/home/tim/my/4 2001-06-28 03:54:56 -04:00