Commit graph

20719 commits

Author SHA1 Message Date
unknown
5abbffd702 fixed compilation failure affects build without InnoDB
sql/mysql_priv.h:
  IF_INNOBASE_DB macro added
2005-02-24 20:55:20 +04:00
unknown
5c1fcd4bbb Merge mysql.com:/home/bk/mysql-4.1 into mysql.com:/home/bk/mysql-5.0
mysql-test/r/rpl_insert_id.result:
  Auto merged
2005-02-24 17:33:32 +01:00
unknown
abd8200f77 Fix of an incorrect merge 2005-02-24 17:25:06 +01:00
unknown
c7fefed4b8 Merge
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-24 14:48:12 +01:00
unknown
2b467d35e3 Added tests for BINARY|VARBINARY LIKE|NOT LIKE 2005-02-24 14:20:12 +01:00
unknown
9d5d847835 Fixed BUG#8638: Test 'sp' fails: Stored Procedure often sends warning 1329
The warning sent is by itself ok, the problem was rather why it wasn't
  sent on some other platforms...
  The real problem was that a total_warn_count which was inconsistent with warn_list
  was sent back with send_eof() during SP execution, which in turn cause a protocol
  error in mysqltest.


mysql-test/r/sp.result:
  Updated results after fixing bug in how total_warn_count is handled.
sql/protocol.cc:
  Fixed bug that caused protocol errors with mysqltest. Don't send total_warn_count
  with send_eof() during SP execution, as it's usually wrong anyway. (warn_list is
  cleared)
sql/sql_parse.cc:
  Reset total_warn_count if the warn_list has been cleared. This gets rid of
  "empty" warnings after some CALLs.
2005-02-24 13:56:09 +01:00
unknown
48429203a8 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/space/pekka/ndb/version/my50-ndb
2005-02-24 13:07:34 +01:00
unknown
161a434944 ndb - wl-1203 fix binary LIKE binary in ndb api
mysql-test/r/ndb_condition_pushdown.result:
  fix binary LIKE binary in ndb api
mysql-test/t/ndb_condition_pushdown.test:
  fix binary LIKE binary in ndb api
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  fix binary LIKE binary in ndb api
ndb/src/ndbapi/NdbOperationInt.cpp:
  fix binary LIKE binary in ndb api
ndb/src/ndbapi/NdbScanFilter.cpp:
  fix binary LIKE binary in ndb api
2005-02-24 13:07:33 +01:00
unknown
0119ea0866 libmysqld.dsp:
Corrected path to my_decimal.cpp


VC++Files/libmysqld/libmysqld.dsp:
  Corrected path to my_decimal.cpp
2005-02-24 11:24:59 +01:00
unknown
3341bb3a95 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-24 11:22:51 +01:00
unknown
5bc1cdf551 Added support for condition pushdown to storage engine for LIKE of varbin 2005-02-24 11:09:14 +01:00
unknown
11901d2bd9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/mysqld.cc:
  Auto merged
2005-02-24 10:08:47 +01:00
unknown
f12722191d Update text for option
sql/mysqld.cc:
  Update of helptext for ndb-cache-check-time
2005-02-24 10:07:37 +01:00
unknown
cb403619fb Convert ndb-cache-check-time fomr milliseconds to seconds
sql/ha_ndbcluster.cc:
  Use the ndb-cache-check-time value as a millisecond counter
2005-02-24 09:42:11 +01:00
unknown
3e8c593df0 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-02-24 12:18:37 +04:00
unknown
26d51de768 A fix (mysql_priv.h should be included first) 2005-02-24 12:17:59 +04:00
unknown
cd68042bce sql_select.cc:
Redundant "Item::" was removed.


sql/sql_select.cc:
  Redundant "Item::" was removed.
2005-02-24 12:05:08 +04:00
unknown
81a3935607 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/sql_parse.cc:
  Auto merged
2005-02-24 08:19:57 +01:00
unknown
ee27d6a69b #ifdef innodb specific code, (old_innodb_table_locks)
sql/sql_parse.cc:
  #ifdef innodb specific code
2005-02-24 08:10:25 +01:00
unknown
3087b2f1fd Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
2005-02-23 23:57:28 -06:00
unknown
9175e5a8f3 Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
2005-02-23 23:53:48 -06:00
unknown
6294c68ee4 Bootstrap:
Add new manual.texi include files


Build-tools/Bootstrap:
  Add new manual.texi include files
2005-02-23 23:44:13 -06:00
unknown
dcdbfa6527 merge
BitKeeper/etc/logging_ok:
  auto-union
include/mysql_com.h:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-24 06:24:46 +01:00
unknown
885e13aba2 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2005-02-24 06:19:41 +01:00
unknown
a23c1bf64e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-24 06:18:02 +01:00
unknown
f4cef73bd7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-24 06:14:43 +01:00
unknown
c29d89e935 Added my_mmap to mysys library
mysys.dsp:
  Added my_mmap


VC++Files/mysys/mysys.dsp:
  Added my_mmap
2005-02-23 23:10:22 -06:00
unknown
5064f26354 More changes to make 5.0.3 compile on Windows
sql_map.cc:
  moved include of sys/stat outside of HAVE_SYS_MMAN_H define
my_decimal.h:
  Added define for EMBEDDED_SERVER for call to string2my_decimal
mi_packrec.c:
  removed cast to caddr_t


myisam/mi_packrec.c:
  removed cast to caddr_t
sql/my_decimal.h:
  Added define for EMBEDDED_SERVER for call to string2my_decimal
sql/sql_map.cc:
  moved include of sys/stat outside of HAVE_SYS_MMAN_H define
2005-02-23 22:55:46 -06:00
unknown
fc79380e69 fixed test results
mysql-test/r/rpl_insert_id.result:
  fixed error format after mats merge
mysql-test/r/sp.result:
  fixed typo
2005-02-24 04:07:58 +02:00
unknown
c3d916b52c Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-24 03:28:33 +02:00
unknown
0613ed1f0e get time for thread switching 2005-02-24 03:25:53 +02:00
unknown
20a30c64f5 fixed typo in test 2005-02-24 02:59:36 +02:00
unknown
8cb66fe618 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/bkroot/mysql-5.0
2005-02-24 00:48:07 +01:00
unknown
c5fb55668b Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_parse.cc:
  Auto merged
2005-02-24 01:11:59 +02:00
unknown
52bba384fc Changes to allow 5.0.3 to compile on Windows after XA was pushed
logging_ok:
  Logging to logging@openlogging.org accepted
mi_packrec.c:
  Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap
mi_extra.c:
  Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h
my_mmap.c:
  Changed how no mmap message is printed for Windows
sql_map.cc:
  Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap


sql/sql_map.cc:
  Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap
mysys/my_mmap.c:
  Changed how no mmap message is printed for Windows
myisam/mi_extra.c:
  Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h
myisam/mi_packrec.c:
  Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-23 16:29:03 -06:00
unknown
91251238b4 Bug#8412: merged from 4.1
sql/log.cc:
  Merge from 4.1
2005-02-23 23:01:51 +01:00
unknown
7cf3b79732 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into zim.(none):/home/brian/mysql/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
2005-02-23 13:09:18 -08:00
unknown
f5a80e5a3b Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-qc_item_view-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0


BitKeeper/etc/logging_ok:
  auto-union
2005-02-23 23:00:41 +02:00
unknown
fee0f25fbd Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-qc_item_view-5.0


BitKeeper/etc/logging_ok:
  auto-union
2005-02-23 22:56:24 +02:00
unknown
c41a485d75 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
2005-02-23 22:16:51 +02:00
unknown
7f13845432 Bug#8412: Setting error code to 0 on statements that cannot fail.
sql/log.cc:
  Setting error code to 0 on SQL statements that cannot fail.
2005-02-23 20:59:00 +01:00
unknown
47ed1db746 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-23 20:52:20 +01:00
unknown
bef32dfacd innodb-dependent test moved from rpl_rotate_logs.test to binlog.test
mysql-test/r/binlog.result:
  binlog rotation after a big transation
mysql-test/r/rpl_rotate_logs.result:
  innodb-dependent test removed
mysql-test/t/binlog.test:
  binlog rotation after a big transation
mysql-test/t/rpl_rotate_logs.test:
  innodb-dependent test removed
2005-02-23 20:35:59 +01:00
unknown
2ffc8022b1 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2005-02-23 13:15:54 -06:00
unknown
196ee96ed2 Fix badly spelled symbol. 2005-02-23 13:15:03 -06:00
unknown
58df85e06a Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/log_event.cc:
  Auto merged
2005-02-23 20:10:58 +01:00
unknown
e0b2dab77d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


sql/log.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-23 20:08:21 +01:00
unknown
29d2b6f6bc Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-xa
2005-02-23 20:01:52 +01:00
unknown
4b2ee4854f result fixes after my change to mysqlbinlog (which was accidentally
pushed some minutes ago)



mysql-test/r/ctype_ucs.result:
  result fix
mysql-test/r/mysqlbinlog.result:
  result fix
mysql-test/r/mysqlbinlog2.result:
  result fix
mysql-test/r/rpl_charset.result:
  result fix
mysql-test/r/user_var.result:
  result fix
2005-02-23 19:59:25 +01:00
unknown
1f2b46fa0f Bug#8412: Merge from 4.0
mysql-test/r/rpl_insert_id.result:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
sql/log.cc:
  Merge from 4.0
2005-02-23 19:58:54 +01:00