Commit graph

17652 commits

Author SHA1 Message Date
unknown
85be2e57ab Manual merge
sql/item_strfunc.cc:
  Auto merged
2005-03-09 10:58:52 -08: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
4387d327b1 sql/mysqld.cc
preserve backward compatibility


sql/mysqld.cc:
  preserve backward compatibility
2005-03-09 13:41:57 +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
44d66d26dc func_str.result, func_str.test:
Added a test case for bug #8669.
item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.


sql/item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.
mysql-test/t/func_str.test:
  Added a test case for bug #8669.
mysql-test/r/func_str.result:
  Added a test case for bug #8669.
2005-03-09 00:15:51 -08: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
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 #6209 changes for building Berkeley DB from BitKeeper on Solaris


bdb/dist/s_javah:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_java:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_readme:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_test:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_vxworks:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_win32:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_win32_dsp:
  Bug #6209 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
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
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
9968ac77c4 changelog-4.0.xml:
Fix bad root element name in DOCTYPE.  Sheesh.


Docs/changelog-4.0.xml:
  Fix bad root element name in DOCTYPE.  Sheesh.
2005-03-08 11:49:56 -06:00
unknown
4d262ef095 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0
2005-03-08 10:44:16 -06:00
unknown
606b0b1778 Add dummy changelog file. It should merge upward without conflict. 2005-03-08 10:43:44 -06:00
unknown
5ff4f8e503 Added possibility to add disabled tests to mysql-test-run. 2005-03-08 18:32:31 +02:00
unknown
1b6b5ed8fa Netware build environment script related patch. 2005-03-08 18:18:53 +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
b80ec98e28 Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1


innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
2005-03-08 16:02:13 +02:00
unknown
3330dfb390 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-03-08 14:43:06 +01:00
unknown
c409a646b1 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-03-08 15:33:30 +02:00
unknown
70a61746a4 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/merge-4.1 2005-03-08 14:30:17 +01:00
unknown
609e4dc6b3 Post-merge manual fix.
Build-tools/Do-compile:
  Post-merge manual fix: Avoid the duplicate line.
2005-03-08 14:27:18 +01:00
unknown
295dedd11c Manual merge, no effect on 4.1.
Build-tools/Do-compile:
  Change in 4.0 was backport, no effect on 4.1
configure.in:
  No change in 4.1 on merging.
sql/item_strfunc.cc:
  No change in 4.1
2005-03-08 14:17:57 +01:00
unknown
395618a651 - bumped up version number in configure.in from 4.0.24 -> 4.0.25 (ChangeSet 1.2073 was already tagged
as 4.0.24)


configure.in:
  - bumped up version number from 4.0.24 -> 4.0.25
2005-03-08 11:42:21 +01:00
unknown
5b32b8e1dd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-08 10:28:38 +01:00
unknown
65558d1877 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-08 10:27:37 +01:00
unknown
9606577705 bug#8918 - ndb - improve error message when stopping due to StartFailureTimeout 2005-03-08 10:25:21 +01:00
unknown
c9b0cbf013 InnoDB: Win64 portability fix: add missing declaration and
correct the definition of srv_max_buf_pool_modified_pct.


innobase/include/srv0srv.h:
  Declare srv_max_buf_pool_modified_pct
innobase/srv/srv0srv.c:
  Define srv_max_buf_pool_modified_pct as ulong,
  as it is declared in ha_innodb.h.
2005-03-08 11:12:18 +02:00
unknown
a93b0b59bd Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0.7498
2005-03-07 19:32:54 +03:00
unknown
fd35e7870a Fix for bug#8978 : Crash on 'select format ...' 2005-03-07 18:56:18 +03:00
unknown
2934567449 additional safety 2005-03-07 16:45:19 +01:00
unknown
da244cc9d5 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-07 16:40:47 +01:00
unknown
bda53f8c1e Avoid empty build (failure) mails on Solaris (backport from 4.1).
Build-tools/Do-compile:
  Backport of a change Lenz did in 4.1 (without it, Solaris sends empty mails):
  
  Improved the abort subroutine to not rely on an external "tail" command (the
  default /usr/bin/tail on Solaris does not understand the "-n" notation).
  Get rid of a "useless use of cat" case in the process.
2005-03-07 16:23:55 +01:00
unknown
1512089287 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-07 15:32:53 +01:00
unknown
16da840b78 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
2005-03-07 16:23:41 +02:00
unknown
9396ef5b2d Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-03-07 15:28:11 +02:00
unknown
9fa4492a38 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-07 14:28:10 +01:00
unknown
309b4721d5 trx0trx.c:
Print a hex dump of the trx_t object if trx->n_mysql_tables_in_use != 0 at trx_free()


innobase/trx/trx0trx.c:
  Print a hex dump of the trx_t object if trx->n_mysql_tables_in_use != 0 at trx_free()
2005-03-07 15:28:10 +02:00
unknown
39fb340d4b mysql-test-run.sh:
added skip-ndbcluster switch


mysql-test/mysql-test-run.sh:
  added skip-ndbcluster switch
2005-03-07 14:28:09 +01:00
unknown
7e3eef4e9e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-03-07 14:19:45 +01:00
unknown
ba05aef930 Fixed crash if max_connections is exceeded. BUG#8996
sql/mysqld.cc:
  mark the thread as killed in close_connection
sql/protocol.cc:
  don't bother remembering warnings if the thread is dying
2005-03-07 13:59:28 +01:00
unknown
3896219684 mysql-test-run to default run with ndbcluster if compiled with that support 2005-03-07 13:42:01 +01:00
unknown
c02df655f4 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-4.1
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1
2005-03-07 13:05:04 +01:00
unknown
a2bad73fdd Various fixes for Windows 2003 Platform SDK SP1 beta
VC++Files/client/mysqladmin_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/client/mysqldump_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/client/mysqlimport_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/client/mysqlshow_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/client/mysqltest_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/comp_err/comp_err_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/isamchk/isamchk_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/libmysql/libmysql_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/libmysqld/libmysqld_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/libmysqltest/myTest_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/my_print_defaults/my_print_defaults_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/myisamchk/myisamchk_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/myisamlog/myisamlog_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/myisampack/myisampack_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysql-test/mysql_test_run_new_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysql_ia64.dsw:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
  Changed project order (dependency doesn't work with platform SDK)
VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysqlcheck/mysqlcheck_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysqlmanager/MySqlManager_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysqlwatch/mysqlwatch_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/pack_isam/pack_isam_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/perror/perror_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/replace/replace_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/sql/mysqld_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/sql/mysqldmax_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/strings/strings_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/test1/test1_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/tests/mysql_client_test_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/thr_test/thr_test_ia64.dsp:
  Fixes for Platform SDK SP1 beta1 (Window IA64)
2005-03-07 13:04:05 +01:00
unknown
38789100ea Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-03-07 11:46:31 +01:00