Commit graph

5348 commits

Author SHA1 Message Date
unknown
962cedf225 - Updated to Marcs latest version from entropy.ch
support-files/make_mysql_pkg.pl:
  make_mysql_pkg.pl
  
   - Updated to Marcs latest version from entropy.ch
2002-11-26 11:21:35 +01:00
unknown
7d2d7e3fea mysql.server.sh:
- reverted some incompatible/non-portable modifications


support-files/mysql.server.sh:
   - reverted some incompatible/non-portable modifications
2002-11-25 13:25:18 +01:00
unknown
e23826364c Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0


support-files/mysql.server.sh:
  Auto merged
2002-11-25 10:03:55 +01:00
unknown
be5d04e8fc Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
sql/opt_range.cc:
  Auto merged
2002-11-24 21:44:25 +02:00
unknown
79cdd8773c Updated results after merge from 3.23 2002-11-24 21:39:22 +02:00
unknown
18ca5c4dbc merge with 3.23 to get bugfixes for <=> NULL and --bind-address
Build-tools/Do-compile:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysql-test/mysql-test-run.sh:
  Ignore changes from 3.23
mysql-test/r/func_time.result:
  Update results
mysql-test/r/null_key.result:
  Update results
scripts/mysqld_safe.sh:
  Don't apply NICE handling change from 3.23
sql/mysqld.cc:
  merge
sql/opt_range.cc:
  merge
support-files/mysql.server.sh:
  Don't apply changes from 3.23
2002-11-24 16:37:41 +02:00
unknown
bb948c6355 Rewrote nice handling to make more portable 2002-11-24 16:20:41 +02:00
unknown
72da2e4c94 Added new ANSI functions LOCALTIME, LOCALTIMESTAMP and CURRENT_USER
Added CEIL as an alias for CEILING
Cleaned up CHECK constraint handling.
(We don't anymore require braces after CHECK)
Added casting to CHAR.


mysql-test/r/bigint.result:
  Moved casting test to cast.test
mysql-test/r/func_time.result:
  Test of new functions
mysql-test/t/bigint.test:
  Moved casting test to cast.test
mysql-test/t/func_time.test:
  Test of new functions
sql/item_create.cc:
  Added casting to CHAR
sql/item_func.h:
  Added casting to CHAR
sql/item_timefunc.h:
  Added casting to CHAR
sql/lex.h:
  Added new ANSI functions LOCALTIME, LOCALTIMESTAMP and CURRENT_USER
  Added CEIL as an alias for CEILING
sql/sql_yacc.yy:
  Cleaned up CHECK constraint handling.
2002-11-24 15:47:19 +02:00
unknown
e862bb3a4f Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2002-11-24 12:56:24 +01:00
unknown
f81084a2e0 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-11-23 15:52:56 +02:00
unknown
fe9bbec4c0 reverting a test that belongs to 3.23 2002-11-23 15:49:12 +02:00
unknown
dbccc041b6 mysql.server:
- fixed some typos and wording (merged from 3.23 tree)
 - fixed parsing the correct section in /etc/my.cnf ([mysql_server] ->
   [mysql.server]) as documented in the manual


support-files/mysql.server.sh:
   - fixed some typos and wording (merged from 3.23 tree)
   - fixed parsing the correct section in /etc/my.cnf ([mysql_server] ->
     [mysql.server]) as documented in the manual
2002-11-22 18:37:00 +01:00
unknown
3853ff4de2 scripts/safe_mysqld.sh
- fix setting of niceness level

support-files/mysql.server.sh
     - applied some fixes from 4.0 mysql.server script
     - fix my.cnf parsing


scripts/safe_mysqld.sh:
   - fix setting of niceness level, if one adds "renice -20 $$" to safe_mysqld
     as hinted in the manual (which could result in NOHUP_NICENESS having a
     value of "-15" and hence there would be one dash too much)
support-files/mysql.server.sh:
   - applied some fixes from 4.0 mysql.server script
   - fix to actually parse the documented section ([mysql.server] not
     [mysql_server]) in my.cnf on startup
2002-11-22 18:26:45 +01:00
unknown
a073857c3c Merge lgrimmer@work.mysql.com:/home/bk/mysql
into mysql.com:/space/my/mysql-3.23
2002-11-22 17:14:36 +01:00
unknown
fa76afe6ed ut0mem.c:
Flush stderr if we run out of memory, so that the error message more probably finds its way to the error log


innobase/ut/ut0mem.c:
  Flush stderr if we run out of memory, so that the error message more probably finds its way to the error log
2002-11-22 13:59:06 +02:00
unknown
001446d971 Moved test to correct file 2002-11-22 13:52:40 +02:00
unknown
89083f2d6d reverting a change 2002-11-22 13:47:01 +02:00
unknown
4698a8f3b1 Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23
sql/mysqld.cc:
  Auto merged
2002-11-22 13:38:37 +02:00
unknown
cb5a2b2fd5 Fixed bug with indexed NULL column <=> NULL
Fix for Mac OS X shutdown


mysql-test/mysql-test-run.sh:
  Log client error messages
mysql-test/r/null_key.result:
  Test for bug in <=> NULL
mysql-test/t/null_key.test:
  Test for bug in <=> NULL
sql/mysqld.cc:
  Fix for Mac OS X shutdown
sql/opt_range.cc:
  Fixed bug with indexed NULL column <=> NULL
2002-11-22 13:35:43 +02:00
unknown
76ea57bc76 Merge abelkin@work.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/mysql-4.0
2002-11-22 00:34:22 +02:00
unknown
03ac294cce fixed invalidation of query cache
excluded double call of 'invalidate()'


mysql-test/r/innodb_cache.result:
  test of invalidation
mysql-test/t/innodb_cache.test:
  test of invalidation
sql/handler.cc:
  excluded double call of 'invalidate()'
sql/sql_delete.cc:
  fixed invalidation of query cache
sql/sql_insert.cc:
  fixed invalidation of query cache
sql/sql_update.cc:
  fixed invalidation of query cache
2002-11-22 00:33:15 +02:00
unknown
b473d7d640 configure.in:
- actually follow the hints in the comment above and "Remember that 
   regexps needs to quote [ and ] since this is run through m4"...


configure.in:
   - actually follow the hints in the comment above and "Remember that 
     regexps needs to quote [ and ] since this is run through m4"...
2002-11-21 22:14:57 +01:00
unknown
9a2ac08bac configure.in:
- fix MYSQL_NO_DASH_VERSION if version number ends on one digit only
   ("comment" test failed when MySQL version was changed from 4.0.5
   to 4.0.5a)


configure.in:
   - fix MYSQL_NO_DASH_VERSION if version number ends on one digit only
     ("comment" test failed when MySQL version was changed from 4.0.5
     to 4.0.5a)
2002-11-21 21:42:44 +01:00
unknown
a3a99fc7ca A fix for the bug with:
delete from table where column<=>NULL 
on indexed columns
2002-11-21 22:13:23 +02:00
unknown
e288688491 Merge lgrimmer@work.mysql.com:/home/bk/mysql
into mysql.com:/space/my/mysql-3.23
2002-11-21 19:11:47 +01:00
unknown
6f5b38b9dd fix error in result
mysql-test/r/func_test.result:
  Fixing the error in result
2002-11-21 18:14:27 +02:00
unknown
d0236e30a4 A fix for --bind-address=hostname 2002-11-21 17:55:49 +02:00
unknown
70a17cd5a7 merge with 3.23
innobase/row/row0mysql.c:
  Auto merged
2002-11-21 02:28:23 +02:00
unknown
a407ebd3e8 Added 'table lock' state while MySQL is waiting to get locks for tables. 2002-11-21 02:13:37 +02:00
unknown
0b19cb1e2d Do-compile:
- applied some changes from the 4.0 tree (enable multiple 
   --conf-environment options, add --with-debug, don't add "-max"
   prefix just because BDB is enabled)


Build-tools/Do-compile:
   - applied some changes from the 4.0 tree (enable multiple 
     --conf-environment options, add --with-debug, don't add "-max"
     prefix just because BDB is enabled)
2002-11-20 22:16:29 +01:00
unknown
910849ccd1 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-20 22:57:42 +02:00
unknown
9b9546edbc Try to optimize the cache buffer size needed for bulk_insert
Fix for shutdown on Mac OS X


include/my_tree.h:
  Try to optimize the cache buffer size needed for bulk_insert
myisam/mi_write.c:
  Try to optimize the cache buffer size needed for bulk_insert
mysql-test/r/bdb.result:
  Make test repeatable
mysql-test/t/bdb.test:
  Make test repeatable
mysys/tree.c:
  Try to optimize the cache buffer size needed for bulk_insert
sql/mysql_priv.h:
  Small optimization
sql/mysqld.cc:
  Fix for shutdown on Mac OS X
sql/sql_insert.cc:
  Try to optimize the cache buffer size needed for bulk_insert
sql/sql_yacc.yy:
  Call thd->strmake() instead of sql_strmake()
sql/table.cc:
  Try to optimize the cache buffer size needed for bulk_insert
sql/table.h:
  Try to optimize the cache buffer size needed for bulk_insert
2002-11-20 22:56:57 +02:00
unknown
0c3106f964 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-11-20 15:17:57 +01:00
unknown
da6fc28210 bug in _ftb_strstr fixed :) 2002-11-20 15:17:17 +01:00
unknown
e9e8cdf01c Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-11-20 14:22:42 +02:00
unknown
4813f04990 set_var.cc:
Fix potential bus error in 64-bit computers in SHOW VARIABLES, if int is only 32-bit in them


sql/set_var.cc:
  Fix potential bus error in 64-bit computers in SHOW VARIABLES, if int is only 32-bit in them
2002-11-19 22:59:01 +02:00
unknown
699e3a5522 Merge lgrimmer@work.mysql.com:/home/bk/mysql
into mysql.com:/space/my/mysql-3.23
2002-11-19 20:45:20 +01:00
unknown
9b891cee55 ha_innobase.cc:
Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table


sql/ha_innobase.cc:
  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table
2002-11-19 17:08:07 +02:00
unknown
0fb06a68ce row0mysql.c, row0mysql.h:
Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table


innobase/include/row0mysql.h:
  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table
innobase/row/row0mysql.c:
  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table
2002-11-19 16:54:52 +02:00
unknown
d050750f1f row0mysql.c, row0mysql.h, ha_innodb.cc, sql_table.cc, handler.h:
Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp


sql/handler.h:
  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
sql/sql_table.cc:
  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
sql/ha_innodb.cc:
  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
innobase/include/row0mysql.h:
  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
innobase/row/row0mysql.c:
  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
2002-11-19 16:27:26 +02:00
unknown
8e9a5a4f10 - applied patch for AMD x86-64
(thanks to Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>


bdb/dist/aclocal/mutex.m4:
   - applied patch for AMD x86-64
2002-11-19 13:45:51 +01:00
unknown
33d678fcdc merge with 3.23
BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-depcomp:
  Delete: depcomp
config.guess:
  Auto merged
config.sub:
  Auto merged
configure.in:
  Auto merged
dbug/Makefile.am:
  Auto merged
heap/Makefile.am:
  Auto merged
install-sh:
  Auto merged
isam/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
ltconfig:
  Auto merged
ltmain.sh:
  Auto merged
missing:
  Auto merged
myisam/Makefile.am:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
regex/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
strings/Makefile.am:
  Auto merged
2002-11-19 12:35:17 +02:00
unknown
7bc917e9e1 Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2002-11-19 10:41:03 +02:00
unknown
54c03ff736 Merge vvagin@work.mysql.com:/home/bk/mysql-4.0
into genie.(none):/home/vva/work/mysqldump_xml/4.0
2002-11-18 20:53:07 +04:00
unknown
db7357a9e7 fix xml-output of mysqldump
client/mysqldump.c:
  fix xml-output
2002-11-18 20:50:42 +04:00
unknown
6600e656b1 add -DHAVE_BROKEN_REALPATH to CFLAGS on FreeBSD (previous patch touched only CXXFLAGS) 2002-11-18 16:50:37 +01:00
unknown
8c71ab8415 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
configure.in:
  Auto merged
2002-11-18 16:31:03 +01:00
unknown
4cdf5497a9 added -DHAVE_BROKEN_REALPATH for FreeBSD builds 2002-11-18 16:30:19 +01:00
unknown
b34d11f891 Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23 2002-11-18 16:21:53 +02:00
unknown
e41123b89f Small change to make key cache code cleaer 2002-11-18 14:59:45 +02:00