Commit graph

5364 commits

Author SHA1 Message Date
unknown
80b143c111 Change of internal key_field=NULL handling to avoid error messages.
Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
Fixed reference to uninitalized variable


mysql-test/r/distinct.result:
  Updated results for new tests
mysql-test/r/func_math.result:
  Fixed test of RND()
mysql-test/r/innodb.result:
  Updated results for new tests
mysql-test/r/null.result:
  Updated results for new tests
mysql-test/t/distinct.test:
  New distinct test
mysql-test/t/func_math.test:
  Fixed test of RND()
mysql-test/t/innodb.test:
  Test for bugs
mysql-test/t/null.test:
  TEst for bugs
sql/field.h:
  Change of NULL handling to avoid error messages
sql/field_conv.cc:
  Change of NULL handling to avoid error messages
sql/item.cc:
  Change of NULL handling to avoid error messages
sql/item.h:
  Change of NULL handling to avoid error messages
sql/item_cmpfunc.cc:
  Change of NULL handling to avoid error messages
sql/item_func.cc:
  Change of NULL handling to avoid error messages
sql/item_func.h:
  Cleaned up RND() handling
sql/item_timefunc.cc:
  Change of NULL handling to avoid error messages
sql/item_timefunc.h:
  Change of NULL handling to avoid error messages
sql/opt_range.cc:
  Fixed bug in <=> NULL
sql/password.c:
  Indentation cleanup
sql/sql_base.cc:
  Change of NULL handling to avoid error messages
sql/sql_class.cc:
  Fixed reference to uninitalized variable
sql/sql_handler.cc:
  Change of NULL handling to avoid error messages
sql/sql_select.cc:
  Change of NULL handling to avoid error messages
  Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
sql/sql_select.h:
  Change of NULL handling to avoid error messages
sql/unireg.cc:
  Change of NULL handling to avoid error messages
2002-12-03 13:08:25 +02:00
unknown
4f221e351d Merge work:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.0
sql/mysqld.cc:
  Auto merged
2002-12-01 00:48:36 +02:00
unknown
b22dc24cbb Fixed some bugs from last multi-table-update push.
More tests for multi-table-update & timestamp handling


mysql-test/r/innodb.result:
  New multi-table-update tests
mysql-test/r/multi_update.result:
  New multi-table-update tests
mysql-test/r/type_timestamp.result:
  New timestamp tests
mysql-test/t/innodb.test:
  New multi-table-update tests
mysql-test/t/multi_update.test:
  New multi-table-update tests
mysql-test/t/type_timestamp.test:
  New timestamp tests
sql/sql_select.cc:
  Fixed bug in safe mode checking
sql/sql_update.cc:
  Fixed bug in autocommit in multi-table-update
2002-12-01 00:48:35 +02:00
unknown
d5be7db312 Fixed --datadir for embedded server 2002-12-01 00:02:58 +02:00
unknown
fdc094f535 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
sql/sql_yacc.yy:
  Auto merged
2002-11-29 16:41:12 +02:00
unknown
4653621909 New multi-table-update code
New (simpler) internal timestamp handling.
More debuging to heap tables.
Small cleanups to multi-table-delete
false -> 0 and true -> 1  (We should use TRUE and FALSE)


heap/_check.c:
  Added checking of rows
heap/hp_delete.c:
  Extra debugging
heap/hp_scan.c:
  Extra debugging
heap/hp_update.c:
  Extra debugging
heap/hp_write.c:
  Extra debugging
include/my_base.h:
  Added option to disable row cache when using updates
isam/extra.c:
  Added option to disable row cache when using updates
myisam/mi_check.c:
  Comment cleanup
myisam/mi_extra.c:
  Added option to disable row cache when using updates
myisam/sort.c:
  Indentaion cleanups
myisammrg/myrg_extra.c:
  Added option to disable row cache when using updates
mysql-test/r/multi_update.result:
  Updated results
mysql-test/t/multi_update.test:
  Cleanup up to only use table names t1, t2,...
mysys/mf_iocache.c:
  Safety fix
sql/item_cmpfunc.cc:
  change true-> 1 and false -> 0
sql/mysql_priv.h:
  Cleaned up SQL_LIST handling
sql/sql_base.cc:
  Fixed grant checking if SELECT tablename.*
sql/sql_class.h:
  Cleaned up multi-table-update
sql/sql_delete.cc:
  Fixed OPTION_SAFE_UPDATE checking in multi-table-delete.
  Fixed query-cache invalidation in multi-table-delete
sql/sql_insert.cc:
  cleaned up timestamp handling
sql/sql_olap.cc:
  false -> 0
sql/sql_parse.cc:
  Optimized some list handling.
  Moved multi-table-update to sql_update.cc
sql/sql_select.cc:
  More comments
  Fixed create_tmp_table for multi-table-update
sql/sql_select.h:
  New prototypes
sql/sql_union.cc:
  false -> 0
  Cleaned up timestamp handling
sql/sql_update.cc:
  New multi-update-table code
sql/sql_yacc.yy:
  false -> 0, true -> 1
  Optimized some list handling
sql/table.h:
  Added union for temporary values.
  Made shared int to be able to store counters.
sql/uniques.cc:
  Indentation cleanup
2002-11-29 16:40:18 +02:00
unknown
4514f0b0fa Merge akishkin@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/walrus/bk/40
2002-11-29 19:05:05 +05:00
unknown
469e0b321c improvement crash-me
BitKeeper/etc/ignore:
  Added core.2430 to the ignore list
sql-bench/crash-me.sh:
  1) restore #!@PERL@ that I (accidentally) deleted  last time
  2) comment order_by_remember_desc section
  3) rectify WEEK test. Now it returns "EURO" ,"USA", "error" (if it returns 
  wrong week number), or "no" (if this function isn't supported)
  4) merge 2 tests for noround() (func_extra_noround and ignoring_noround). 
   Now it returns yes/no/"syntax only"
  5) merge 2 tests for foreign key (foreign_key and foreign_key_syntax). Now it
   returns yes/no/"syntax only"
  6) correct misprint in crash-me help ( --db-start-cmd instead of --start-cmd)
sql-bench/server-cfg.sh:
  Misprint correction (db_Sapdb ->db_sapdb)
2002-11-29 18:07:02 +05:00
unknown
7989f285aa ha_innodb.cc:
Make copies of all string-type start/up options in case C-sharp moves them around; remove the need to specify innodb_log_arch_dir in my.cnf, since it has no relevance anyway


sql/ha_innodb.cc:
  Make copies of all string-type start/up options in case C-sharp moves them around; remove the need to specify innodb_log_arch_dir in my.cnf, since it has no relevance anyway
2002-11-29 13:05:37 +02:00
unknown
e725026a57 Merge work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pem/work/mysql-4.0
2002-11-28 19:00:27 +01:00
unknown
1e68711a02 Added 29 {} at the end of clauses in sql_yacc.yy to make it work with bison 1.75.
sql/sql_yacc.yy:
  Added 29 {} at the end of clauses to make it work with bison 1.75.
  Otherwise we get errors of the type 
  "sql_yacc.yy:666.7-672.21: type clash (`NONE' `') on default action".
2002-11-28 18:57:56 +01:00
unknown
1cbef54cd6 Merge akishkin@work.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/walrus/bk/40
2002-11-28 20:03:51 +05:00
unknown
5fe76b2069 Merge constraint tests with "ignoring constarint tests"
for column,table and named constarints. Now constraint test produces
exactly one line in report, with "yes","no" or syntax only".

add /odbc to server-version if benchmark/crash-me works over odbc


sql-bench/crash-me.sh:
  merge constraint tests with "ignoring constarint tests"
  for column,table and named constarints. Now constraint test produces
  exactly one line in report, with "yes","no" or syntax only".
sql-bench/server-cfg.sh:
  add /odbc to server-version if benchmark/crash-me works over odbc
2002-11-28 20:01:17 +05:00
unknown
fac5864d88 A better way to get the ChangeSet revision for the Subject: line. 2002-11-28 12:45:01 +01:00
unknown
6a7f6fefa9 Add the ChangeSet id to Subject: in all emails.
BitKeeper/etc/ignore:
  Added autom4te-2.53.cache/output.0 autom4te-2.53.cache/requests autom4te-2.53.cache/traces.0 bdb/dist/autom4te-2.53.cache/output.0 bdb/dist/autom4te-2.53.cache/requests bdb/dist/autom4te-2.53.cache/traces.0 bkpull.log build.log innobase/autom4te-2.53.cache/output.0 innobase/autom4te-2.53.cache/requests innobase/autom4te-2.53.cache/traces.0 pull.log to the ignore list
2002-11-27 13:01:50 +01:00
unknown
b39752294b add sapdb section into server-cfg, add a lot of new function and tests into crash-me
sql-bench/crash-me.sh:
  - If double double quotes are allowed in identifiers. 
  - Rollback rolls back meta data
  - NULL sort and NULL sort perserve. 
  - remove one check of "serial".   
  - (Column,Table,Named constraints) new test to crash me if the check syntax is 
    only supported by the parser, but not done for real.
  - For all ..USER tests, (like current_user), add an extra test if
    ...USER() is supported.                                   
  - Add tests for constants TRUE and FALSE                     
  - Add test of LIMIT # OFFSET (PostgreSQL syntax) 
  - add test a lot of new functions
sql-bench/server-cfg.sh:
  add sapdb section
2002-11-27 03:45:25 +05:00
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