Commit graph

7905 commits

Author SHA1 Message Date
unknown
548f024089 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-06-07 12:39:26 +02:00
unknown
7dc2426be0 BUG#3987 - if(int, aggregate(int)) 2004-06-07 12:38:35 +02:00
unknown
030a698ecd Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/bk/mysql-4.0
2004-06-02 13:10:44 -05:00
unknown
427590f865 Touchups to .cnf file comments. 2004-06-02 12:56:26 -05:00
unknown
daf33a49ba InnoDB cleanup: Remove debug function
cmp_debug_dtuple_rec_with_match()
unless #ifdef UNIV_DEBUG


innobase/rem/rem0cmp.c:
  Remove cmp_debug_dtuple_rec_with_match() unless #ifdef UNIV_DEBUG
2004-06-02 11:12:04 +03:00
unknown
1a36eff30c Fix applied to allow building of 4.0.20 for NetWare
client/mysqltest.c:
  Fix compilation errors for NetWare
2004-06-01 19:35:09 -01:00
unknown
1b11594d53 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-06-01 23:35:08 +03:00
unknown
010fffc2f7 Updated version number
Portability fix for netware. (We can't use TRY_RUN when cross compiling)
2004-06-01 23:34:47 +03:00
unknown
2a1a6e5a2a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.0
2004-06-01 14:19:38 -05:00
unknown
063deb90d3 README:
Update README URL. (Bug #3678)


mysql-test/README:
  Update README URL. (Bug #3678)
2004-06-01 14:18:34 -05:00
unknown
3db332ca6b row0mysql.c, row0mysql.h, ha_innodb.cc:
Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch


sql/ha_innodb.cc:
  Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
innobase/include/row0mysql.h:
  Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
innobase/row/row0mysql.c:
  Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
2004-06-01 19:19:48 +03:00
unknown
80c662479b Changed --log-warnings to be integer instead of boolean. Given --skip-log-warnings
will disable warnings, --log-warnings will increment warning level by one, or the
level can be given as an optional argument. Default level is 1.

Changed aborted connection warning to be logged only if the level is > 1.


sql/sql_class.h:
  Changed boolean into ulong.
sql/sql_parse.cc:
  Changed aborted connection warning to be logged only if the level is > 1.
2004-06-01 17:29:24 +03:00
unknown
fec8faa06a InnoDB: Do not get a lock for consistent reads (Bug #3894)
sql/ha_innodb.cc:
  start_stmt(): Obtain an exclusive lock for other than plain SELECT
2004-05-31 16:33:45 +03:00
unknown
ea21baa5bf Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
2004-05-31 13:53:44 +05:00
unknown
09b9182e2e mysql_get_parameter interface fixed
include/mysql.h:
  (void) added to the empty parameter's list
libmysql/libmysql.c:
  (void) added to the empty parameter's list
2004-05-31 13:53:10 +05:00
unknown
0858e15c13 VC++ project for to compile the udf_example.cc on
Windows
2004-05-30 04:11:19 -03:00
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
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
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
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
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
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
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
b2842c3c07 Portability fix for 32 bit file systems 2004-05-28 00:32:55 +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
a4d82ab8fe backport bug#2708 fix from 4.1
myisam/ft_boolean_search.c:
  perlify comment
2004-05-27 21:14:59 +02:00
unknown
a4237f3dd9 Add back wrongly deleted file 2004-05-27 11:23:26 +03:00
unknown
1d03d1629d netware files should always be in 'make dist'
use opt_net_buffer_length instead of net_buffer_length


Makefile.am:
  netware files should always be in 'make dist'
client/mysqldump.c:
  use opt_net_buffer_length instead of net_buffer_length
configure.in:
  netware files should always be in 'make dist'
netware/Makefile.am:
  netware files should always be in 'make dist'
2004-05-27 02:47:04 +03:00
unknown
cc24ac7079 VC++ portability fix
VC++Files/client/mysqlclient.dsp:
  Added missing /D MYSQL_CLIENT
VC++Files/innobase/innobase.dsp:
  Remove not existing file
sql/mysqld.cc:
  Fixed comment
2004-05-26 21:45:58 +03:00
unknown
e6b4c164ee InnoDB fixup: remove debug assertion that causes compile error
when UNIV_DEBUG is defined (introduced in ChangeSet@1.1850)


innobase/que/que0que.c:
  Remove ut_ad() reference to removed parameter next_thr
2004-05-26 19:41:14 +03:00
unknown
00c41b2850 Fix to make Windows compilation smoother
VC++Files/innobase/innobase.dsp:
  non-existent file removed
client/mysql.cc:
  local opt_max_allowed_packet and opt_net_buffer_length introduced
client/mysqldump.c:
  local opt_max_allowed_packet and opt_net_buffer_length introduced
include/mysql.h:
  mysql_get_parameters() interface added
  #define max_allowed_packet added
include/mysql_com.h:
  these should not be exported
libmysql/libmysql.c:
  mysql_get_parameters implementations
libmysql/libmysql.def:
  interface changed
libmysql_r/Makefile.am:
  MYSQL_CLIENT define added
libmysqld/lib_sql.cc:
  line moved to be above the '#include "mysql.cc"'
libmysqld/libmysqld.c:
  mysql_get_parameters implementation (embedded)
libmysqld/libmysqld.def:
  interface changed
sql/log_event.cc:
  should be like that in this case
tools/mysqlmanager.c:
  compiler warns on this line
2004-05-26 21:40:27 +05:00
unknown
3b1dd9af7b InnoDB cleanup: Remove unused code for online backup
innobase/include/log0log.h:
  Remove references to online backup
innobase/include/log0log.ic:
  Remove references to online backup
innobase/include/mtr0mtr.h:
  Remove references to MLOG_FULL_PAGE
innobase/log/log0log.c:
  Remove references to online backup
innobase/log/log0recv.c:
  Remove references to MLOG_FULL_PAGE
innobase/mtr/mtr0mtr.c:
  Remove references to MLOG_FULL_PAGE
  Remove references to online backup
2004-05-26 10:45:37 +03:00
unknown
fd079fdaa1 Added new header files 2004-05-26 00:01:23 +03:00
unknown
a3d0ce6bc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/tmp/skr99/mysql-4.0
2004-05-25 22:38:43 +03:00
unknown
84fbc276f1 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
2004-05-26 00:38:42 +05:00
unknown
19a78ceac8 Proposed fix for bug #3818 (libmysqld.dll leads to program's crash)
configurations added to build the libraries with USE_TLS flag to be
used for libmysqld


VC++Files/dbug/dbug.dsp:
  TLS_DEBUG configuration added
VC++Files/heap/heap.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/isam/isam.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/libmysql/libmysql.dsp:
  MYSQL_CLIENT define enabled
VC++Files/libmysqld/libmysqld.dsp:
  using of _tls libraries added
VC++Files/myisam/myisam.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/myisammrg/myisammrg.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/mysys/mysys.dsp:
  TLS and TLS_DEBUG configurations added
include/mysql_com.h:
  __declspec(dllimport) seems to be necessary when one uses .dll
  on Windows
2004-05-26 00:27:00 +05:00
unknown
b287ca53d0 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/tmp/skr99/mysql-4.0


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
myisam/myisam_ftdump.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
2004-05-25 22:01:50 +03:00
unknown
b3851363ba Added patches from Novell
Build-tools/Do-compile:
  Fixed indentation
configure.in:
  Added patches from Novell
  Added C_EXTRA_FLAGS as an easy way to pass flags to both CFLAGS and CXXFLAGS
extra/perror.c:
  Fixed error number reporting to not report 'Unknown error'
include/my_global.h:
  Defines to make NETWARE patches cleaner
include/thr_alarm.h:
  Fixed wrong macro
netware/mysql_install_db.c:
  Indentation fix
2004-05-25 22:00:14 +03:00
unknown
b2882fd4f5 InnoDB cleanup and possible bug-fix: Remove srv0que
BitKeeper/deleted/.del-srv0que.c~d1feebb77b5a9b96:
  Delete: innobase/srv/srv0que.c
innobase/srv/Makefile.am:
  Remove srv0que.c
BitKeeper/deleted/.del-srv0que.h~f12ecb4b5afe203e:
  Delete: innobase/include/srv0que.h
innobase/include/Makefile.am:
  Remove srv0que.c
innobase/include/que0que.h:
  Remove unnecessary function que_fork_error_handle()
  que_thr_end_wait(): Remove output parameter next_thr; return it
innobase/include/trx0roll.h:
  trx_rollback(), trx_finish_rollback_off_kernel():
  Remove output parameter next_thr; return it instead
innobase/include/trx0trx.h:
  trx_sig_send(), trx_sig_reply(), trx_sig_start_handle():
  Remove output parameter next_thr; return it instead
innobase/include/usr0sess.h:
  Remove sess->state and its literals SESS_ACTIVE and SESS_ERROR
innobase/que/que0que.c:
  Remove unnecessary function que_fork_error_handle()
  que_thr_end_wait(): Remove output parameter next_thr; return it
  Remove references to srv0que.c
innobase/srv/srv0srv.c:
  Remove unnecessary #include "srv0que.h"
innobase/trx/trx0purge.c:
  Remove unneeded references to srv0que.c
innobase/trx/trx0roll.c:
  Many functions: Remove output parameter next_thr; return it instead
  Remove references to srv0que.c
innobase/trx/trx0trx.c:
  Many functions: Remove output parameter next_thr; return it instead
  Remove references to srv0que.c
  Remove references to SESS_ERROR
innobase/usr/usr0sess.c:
  Remove sess->state
2004-05-25 20:12:09 +03:00
unknown
137af9003d Fixed VC++ project files
VC++Files/copy_mysql_files.bat:
  Added /Y to avoid questions
  Fixed wrong path for copying data files
VC++Files/sql/mysqld.dsp:
  Added missing compiler option
2004-05-25 15:53:29 +03:00
unknown
b7e8f418c2 Removed references to BDB and InnoDB from 'classic' release
VC++Files/mysqldemb/mysqldemb.dsp:
  Removed references to BDB and InnoDB from 'classic'
VC++Files/sql/mysqld.dsp:
  Removed references to BDB and InnoDB from 'classic'
2004-05-25 13:26:24 +03:00
unknown
48e39bf299 fixed typos 2004-05-25 13:17:33 +03:00
unknown
8a1a99301f Fixed typo 2004-05-25 02:49:43 +03:00
unknown
da1623ddbb New MYSQL_SERVER_SUFFIX usage (for easier compilation)
Update of VC++ project files.


VC++Files/mysqlmanager/childfrm.cpp:
  Rename: VC++Files/mysqlmanager/CHILDFRM.CPP -> VC++Files/mysqlmanager/childfrm.cpp
VC++Files/mysqlmanager/childfrm.h:
  Rename: VC++Files/mysqlmanager/CHILDFRM.H -> VC++Files/mysqlmanager/childfrm.h
VC++Files/mysqlmanager/mainfrm.cpp:
  Rename: VC++Files/mysqlmanager/MAINFRM.CPP -> VC++Files/mysqlmanager/mainfrm.cpp
VC++Files/mysqlmanager/mainfrm.h:
  Rename: VC++Files/mysqlmanager/MAINFRM.H -> VC++Files/mysqlmanager/mainfrm.h
VC++Files/mysqlmanager/mysqlmanager.dsp:
  Rename: VC++Files/mysqlmanager/MySqlManager.dsp -> VC++Files/mysqlmanager/mysqlmanager.dsp
VC++Files/mysqlmanager/mysqlmanager.mak:
  Rename: VC++Files/mysqlmanager/MySqlManager.mak -> VC++Files/mysqlmanager/mysqlmanager.mak
VC++Files/mysqlmanager/resource.h:
  Rename: VC++Files/mysqlmanager/RESOURCE.H -> VC++Files/mysqlmanager/resource.h
VC++Files/mysqlmanager/stdafx.cpp:
  Rename: VC++Files/mysqlmanager/STDAFX.CPP -> VC++Files/mysqlmanager/stdafx.cpp
VC++Files/mysqlmanager/stdafx.h:
  Rename: VC++Files/mysqlmanager/STDAFX.H -> VC++Files/mysqlmanager/stdafx.h
VC++Files/mysqlmanager/toolsql.cpp:
  Rename: VC++Files/mysqlmanager/TOOLSQL.CPP -> VC++Files/mysqlmanager/toolsql.cpp
VC++Files/mysqlmanager/toolsql.h:
  Rename: VC++Files/mysqlmanager/TOOLSQL.H -> VC++Files/mysqlmanager/toolsql.h
VC++Files/mysqlmanager/RES/bitmap1.bmp:
  Rename: VC++Files/mysqlmanager/RES/BITMAP1.BMP -> VC++Files/mysqlmanager/RES/bitmap1.bmp
VC++Files/mysqlmanager/RES/bitmap3.bmp:
  Rename: VC++Files/mysqlmanager/RES/BITMAP3.BMP -> VC++Files/mysqlmanager/RES/bitmap3.bmp
VC++Files/mysqlmanager/RES/bmp00001.bmp:
  Rename: VC++Files/mysqlmanager/RES/BMP00001.BMP -> VC++Files/mysqlmanager/RES/bmp00001.bmp
VC++Files/mysqlmanager/RES/bmp00002.bmp:
  Rename: VC++Files/mysqlmanager/RES/BMP00002.BMP -> VC++Files/mysqlmanager/RES/bmp00002.bmp
VC++Files/mysqlmanager/RES/database.bmp:
  Rename: VC++Files/mysqlmanager/RES/DATABASE.BMP -> VC++Files/mysqlmanager/RES/database.bmp
VC++Files/mysqlmanager/RES/fontd.bmp:
  Rename: VC++Files/mysqlmanager/RES/FONTD.BMP -> VC++Files/mysqlmanager/RES/fontd.bmp
VC++Files/mysqlmanager/RES/fontu.bmp:
  Rename: VC++Files/mysqlmanager/RES/FONTU.BMP -> VC++Files/mysqlmanager/RES/fontu.bmp
VC++Files/mysqlmanager/RES/query_ex.bmp:
  Rename: VC++Files/mysqlmanager/RES/QUERY_EX.BMP -> VC++Files/mysqlmanager/RES/query_ex.bmp
VC++Files/mysqlmanager/RES/toolbar.bmp:
  Rename: VC++Files/mysqlmanager/RES/TOOLBAR.BMP -> VC++Files/mysqlmanager/RES/toolbar.bmp
BUILD/compile-pentium-valgrind-max:
  Use MYSQL_SERVER_SUFFIX
VC++Files/bdb/bdb.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/client/mysql.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/client/mysqladmin.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/client/mysqldump.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/client/mysqlimport.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/client/mysqlshow.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/copy_mysql_files.bat:
  Assume we are in correct directory
VC++Files/innobase/innobase.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
  Remove old files
VC++Files/isamchk/isamchk.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/libmysqld/libmysqld.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/myisamchk/myisamchk.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/myisamlog/myisamlog.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/myisampack/myisampack.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/mysql.dsw:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/mysys/mysys.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/pack_isam/pack_isam.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/perror/perror.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/replace/replace.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/sql/mysqld.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
include/my_global.h:
  Added QUOTE and STRINGIFY
include/mysql_version.h.in:
  New MYSQL_SERVER_SUFFIX handling
innobase/eval/eval0eval.c:
  Fixed compiler warning
libmysql/libmysql.c:
  Use STRINGIFY()
sql/mysqld.cc:
  New MYSQL_SERVER_SUFFIX handling
sql/mysqld_suffix.h:
  New MYSQL_SERVER_SUFFIX handling
sql/set_var.cc:
  Use STRINGIFY()
zlib/contrib/asm386/zlibvc.dsp:
  Updated for 4.0
2004-05-25 02:28:44 +03:00
unknown
a337dc1d53 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-24 18:47:49 +02:00
unknown
668f35b7d5 Fix for BUG#3871: a slave must always replicate a statement, even if it examines more than 4G rows,
so we set SQL_BIG_SELECTS to 1.


sql/slave.cc:
  The slave SQL thread must always have SQL_BIG_SELECTS=1, so that it does not fail to replicate an INSERT SELECT
  examining more than 4 billion rows (for client threads, SQL_BIG_SELECTS is automatically set to 1 if
  max_join_size is 4G, but that's in handle_one_connection, so not for the slave thread).
2004-05-24 18:46:49 +02:00
unknown
2ad60dc7cc InnoDB cleanup: sync0arr.c: sync_array_cell_print(): Remove unused variable str
innobase/sync/sync0arr.c:
  sync_array_cell_print(): Remove unused variable str
2004-05-24 15:43:34 +03:00