Commit graph

21000 commits

Author SHA1 Message Date
unknown
eb0168d766 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4
2005-03-09 22:10:38 +00:00
unknown
0f888b1bf0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4
2005-03-09 21:59:29 +00:00
unknown
5b26228c3d Cleanup for VC++
sql/item_func.cc:
  Cleanup
sql/item_func.h:
  Cleanup
2005-03-09 21:53:04 +00:00
unknown
fad705db81 Portability fix.
sql/sql_lex.h:
  LEX::requires_prelocking():
    Portability fix. Seems that VC++ does not understand implicit pointer
    to bool conversion.
2005-03-10 00:52:47 +03:00
unknown
c9f3e0f40c Merge 2005-03-09 21:41:09 +01:00
unknown
1f22956271 Fix complilation failure 2005-03-09 20:49:44 +01:00
unknown
076f5164e4 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/mysql-4.1 2005-03-09 19:32:00 +01:00
unknown
d1b3c64b23 after merge fixes
mysql-test/r/fulltext.result:
  after merge - test results updated
sql/sql_class.cc:
  protection
2005-03-09 19:22:30 +01:00
unknown
9d839a140f Fix to make mysql-test-run.pl work with new system tables definitions
mysql-test/lib/init_db.sql:
  Fixed mysql-test-run.pl's system tables to correspond to the real ones.
2005-03-09 19:21:57 +01:00
unknown
cd4961830e .del-ndb_multi.test~651e6ccb21dab6d9:
Delete: mysql-test/t/ndb_multi.test
.del-ndb_multi.result~4baa26e7403188ae:
  Delete: mysql-test/r/ndb_multi.result
.del-have_multi_ndb.inc~ef8da69d972ee707:
  Delete: mysql-test/include/have_multi_ndb.inc


BitKeeper/deleted/.del-have_multi_ndb.inc~ef8da69d972ee707:
  Delete: mysql-test/include/have_multi_ndb.inc
BitKeeper/deleted/.del-ndb_multi.result~4baa26e7403188ae:
  Delete: mysql-test/r/ndb_multi.result
BitKeeper/deleted/.del-ndb_multi.test~651e6ccb21dab6d9:
  Delete: mysql-test/t/ndb_multi.test
2005-03-09 18:30:29 +01:00
unknown
914afabd39 mysqldumpslow.sh:
bug#4914 added --help and usage information


scripts/mysqldumpslow.sh:
  bug#4914 added --help and usage information
2005-03-09 15:00:40 +01:00
unknown
48577bb59f merged
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/page0page.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
myisam/ft_parser.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_bitmap.c:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-03-09 14:09:06 +01:00
unknown
4387d327b1 sql/mysqld.cc
preserve backward compatibility


sql/mysqld.cc:
  preserve backward compatibility
2005-03-09 13:41:57 +01:00
unknown
3b214ab3e8 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/log.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2005-03-09 13:02:51 +01:00
unknown
ad019543e6 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-09 13:01:39 +01:00
unknown
5d7c76aa0a myisam/myisam_ftdump.c
recalculate stats/gws for the last word in the index too
    remove unused code


myisam/myisam_ftdump.c:
  recalculate stats/gws for the last word in the index too
  remove unused code
2005-03-09 12:59:20 +01:00
unknown
a0f63f1b81 don't close binlog in the destructor - use explictit MYSQL_LOG::cleanup for this
mysql-test/r/fulltext.result:
  new test, duplicate test removed
mysql-test/t/fulltext.test:
  new test, duplicate test removed
sql/slave.cc:
  close relay log explicitly
2005-03-09 12:29:51 +01:00
unknown
08e23eb602 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
sql/item.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-03-09 08:25:12 +01:00
unknown
ef0e1c05db configure.in:
bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists


configure.in:
  bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists
2005-03-09 02:53:00 +01:00
unknown
dd2306839a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug3788.4


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-03-09 01:15:42 +00:00
unknown
1ee822cefc Fix test after merge 2005-03-09 01:13:11 +00:00
unknown
f2cfb6ef3b mysql-test-run.pl:
Removed -c from /bin/sh call
make_win_src_distribution.sh:
  Copy all content in mysql-test
make_win_binary_distribution.sh, make_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
  Bug  changes for building Berkeley DB from BitKeeper on Solaris


bdb/dist/s_javah:
  Bug  changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_java:
  Bug  changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_readme:
  Bug  changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_test:
  Bug  changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_vxworks:
  Bug  changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_win32:
  Bug  changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_win32_dsp:
  Bug  changes for building Berkeley DB from BitKeeper on Solaris
scripts/make_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
scripts/make_win_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
scripts/make_win_src_distribution.sh:
  Copy all content in mysql-test
mysql-test/mysql-test-run.pl:
  Removed -c from /bin/sh call
2005-03-09 01:34:22 +01:00
unknown
7ec1e170c7 added testcase for multiple tables and events 2005-03-09 01:22:12 +01:00
unknown
664ad9005f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/sql_parse.cc:
  Auto merged
2005-03-09 01:02:13 +01:00
unknown
732a0ec400 fixed bug in event handling of several tables
fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF


ndb/include/kernel/signaldata/SumaImpl.hpp:
  fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  fixed bug in event handling of several tables
2005-03-09 01:00:08 +01:00
unknown
430b16ee71 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0
2005-03-09 00:37:03 +01:00
unknown
b0e1389b82 This code change has 0 effects as it's about the case where innobase_very_fast_shutdown!=0,
which is always false. In a very fast InnoDB shutdown, we just ensure that
no more transactions are running, flush InnoDB log, signal InnoDB threads to die,
and then return from InnoDB (from innobase_end()) without waiting for those threads
to actually die. I have tested on a 4CPU machine that even with --innodb_flush_log_at_trx_commit=0,
this optimized InnoDB very fast shutdown loses no committed transactions. Patch pre-approved by Heikki.


innobase/log/log0log.c:
  In an InnoDB very fast shutdown, we just need to wait for no more transactions to be happening
  and then we can flush the InnoDB log and don't need to wait for the
  signaled-to-die InnoDB threads to finish (saves seconds).
innobase/srv/srv0start.c:
  In an InnoDB very fast shutdown, once we have forced a flush of the InnoDB
  log to disk, and signalled InnoDB threads to die, we needn't wait
  for these threads to die.
2005-03-09 00:32:58 +01:00
unknown
ce16c895c2 Merge in fix Bug#3788
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/sp.result:
  Merge
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-08 22:32:09 +00:00
unknown
1250899c0d Fixing post-merge errors 2005-03-09 00:09:18 +02:00
unknown
12c6eb3b08 post merge fixes
sql/sql_parse.cc:
  Auto merged
2005-03-08 22:59:21 +02:00
unknown
39c32324d6 making a better test case for bug
mysql-test/r/sp.result:
  fixing results for new test
mysql-test/t/sp.test:
  making a new test with autocommit set to 0 and 1.
  Second CALL is in autocommit mode to prove that the relevant bug 
  (bug ) is fixed.
2005-03-08 22:44:35 +02:00
unknown
eb61d60d60 mysqld.cc:
main(): add missing parameter to printf(ER(ER_READY),...) call


sql/mysqld.cc:
  main(): add missing parameter to printf(ER(ER_READY),...) call
2005-03-08 22:33:11 +02:00
unknown
3921f6cc18 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-08 21:33:10 +01:00
unknown
7adae6b37a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-08 20:38:06 +01:00
unknown
50985b6783 changelog-5.0.xml:
Add dummy changelog file. It should merge upward without conflict.
2005-03-08 13:15:36 -06:00
unknown
ca280f732d changelog-4.1.xml:
Add dummy changelog file. It should merge upward without conflict.
2005-03-08 13:13:15 -06:00
unknown
abe6094ac4 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-08 19:47:49 +01:00
unknown
f70688e2aa BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
for fulltext searches too
2005-03-08 19:45:55 +01:00
unknown
8ce2071248 dict0load.c:
dict_load_table(): Do not complain about mix_len != 0,
  because MySQL 3.23.4x left garbage in that column.


innobase/dict/dict0load.c:
  dict_load_table(): Do not complain about mix_len != 0,
  because MySQL 3.23.4x left garbage in that column.
2005-03-08 20:06:09 +02:00
unknown
4e8c5c1969 Fix to make builds possible
mysql-test/r/mysqldump.result:
  Fix for avoiding version text
mysql-test/t/mysqldump.test:
  Fix for avoiding version text
2005-03-08 20:06:08 +02:00
unknown
fe3a425a94 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-03-08 18:19:21 +01:00
unknown
50914ba7ae Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0


include/my_sys.h:
  Auto merged
2005-03-08 17:35:53 +01:00
unknown
5ff4f8e503 Added possibility to add disabled tests to mysql-test-run. 2005-03-08 18:32:31 +02:00
unknown
d8222c03c0 Merge changes.
Build-tools/Do-compile:
  Change already present in 5.0
configure.in:
  Do not propagate a 4.0 version number to the 5.0 tree.
include/my_sys.h:
  Change already present in 5.0.
mysys/hash.c:
  For Sun compilers, 'static inline' is ok.
mysys/my_bitmap.c:
  Change already present in 5.0
sql/item_strfunc.cc:
  Change already present in 5.0
sql/net_serv.cc:
  Change already present in 5.0
2005-03-08 17:24:07 +01:00
unknown
9d01d51209 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-03-08 17:12:51 +01:00
unknown
8ab73b4cc7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-03-08 18:12:50 +02:00
unknown
0fdd650fec Fixed Bug#8922.
Reverted Jim's patch.


client/mysql.cc:
  Fixed Bug#8922, The deilimeter cannot be reset after it is set as word 'delimiter'
include/my_sys.h:
  Reverted Jim's patch.
mysys/mf_iocache.c:
  Reverted Jim's patch.
sql/sql_class.h:
  Reverted Jim's patch.
2005-03-08 18:12:12 +02:00
unknown
ab0e331436 After merge fixes
innobase/dict/dict0load.c:
  dict_load_table():
  Display diagnostic output if mix_len differs from 0.
2005-03-08 17:18:27 +02:00
unknown
976543fe84 dict0load.c:
dict_load_table(): Remove the check for row_format=compact for now,
  because the flag bit we used (high-order bit of mix_len)
  has not been zero for at least two customers.


innobase/dict/dict0load.c:
  dict_load_table(): Remove the check for row_format=compact for now,
  because the flag bit we used (high-order bit of mix_len)
  has not been zero for at least two customers.
2005-03-08 17:08:17 +02:00
unknown
88c893cbbf InnoDB: Win64 portability fixes
innobase/include/srv0srv.h:
  Declare those variables as ulong that are declared in ha_innodb.h
innobase/srv/srv0srv.c:
  Define those variables as ulong that are declared in ha_innodb.h
2005-03-08 16:25:31 +02:00