mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
12722 commits 2793 branches 343 tags 1.7 GiB
Commit graph

12722 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
256bada7e2 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-05-29 17:53:01 +02:00
unknown
f1ffa13923 backport wild_compare fix from 4.1 - bug#3924 2004-05-29 17:52:20 +02:00
unknown
92c10c681f Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
 2004-05-28 22:33:49 +03:00
unknown
42dae97f56 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-28 21:58:57 +03:00
unknown
79749435a9 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-05-28 21:34:09 +03:00
unknown
bfaaee5343 if exists should not be used inside test 
removed influence of some tests on other tests


mysql-test/r/multi_update.result:
  removed influence on other tests
mysql-test/r/subselect.result:
  if exists should not be used inside test
mysql-test/t/multi_update.test:
  removed influence on other tests
mysql-test/t/subselect.test:
  if exists should not be used inside test
mysql-test/t/system_mysql_db_fix.test:
  removed influence on other tests
 2004-05-28 21:31:51 +03:00
unknown
90ac132b56 Restore.cpp: 
Added include of ndbout


ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Added include of ndbout
 2004-05-28 14:10:27 +02:00
unknown
36652d0053 problems with automake version, need to figure out different way to do this 2004-05-28 11:56:35 +00:00
unknown
64e98031b2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3738
 2004-05-28 16:38:06 +05:00
unknown
431d0e6101 Proposed fix for bug #3412 (embedded server: prepared statement returns 
empty recordset where some records should be found)


sql/ha_myisam.cc:
  Code simplified with vio_ok()
sql/mysqld.cc:
  vio_ok used
sql/slave.cc:
  vio_ok used
sql/sql_class.cc:
  Here is the place of the error - we should not examine net.vio in
  embedded library
sql/sql_class.h:
  method added to always return TRUE in embedded library, and to
  sheck thd.net.vio otherwise
sql/sql_show.cc:
  code simplified with vio_ok()
 2004-05-28 15:59:29 +05:00
unknown
1f265df25f ha_ndbcluster.cc: 
Missing  semicolon


sql/ha_ndbcluster.cc:
  Missing  semicolon
 2004-05-28 12:09:12 +02:00
unknown
0cb0e7f5b9 a fix. 
(Bug#3738: SQL_CALC_FOUND_ROWS ignores WHERE if LIMIT used,
 Bug#3845: wrong FOUND_ROWS result)
 2004-05-28 15:01:16 +05:00
unknown
298fb0f94d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb
 2004-05-28 11:23:45 +02:00
unknown
30be36f002 Added missing ; 
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2004-05-28 11:23:44 +02:00
unknown
6bcb78e700 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1


ndb/src/Makefile_old:
  Auto merged
 2004-05-28 11:23:44 +02:00
unknown
57d9bf4c52 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
 2004-05-28 09:23:43 +00:00
unknown
915fd0310b added shared mem + sci options for ndb 
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2004-05-28 09:22:27 +00:00
unknown
7aa93578dd InnoDB: Add diagnostics when tmpfile() fails at start (Bug #3919) 
innobase/dict/dict0dict.c:
  Replace tmpfile() with os_file_create_tmpfile()
innobase/include/os0file.h:
  Add os_file_create_tmpfile()
innobase/lock/lock0lock.c:
  Replace tmpfile() with os_file_create_tmpfile()
innobase/os/os0file.c:
  Add os_file_create_tmpfile()
  os_file_handle_error(): remove unused first parameter
 2004-05-28 11:15:59 +03:00
unknown
ed8d32f688 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-28 11:15:50 +03:00
unknown
72a71135b9 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 
Build-tools/Do-compile:
  Auto merged
include/my_global.h:
  Auto merged
 2004-05-28 11:03:20 +03:00
unknown
606cb09d86 Added option --config-extra-env to Do-compile 
Build-tools/Do-compile:
  Added option --config-extra-env
include/my_global.h:
  Cleaned up comment to follow same indentation style as the rest of the code
 2004-05-28 11:02:34 +03:00
unknown
be567b5964 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-28 09:51:27 +02:00
unknown
1e7fd2f1f4 Fix for compile problem with newtonapi 
ndb/src/Makefile:
  Compile newtonapi
ndb/src/newtonapi/dba_schema.cpp:
  Use NdbSchemaCon.hpp from newtonapi
 2004-05-28 09:50:17 +02:00
unknown
9061fbc8e5 New patch to ensure that InnoDB gets values for CFLAGS and CXXFLAGS 
sql/handler.h:
  Remove compiler warnings
 2004-05-28 10:41:38 +03:00
unknown
fc8e3654fe BUg#3910 
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  New error insert for ndbrequire
ndb/src/kernel/ndb-main/Main.cpp:
  WEXITSTATUS only contains valid value if WIFEXITED
 2004-05-28 09:09:47 +02:00
unknown
e356f66412 my_global.h: 
Improved a comment about HAVE_BROKEN_PREAD: pread() only works on HP-UX 11.0 if one installs kernel patch PHKL_20349 or greater


include/my_global.h:
  Improved a comment about HAVE_BROKEN_PREAD: pread() only works on HP-UX 11.0 if one installs kernel patch PHKL_20349 or greater
 2004-05-28 09:06:19 +03:00
unknown
36c291181f Merge mysql.com:/home/jonas/src/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas


configure.in:
  Auto merged
 2004-05-28 07:08:15 +02:00
unknown
9bd34fd5b7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb


configure.in:
  Auto merged
 2004-05-28 07:04:07 +02:00
unknown
128a53d327 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


configure.in:
  Auto merged
 2004-05-28 03:24:29 +02:00
unknown
a153d35c05 Portability fix (using 'char' as argument to C functions may give warnings) 
mysql-test/r/variables.result:
  update results after merge
strings/int2str.c:
  Portability fix (using 'char' as a parameter may give a warning)
 2004-05-28 02:36:43 +03:00
unknown
6645955abf merge with 4.0 to get fix for hpux 
configure.in:
  Auto merged
innobase/os/os0file.c:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysql-test/r/variables.result:
  merge fix
 2004-05-28 02:04:07 +03:00
unknown
d1306dfa9d Portability fix for HPUX 
configure.in:
  Ensure that innodb gets system specific CFLAGS and CXXFLAGS
innobase/os/os0file.c:
  Don't use pread/pwrite on systems where these are not working.
  This fixes a bug on HPUX, where InnoDB didn't create the ibdata1 file correctly.
 2004-05-28 02:00:34 +03:00
unknown
b9c825e4a0 Always enable HAVE_COMPRESS on netware 
include/config-netware.h:
  Always enable HAVE_COMPRESS on netware
  We can't detect compress in configure on netware because we must use AC_TRY_RUN to detect zlib on other platforms
 2004-05-28 01:02:20 +03:00
unknown
5d8b1f0114 Merge joreland@bk-internal.mysql.com:mysql-4.1-ndb-jonas 
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas
 2004-05-27 23:42:32 +02:00
unknown
b2842c3c07 Portability fix for 32 bit file systems 2004-05-28 00:32:55 +03:00
unknown
935a801a8a Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 
netware/BUILD/nwbootstrap:
  Auto merged
 2004-05-28 00:27:10 +03:00
unknown
5cacfb327f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-28 00:06:19 +03:00
unknown
b09974a1a0 Remove some code from sql_yacc.cc that doesn't do anything except produce warnings on VC++ 
mysql-test/t/fulltext.test:
  After merge fix
 2004-05-28 00:03:19 +03:00
unknown
32f20312ee merge with 4.0 to get fix to VC++ project files 
VC++Files/comp_err/comp_err.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
myisam/ft_parser.c:
  Keep old code
mysql-test/r/fulltext.result:
  Remove duplicate test from 4.0
 2004-05-27 23:45:22 +03:00
unknown
d5d9f91575 Merged in some patches from Novell. 
netware/BUILD/nwbootstrap:
  Patch from Novell, create the libmysqld.imp file.
netware/mysqld_safe.c:
  Patch from Novell, new option --set-variable.
 2004-05-27 23:39:50 +03:00
unknown
b4a4bc47b4 removed reference to not existing library lib_release\dbug.lib 2004-05-27 22:53:36 +03:00
unknown
80628b0ebe Fix dependency for mgmsrv 2004-05-27 21:18:45 +02:00
unknown
a4d82ab8fe backport bug#2708 fix from 4.1 
myisam/ft_boolean_search.c:
  perlify comment
 2004-05-27 21:14:59 +02:00
unknown
166e750f25 Merge 
ndb/src/kernel/ndb-main/Makefile.am:
  Auto merged
 2004-05-27 21:05:14 +02:00
unknown
d97a303fb1 Use ndbclient more 
configure.in:
  Include mgmapi
ndb/config/type_ndbapi.mk.am:
  remove LDADD from type
ndb/config/type_util.mk.am:
  remove LDADD from type
ndb/src/cw/cpcd/Makefile.am:
  LDADD ndbclient
ndb/src/kernel/ndb-main/Makefile.am:
  Fix LDADD
ndb/src/mgmclient/Makefile.am:
  LDADD ndbclient
ndb/src/mgmsrv/Makefile.am:
  LDADD ndbclient
ndb/test/run-test/Makefile.am:
  LDADD ndbclient
 2004-05-27 21:03:05 +02:00
unknown
420863cfea Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
 2004-05-27 20:40:20 +02:00
unknown
5a01aa7d68 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas
 2004-05-27 20:16:18 +02:00
unknown
486494b3ec Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-05-27 19:59:38 +02:00
unknown
10f04d1974 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas


configure.in:
  Auto merged
ndb/src/mgmapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
 2004-05-27 19:58:19 +02:00
unknown
fb014155b8 Fix for source of libndbclient 2004-05-27 18:41:57 +02:00