Commit graph

5536 commits

Author SHA1 Message Date
unknown
addf79832a Merge lgrimmer@work.mysql.com:/home/bk/mysql
into mysql.com:/space/my/mysql-3.23
2002-12-02 17:28:22 +01:00
unknown
007b739f3f Proper fix for SHOW VARS on 64-bit systems 2002-12-02 15:33:16 +02:00
unknown
0df9ecc32b moving fix elsewhere ...
sql/sql_show.cc:
  moving a fix to 4.1.
2002-12-02 15:12:56 +02:00
unknown
b79b6c357d Merge work:/my/mysql-3.23 into hundin.mysql.fi:/my/mysql-3.23
mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
2002-12-02 14:17:04 +02:00
unknown
e462abe648 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-02 14:17:03 +02:00
unknown
3e5d156223 Fix for sum_func IN (..) 2002-12-02 14:16:02 +02:00
unknown
e3cecfd10c Fixed bug in MAX() optimization when used with JOIN and ON expressions
(Patch from 4.0.5)


mysql-test/r/group_by.result:
  Updated results
mysql-test/t/group_by.test:
  Test for bug
sql/item_cmpfunc.cc:
  Fixed bug in MAX() optimization when used with JOIN and ON expressions
sql/item_cmpfunc.h:
  Fixed bug in MAX() optimization when used with JOIN and ON expressions
sql/opt_sum.cc:
  Fixed bug in MAX() optimization when used with JOIN and ON expressions
2002-12-02 13:41:08 +02:00
unknown
5290ebfb60 Merge lgrimmer@work.mysql.com:/home/bk/mysql
into mysql.com:/space/my/mysql-3.23
2002-12-02 11:10:18 +01:00
unknown
a3f9f721bc Fixed bug in <=> NULL handling 2002-12-02 10:47:15 +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
bdf04da85f Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-11-30 23:03:08 +02:00
unknown
255ace8bfd Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-11-30 22:55:43 +02:00
unknown
50e61c5175 a fix for a bug with HAVING sum_func IN (...) 2002-11-30 18:38:44 +02:00
unknown
2f4a98912e - removed unused variable $defaults
- parse mysql.server section in my.cnf as well
2002-11-29 17:36:36 +01: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
931437252f Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
sql/mysqld.cc:
  Auto merged
2002-11-28 19:38:22 +01:00
unknown
522d022e1d chroot() need chdir("/") afterwards to work 2002-11-28 19:38:01 +01: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
7dc2b70f49 Better fix for 64 bit CPU .. 2002-11-28 16:37:58 +02:00
unknown
fa56d0bf29 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-11-28 16:27:42 +02:00
unknown
fac5864d88 A better way to get the ChangeSet revision for the Subject: line. 2002-11-28 12:45:01 +01:00
unknown
4536b06923 - Moved the init script from /etc/rc.d/init.d to /etc/init.d for better
compatibility of the RPMs
 - added "restart" action to the mysql.server init script


support-files/mysql.server.sh:
   - added "restart" action
support-files/mysql.spec.sh:
   - moved init script from /etc/rc.d/init.d to /etc/init.d (the majority of 
     Linux distributions now support this scheme as proposed by the LSB either
     directly or via a compatibility symlink)
   - relaxed the Perl requirements a bit
   - Use new "restart" init script action instead of starting and stopping
     separately
   - Be more flexible in activating the automatic bootup - use insserv (on
     older SuSE versions) or chkconfig (Red Hat, newer SuSE versions and
     others) to create the respective symlinks
2002-11-27 22:57:17 +01:00
unknown
bbb0f77884 fix for SHOW VARS for IA64 and other 64 bit systems 2002-11-27 18:05:41 +02:00
unknown
09a6218976 Fix for shutdown on several instances servers started as standalone 2002-11-27 10:05:49 -04: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
562fc5dfcc - fixed tabbing 2002-11-25 13:30:56 +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
e0baab2eb0 mysql.server.sh:
- reverted some incompatible/non-portable modifications


support-files/mysql.server.sh:
   - reverted non-portable change ("echo -n" does not work on all platforms)
   - reverted incompatible change (better fix the docs than break existing
     installations)
2002-11-25 13:14:38 +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
f7eca60478 FreeBSD patch by Jeremy Zawodny.
His explanation:

 The socket on which MySQL listens for new connections on a blocking
  socket most of the time but is set to non-blocking during the
  accept() of the new connection.  Due to a bug in the kernel, the new
  socket returned by accept() is a blocking socket but returns the
  O_NONBLOCK flag when queried via fcntl(F_GETFL).  That is, the file
  descriptor and the underlying socket don't agree on the blocking
  mode.

  Since MySQL determines via fcntl(F_GETFL) that the socket is
  non-blocking, it expects the first read() in my_real_read to not
  block, so it doesn't enable the timeout alarm.  However, the read
  does block, and thus there's no timeout alarm.  The thread kill
  (which relies on rescheduling the timeout alarm) also does not work
  as a consequence.

The bug shows itself if you build MySQL with LinuxThreads support
(needed for SMP on FreeBSD).  Issuing a KILL command in MySQL won't be
"noticed" by the "killed" thread until it runs another query--that
makes KILL pretty useless.  And the wait_timeout doesn't work either.


vio/vio.c:
  FreeBSD patch by Jeremy Zawodny
2002-11-23 18:41:26 +02: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