Commit graph

17633 commits

Author SHA1 Message Date
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
5ff4f8e503 Added possibility to add disabled tests to mysql-test-run. 2005-03-08 18:32:31 +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
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
unknown
9c6cc47f74 InnoDB: Portability fixes for warnings reported on IA-64 Windows
innobase/buf/buf0lru.c:
  Portability fix: Use %p for printing pointers
innobase/dict/dict0dict.c:
  Properly cast the arguments of toupper()
innobase/eval/eval0proc.c:
  Declare loop_var_value with a matching data type.
innobase/include/mem0mem.ic:
  Remove implicit type conversion
innobase/include/page0page.ic:
  Portability fix: Use %p for printing pointers
innobase/include/pars0pars.h:
  Remove implicit type conversion
innobase/include/pars0sym.h:
  Remove implicit type conversion
innobase/mem/mem0dbg.c:
  Portability fix: Use %p for printing pointers
innobase/os/os0file.c:
  Add DWORD casts for Windows
innobase/os/os0sync.c:
  Add DWORD casts for Windows
innobase/os/os0thread.c:
  Add DWORD casts for Windows
innobase/rem/rem0cmp.c:
  Make implicit type conversions explicit
innobase/row/row0mysql.c:
  Make implicit type conversions explicit
innobase/row/row0sel.c:
  Portability fix: Use %p for printing pointers
innobase/trx/trx0sys.c:
  Declare trx_sys_mysql_bin_log_pos_high and
  trx_sys_mysql_bin_log_pos_low with a matching data type
innobase/ut/ut0ut.c:
  Make implicit type conversion explicit
2005-03-07 12:03:33 +02:00
unknown
e23e81f7df Review fixes for Bug #8753 Invalid schema
object version after dropping index
2005-03-07 10:53:16 +01:00
unknown
3efe8a84b8 Manual merge. 2005-03-07 10:29:50 +01:00
unknown
c8399bb6b5 Merge 4.0.24 compile changes into the 4.1 tree.
mysys/my_bitmap.c:
  Resolved merge conflict (identical change in 4.0 and 4.1).
2005-03-07 10:28:56 +01:00
unknown
25ca572341 Manual merge of the 4.0.24 compile changes into the 4.1 tree.
include/my_sys.h:
  Auto merged
mysys/hash.c:
  Manually merged: 'static' for all, 'inline' for most platforms.
2005-03-07 10:27:20 +01:00
unknown
8e8dfe43db Fix for Bug #8753 Invalid schema object version after dropping index 2005-03-07 10:21:38 +01:00
unknown
52d19cbd7c fixed conversion errors (Windows IA64 build) 2005-03-07 09:47:24 +01:00
unknown
ae81d53048 New Project files for Windows Ithanium 64-bit builds
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-06 14:22:28 +01:00
unknown
9019ea07fd Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-06 12:37:06 +01:00
unknown
870059eb04 myisam/ft_parser.c
protection against invalid string in ft_get_word
mysys/my_symlink2.c
    typo fixed


myisam/ft_parser.c:
  protection against invalid string in ft_get_word
mysys/my_symlink2.c:
  typo fixed
2005-03-06 12:31:40 +01:00
unknown
581e6a2b86 A fix for a bug #8830, which occured when binary data from blob was
dumped with --hex-blob and --skip-extended-insert options.


BitKeeper/etc/ignore:
  Added support-files/ndb-config-2-node.ini to the ignore list
client/mysqldump.c:
  A fix for a bug #8830. All that was necessary was to use unsigned  char
  instead of signed  char.
mysql-test/r/mysqldump.result:
  A result for   test case for bug #8830.
mysql-test/t/mysqldump.test:
  Test case for bug #8830.
2005-03-05 22:06:07 +02:00
unknown
f1c81bf669 logging_ok:
Logging to logging@openlogging.org accepted
func_group.result, func_group.test:
  Added a test case for bug #8893.
opt_sum.cc:
  A misplaced initialization for the returned parameter
  prefix_len in the function find_key_for_maxmin caused
  usage of a wrong key prefix by the min/max optimization
  in cases when the matching index was not the first index
  that contained the min/max field.


sql/opt_sum.cc:
  A misplaced initialization for the returned parameter
  prefix_len in the function find_key_for_maxmin caused
  usage of a wrong key prefix by the min/max optimization
  in cases when the matching index was not the first index
  that contained the min/max field.
mysql-test/t/func_group.test:
  Added a test case for bug #8893.
mysql-test/r/func_group.result:
  Added a test case for bug #8893.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-04 20:24:13 -08:00
unknown
a53fdc5e02 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


myisam/mi_create.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-03-04 19:25:19 +01:00
unknown
79fb500a6e Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


myisam/mi_create.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-03-04 19:18:17 +01:00
unknown
9104ca76a0 typo fixed 2005-03-04 19:16:14 +01:00
unknown
58002dddc1 ut0mem.c:
If InnoDB cannot allocate memory, keep retrying for 60 seconds before we crash mysqld; maybe the memory shortage is just temporary


innobase/ut/ut0mem.c:
  If InnoDB cannot allocate memory, keep retrying for 60 seconds before we crash mysqld; maybe the memory shortage is just temporary
2005-03-04 18:17:29 +02:00
unknown
6736ce56fb trx0trx.c:
Do not assert, but print diagnostics if MySQL tries to free a trx where n_mysql_tables_in_use > 0


innobase/trx/trx0trx.c:
  Do not assert, but print diagnostics if MySQL tries to free a trx where n_mysql_tables_in_use > 0
2005-03-04 17:58:06 +02:00
unknown
8ef8cd7622 ha_innodb.cc:
write_row(): Detect SQLCOM_OPTIMIZE, so that also OPTIMIZE TABLE
  will commit at every 10,000 copied rows.


sql/ha_innodb.cc:
  write_row(): Detect SQLCOM_OPTIMIZE, so that also OPTIMIZE TABLE
  will commit at every 10,000 copied rows.
2005-03-04 15:53:05 +02:00
unknown
56c517bda1 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-03-04 15:27:07 +02:00