Commit graph

8032 commits

Author SHA1 Message Date
unknown
d587a36aa1 InnoDB: Revert most of ChangeSet@1.1772, as the debug functions may
be needed when testing production releases


innobase/btr/btr0btr.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/buf/buf0buf.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/buf/buf0flu.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/buf/buf0lru.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/buf/buf0rea.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/data/data0type.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/dict/dict0dict.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/fsp/fsp0fsp.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/fut/fut0lst.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/ibuf/ibuf0ibuf.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/btr0btr.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/buf0buf.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/buf0buf.ic:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/buf0flu.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/buf0lru.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/data0type.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/dict0dict.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/fsp0fsp.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/fut0lst.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/lock0lock.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/mem0dbg.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/mem0dbg.ic:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/mem0pool.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/mtr0mtr.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/pars0opt.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/sync0rw.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/include/sync0sync.h:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/lock/lock0lock.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/mem/mem0dbg.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/mem/mem0pool.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/mtr/mtr0mtr.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/pars/pars0opt.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/srv/srv0start.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/sync/sync0rw.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/sync/sync0sync.c:
  Remove #ifdef UNIV_DEBUG around debug code
innobase/trx/trx0roll.c:
  Remove #ifdef UNIV_DEBUG around debug code
2004-06-16 13:41:14 +03:00
unknown
e4042c25ef mysql-copyright:
* added 'local $/' to keep from undef-ing $/ (the newline setting) for the whole script
  * removed the target dir removal (target dir is not a temp dir!)
  * use split to create filelist (cleaner way than using chomp!)
  * removed use of chomp because it caused some file names to be mangled
  * print out which file is being processed if verbose
mysql-copyright-2:
  * added cpp to list of files to be processed (for windows archives)


Build-tools/mysql-copyright-2:
  * added cpp to list of files to be processed (for windows archives)
Build-tools/mysql-copyright:
  * added 'local $/' to keep from undef-ing $/ (the newline setting) for the whole script
  * removed the target dir removal (target dir is not a temp dir!)
  * use split to create filelist (cleaner way than using chomp!)
  * removed use of chomp because it caused some file names to be mangled
  * print out which file is being processed if verbose
2004-06-15 23:05:12 -07:00
unknown
518c923625 InnoDB bug fix (row0mysql.c): make reserved table names innodb_* special again
innobase/row/row0mysql.c:
  row_create_table_for_mysql(), row_drop_table_for_mysql():
   Make InnoDB recognize the special table names innodb_* again.
2004-06-15 22:09:09 +03:00
unknown
1fed702658 mysql-copyright -> more fixes to deal with problems in removing temporary tar directory. Had to use cd $WD vs chdir($WD).
Servers.fgl -> made sure all charset files were accounted for (cp 1256 was missing)


Build-tools/mysql-copyright:
  more fixes to deal with problems in removing temporary tar directory. Had to use `cd $WD` vs chdir($WD).
VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl:
  made sure all charset files were accounted for (cp 1256 was missing)
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl:
  made sure all charset files were accounted for (cp 1256 was missing)
VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl:
  made sure all charset files were accounted for (cp 1256 was missing)
2004-06-15 00:12:14 -07:00
unknown
de389ee55e Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0
2004-06-11 18:52:27 +04:00
unknown
d4c72a852d test suite for bug Bug#3969 (commited separetely because it took too long time to parse it on 3.23)
client/mysqltest.c:
  allow big commands in mysql-test
2004-06-11 16:25:18 +03:00
unknown
2df0588981 mysql-copyright:
Small fixes to handle packaging of windows src (commercial) file


Build-tools/mysql-copyright:
  Small fixes to handle packaging of windows src (commercial) file
2004-06-11 00:40:56 -07:00
unknown
eefb240b6d Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-06-10 16:44:55 +03:00
unknown
43f0418d33 After merge fix
scripts/mysql_install_db.sh:
  Cleanup
2004-06-10 16:44:39 +03:00
unknown
64bbd52a5d Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-06-10 13:58:32 +02:00
unknown
93290dad1f warn about multiple mysqld --user parameters only if their arguments differ
scripts/mysqld_safe.sh:
  don't protect mysqld from multiple --user commands - mysqld can take care of itself
sql/mysqld.cc:
  warn about multiple --user parameters only if their arguments differ
2004-06-10 13:56:58 +02:00
unknown
956d4f4e4e Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0


sql/sql_parse.cc:
  Auto merged
2004-06-10 12:36:11 +03:00
unknown
3e5eb498bc Merge with 3.23 to get latest bug fixes
mysql-test/t/type_date.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
mysql-test/r/type_date.result:
  merge with 3.23
2004-06-10 11:59:45 +03:00
unknown
4075c30515 Cleanup
sql/sql_parse.cc:
  Cleanup of patch
2004-06-10 11:58:16 +03:00
unknown
85803ddf86 Fixed issue with compilation MySQL with OpenSSL
if OpenSSL is installed in non-statndart directory
('openssl/opensslv.h: No such file or directory')


include/my_global.h:
  Fixed issue with compilation MySQL with OpenSSL 
  if OpenSSL is installed in non-statndart directory
include/violite.h:
  Fixed issue with compilation MySQL with OpenSSL 
  if OpenSSL is installed in non-statndart directory
2004-06-09 20:02:08 +04:00
unknown
7a00d199a4 Fix for BUG#4038 "rpm postinstall script leaves files as owned by root":
the rpm postinstall script must call mysql_install_db with --user=mysql,
and mysql_install_db must then pass this to mysqld. Otherwise, mysqld
runs as root, and if you have --log-bin=somewhere_out_of_var_lib_mysql
it creates binlog files owned by root in this dir, and this dir is not
fixed by the 'chmod mysql', so files remain owned by root, and later mysqld
(running as 'mysql') can't read them.
I'm hardcoding 'mysql' in the postinstall script, but it's already hardcoded
there in many places (see the useradd and chown) so it's ok.


scripts/mysql_install_db.sh:
  Pass --user to mysqld
support-files/mysql.spec.sh:
  in postinstall, call mysql_install_db with --user=mysql, so that mysqld (which installs the grant tables)
  is started with --user=mysql.
2004-06-09 17:07:11 +02:00
unknown
57ae9ed0ad complement to previous fix (which was for SQLCOM_DROP_DB), for COM_DROP_DB.
sql/sql_parse.cc:
  Making COM_DROP_DB honour lower_case_table_names. Plus coding-style fixes.
2004-06-09 15:27:15 +02:00
unknown
87c200d17c Fix for BUG#4066 "DROP DATABASE case sensitive even if lower-case-table-names > 0"
sql/sql_parse.cc:
  honour lower_case_table_names in DROP DATABASE (like we already do in CREATE DATABASE)
2004-06-09 15:22:31 +02:00
unknown
2a2ef1a192 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-06-09 00:08:50 +02:00
unknown
e6c916ffa8 different (simpler and more compatible) fix for bug#4046 2004-06-09 00:08:24 +02:00
unknown
7d3d862f56 see notes for mysql-copyright scripts
Build-tools/mysql-copyright-2:
  small fix
Build-tools/mysql-copyright:
  deals with windows src file now
2004-06-08 13:36:32 -07:00
unknown
ca96a3b410 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0
into krsna.patg.net:/home/patg/mysql-4.0


Build-tools/Do-compile:
  Auto merged
2004-06-08 13:22:31 -07:00
unknown
3e159f3fc9 BUG#3439 problem with UDF functions
VC++Files/examples/udf_example/udf_example.def:
  Add definitions of init and deinit functions
2004-06-08 12:35:22 +06:00
unknown
3665b3be90 Fix for bug #4036 multiple SELECT DATE_FORMAT, incorrect results 2004-06-07 20:35:05 +04:00
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
21a4f53e0e removed incorrect destructor (to prevent deleting item by recursion instead of by list scanning in case of chained OR or AND) 2004-06-03 15:38:38 +03: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
dc25060a5f correct table_hash_search call 2004-05-31 21:10:15 +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