Commit graph

19797 commits

Author SHA1 Message Date
unknown
bb0507fa5d Fixed a bug: deadlock without any locking, simple select and update (Bug #7975).
innobase/row/row0ins.c:
  If the SQL-query will update or replace duplicate key row we take X-lcok
  for duplicate row.
sql/ha_innodb.cc:
  INSERT ON DUPLICATE KEY UPDATE will also update duplicate key and we can
  take X-lock in this case for duplicate key records.
BitKeeper/etc/ignore:
  Added innobase/row/row0index.c to the ignore list
2005-02-03 10:54:38 +02:00
unknown
2b0a3dbe9e Merged "query cache for ndb" to 5.0
BitKeeper/etc/logging_ok:
  auto-union
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/ha_innodb.h:
  Hand merged
sql/ha_ndbcluster.cc:
  Merge with gathering of stats
sql/sql_cache.cc:
  Use new table def cache
sql/table.h:
  table.h had been cleaned up
2005-02-03 09:33:48 +01:00
unknown
8037213d74 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2005-02-03 11:12:01 +03:00
unknown
87aadfead7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-03 07:11:16 +01:00
unknown
34df86478e Add --help to mysqld_safe. (Bug #7931)
scripts/mysqld_safe.sh:
  Add --help switch
2005-02-02 19:41:33 -08:00
unknown
ba51652c2c Fix 'mysqlcheck --help' to not specify what storage engines are
supported, rather than give incorrect information. (Bug #8029)


client/mysqlcheck.c:
  Make usage message more general as to what storage engines are supported.
2005-02-02 15:03:34 -08:00
unknown
9240144b73 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-02 22:41:18 +02:00
unknown
d5c0360898 Review fixed
sql/ha_federated.cc:
  Fixed compiler warnings and some indentation problems (still a lot more indentation problems to fix, will come in a later patch)
sql/mysql_priv.h:
  Remove duplicated append_escaped()
sql/sql_analyse.cc:
  Remove duplicated append_escaped()
sql/sql_insert.cc:
  Move extra(HA_EXTRA_IGNORE_DUP_KEY) to a more logical places
  Add missing DBUG_RETURN()
2005-02-02 22:39:21 +02:00
unknown
355f7128c4 Merge mysql.com:/data0/mysqldev/my/mysql-4.1
into mysql.com:/data0/mysqldev/my/mysql-4.1-build


configure.in:
  Auto merged
2005-02-02 21:36:40 +01:00
unknown
ad21db5e07 Use -DUNIV_DEBUG (extra debugging for InnoDB) when configuring with --debug=full 2005-02-02 22:35:36 +02:00
unknown
c30ccbcdb4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-02 22:28:22 +02:00
unknown
1bbfa6f75f ndb -
add abort to multi op test case


ndb/include/ndbapi/NdbConnection.hpp:
  Add aborts to test case
ndb/test/include/HugoOperations.hpp:
  Add aborts to test case
ndb/test/ndbapi/testOperations.cpp:
  Add aborts to test case
ndb/test/src/HugoOperations.cpp:
  Add aborts to test case
ndb/test/src/HugoTransactions.cpp:
  Add aborts to test case
2005-02-02 21:03:46 +01:00
unknown
e6e9849530 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


configure.in:
  Auto merged
2005-02-02 20:27:53 +01:00
unknown
c95ce34ed5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-02 20:30:57 +02:00
unknown
7d3553590f Merge mysql.com:/data0/mysqldev/my/mysql-4.1
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
2005-02-02 19:30:08 +01:00
unknown
3d0f9d96d7 Fixed during review of new pulled code
extra/perror.c:
  Use strmov() instead of strcpy()
  Indentation fixes
sql/sql_table.cc:
  Revert back part of the old code as the new code didn't use mysql_data_home, which would have caused problems in the embedded server
sql/sql_update.cc:
  Ensure that used_index is always set (It has to be set because it's value is tested if order != 0)
2005-02-02 20:28:01 +02:00
unknown
7116beb95d Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
Build-tools/Bootstrap:
  Auto merged
2005-02-02 19:25:43 +01:00
unknown
4c253be8c3 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-02-02 19:24:13 +01:00
unknown
d4ac4cb112 - typo fix... 2005-02-02 19:23:24 +01:00
unknown
7f7bdce086 Merge mysql.com:/data0/mysqldev/my/mysql-4.1
into mysql.com:/data0/mysqldev/my/mysql-4.1-build
2005-02-02 18:45:29 +01:00
unknown
785049c678 fix linkerror on sol9x86
configure.in:
  fix linkerror on sol9x86
2005-02-02 18:30:33 +01:00
unknown
8ecae2e65c Fix merge of func_str tests (accidently duplicated a test).
mysql-test/t/func_str.test:
  Remove duplicated test that crept in during merge
mysql-test/r/func_str.result:
  Update results
2005-02-02 09:05:52 -08:00
unknown
422cbb7462 Merge production:my/mysql-4.1-build
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-02 18:04:01 +01:00
unknown
33e74b1427 Merge fixes for #8248, #5569.
mysql-test/r/func_str.result:
  Update results
mysql-test/t/func_str.test:
  Merge test
sql/item_strfunc.cc:
  Set charset on output string
sql/item_strfunc.h:
  Merge
sql/sql_parse.cc:
  Merge
vio/viosocket.c:
  Merge
2005-02-02 08:21:11 -08:00
unknown
360056aaa7 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-02 16:56:47 +01:00
unknown
6b6e5d4a16 Merge mysql.com:/home/jimw/my/mysql-4.1-8207
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-02 07:51:55 -08:00
unknown
fb950497db Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-02 07:49:30 -08:00
unknown
613c2f68e2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-02 16:50:35 +02:00
unknown
ecac023c1f Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-02-02 13:45:32 +01:00
unknown
d2784c988f Small Do-compile improvements:
- added Option "--comment" to be able to override the default compilation comment
- 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.


Build-tools/Do-compile:
  - added Option "--comment" to be able to override the default compilation comment
  - 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-02-02 13:40:17 +01:00
unknown
c83412f705 configure.in
don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc
    hide from the user options that do nothing
sql/sql_update.cc
    better fix for uninitialized used_index


configure.in:
  don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc:
  hide from the user options that do nothing
sql/sql_update.cc:
  better fix for uninitialized used_index
2005-02-02 12:08:20 +01:00
unknown
5725fa5df5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-02 11:35:33 +01:00
unknown
4734f3f746 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-02 11:13:35 +01:00
unknown
e7ff746989 backported configure flag from 5.0
workaround for HPUX signal.h error, missing extern "C" 
    moved my_thread_end to NdbThreadExit
   more checks for shared memory transporter signum setup


acinclude.m4:
  backported configure flag from 5.0
include/my_global.h:
  workaround for HPUX signal.h error, missing extern "C"
ndb/src/common/portlib/NdbThread.c:
  moved my_thread_end to NdbThreadExit
ndb/src/mgmsrv/ConfigInfo.cpp:
  more checks for shared memory transporter signum setup
2005-02-02 10:50:33 +01:00
unknown
f32743b704 After merge fixes
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
2005-02-02 11:50:27 +02:00
unknown
6fd984d592 Merge mysql.com:/home/timka/mysql/src/4.1-dbg
into mysql.com:/home/timka/mysql/src/4.1-bug-8023
2005-02-02 09:55:41 +02:00
unknown
f229695845 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-01 23:54:39 -08:00
unknown
4c76152b35 func_str.result, func_str.test:
Added a test case for bug #7751.
item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.


sql/item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.
mysql-test/t/func_str.test:
  Added a test case for bug #7751.
mysql-test/r/func_str.result:
  Added a test case for bug #7751.
2005-02-01 23:34:31 -08:00
unknown
d81a0bede2 Fix for BUG#8023.
Allow LIMIT clause after DUAL.


mysql-test/r/limit.result:
  Added test result for BUG#8023.
mysql-test/t/limit.test:
  Added test for BUG#8023.
sql/sql_yacc.yy:
  Allow the specification of a LIMIT clause after DUAL. This is needed for queries as:
  select a from t1 union all select 1 from dual limit 1;
  In this query LIMIT is applied to the whole UNION, so it makes sense, however, the
  current parser did not allow any clause after DUAL.
2005-02-02 08:38:24 +02:00
unknown
01e1ca9f67 ndb - (backport from 4.1)
Fix weird link error on sol9x86
  - use incremental linker


configure.in:
  Fix weird link error on sol9x86
   - use incremental linker
2005-02-02 07:38:11 +01:00
unknown
3dd07e1abf Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-02 06:33:22 +01:00
unknown
d54b72c9fc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-02 06:32:11 +01:00
unknown
2ae812a7d6 Adjust test results for BUG#7634: The result of EXPLAIN is different if OS doesn't support file sizes > 2G 2005-02-02 07:51:43 +03:00
unknown
1a2ef2be00 ndb - backup fix, found on powermacg4
ndb/src/kernel/blocks/backup/Backup.cpp:
  index typo overwrote attribute array, found on powermacg4
2005-02-02 03:58:43 +01:00
unknown
22f839cdd2 Merge mysql.com:/home/jimw/my/mysql-4.0-clean
into mysql.com:/home/jimw/my/mysql-4.0-8248
2005-02-01 18:34:28 -08:00
unknown
327537b408 Merge bk-internal:/home/bk/mysql-4.0
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-01 18:34:16 -08:00
unknown
6d0d03dab9 Fix QUOTE() to not reuse the input field for output, which resulted in
incorrect results when the input was a constant across a multi-row SELECT
statement. (Bug #8248)


sql/item_strfunc.h:
  Add tmp_value member
sql/item_strfunc.cc:
  Always allocate a new string for QUOTE(), in case the field is being reused
  for multiple rows.
mysql-test/t/func_str.test:
  Add regression test
mysql-test/r/func_str.result:
  Add test results
2005-02-01 18:29:10 -08:00
unknown
f6cabbd7f4 Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1


innobase/include/eval0eval.ic:
  Auto merged
2005-02-02 01:47:46 +02:00
unknown
d5311abe2c eval0eval.ic:
Remove wrong assertion that fails on 64 bits


innobase/include/eval0eval.ic:
  Remove wrong assertion that fails on 64 bits
2005-02-02 01:43:25 +02:00
unknown
099f50b67f Fix compile problem - line missing.
sql/sql_parse.cc:
  typo - line awol during commit.
2005-02-01 23:43:09 +00:00