Commit graph

5515 commits

Author SHA1 Message Date
unknown
ada3e32545 some code cleanup
sql/sql_table.cc:
  code cleanup
2002-12-04 21:39:15 +02:00
unknown
28b2280321 Remove useless field conversation 2002-12-05 00:13:45 +05:00
unknown
c151ea1f12 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-04 20:52:42 +02:00
unknown
76c982ea92 A fix for double free'd pointer bug ...
BitKeeper/etc/ignore:
  Added innobase/stamp-h1 stamp-h1 to the ignore list
2002-12-04 20:51:18 +02:00
unknown
ad6e080401 - portability patch to work around bugs in the HP compiler's "inline"
handling (backport from 4.0 tree)
2002-12-04 19:16:45 +01:00
unknown
3a5a0211e8 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-12-04 17:38:12 +01:00
unknown
8cf927658d new client error added: CR_MALFORMED_PACKET 2002-12-04 17:37:51 +01:00
unknown
7280bddb71 Merge with 3.23
(Fixed problem with autoconf 2.53 on Solaris)


BUILD/compile-solaris-sparc-purify:
  Merge with 3.23
BUILD/compile-solaris-sparc:
  Merge with 3.23
acinclude.m4:
  Merge with 3.23
2002-12-04 17:40:37 +02:00
unknown
fc79a01402 Merge mysql.com:/space/my/mysql-3.23
into mysql.com:/space/my/mysql-3.23-build
2002-12-04 16:16:38 +01:00
unknown
e955255cf6 - Portability fixes for HP compiler on HPUX11 (backport from 4.0 tree)
- sql_analyse.cc: Fixed bug in decimal handling


configure.in:
   - Portability fix for HP compiler on HPUX11
libmysql/password.c:
   - Portability fix for HP compiler on HPUX11
mysys/hash.c:
   - Portability fix for HP compiler on HPUX11
mysys/my_static.c:
   - Portability fix for HP compiler on HPUX11
mysys/my_static.h:
   - Portability fix for HP compiler on HPUX11
mysys/my_tempnam.c:
   - Portability fix for HP compiler on HPUX11
sql/sql_analyse.cc:
   - Fixed bug in decimal handling
2002-12-04 16:16:06 +01:00
unknown
9d38065903 Merge lgrimmer@work.mysql.com:/home/bk/mysql
into mysql.com:/space/my/mysql-3.23
2002-12-04 16:09:41 +01:00
unknown
6456d593c7 Fixed 'stack direction' check in autoconf
Workaround for problem with autconf 2.53 on Solaris
(Fixes problem with SOCKET_SIZE_TYPE)


BUILD/compile-solaris-sparc:
  Removed non standard compiler options
BUILD/compile-solaris-sparc-purify:
  Removed non standard compiler options
acinclude.m4:
  Fixed 'stack direction' check.
  Workaround for problem with autconf 2.53 on Solaris
  (Fixes problem with SOCKET_SIZE_TYPE)
2002-12-04 16:52:46 +02:00
unknown
91e1b1b11d Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-04 16:13:32 +02:00
unknown
c76bce104a Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-12-04 15:28:16 +02:00
unknown
93bed6061b A fix for the bug in a SELECT with joined tables with ORDER BY and
LIMIT clause when filesort had to be used.

In that case LIMIT was applied to filesort of one of the tables, 
although it could not be.

This fix solved problems with LEFT JOIN too...
2002-12-04 15:27:08 +02:00
unknown
b1582a0bd2 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-12-04 10:48:21 +01:00
unknown
2d2e834ce1 post-merge fix
myisam/mi_rnext_same.c:
  cleanup
2002-12-04 10:47:51 +01:00
unknown
4fb76fc70a Merge lgrimmer@work.mysql.com:/home/bk/mysql
into mysql.com:/space/my/mysql-3.23
2002-12-04 10:41:35 +01:00
unknown
5a0f1c749e merged
libmysql/libmysql.c:
  Auto merged
sql/opt_sum.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
2002-12-04 10:16:19 +01:00
unknown
faefac308f proper casting in COM_TABLE_DUMP (backported from 4.0) 2002-12-04 09:54:58 +01:00
unknown
451aff64e8 Merge lgrimmer@work.mysql.com:/home/bk/mysql
into mysql.com:/space/my/mysql-3.23
2002-12-04 08:44:42 +01:00
unknown
a31d258ba7 protect from [heap] buffer overrrun by malicious server 2002-12-04 01:26:32 +01:00
unknown
e753fa4d8d Security bug: password length check should be in check_user, not check_connections(),
otherwise COM_CHANGE_USER is unprotected and can be used for both privilege escalation and buffer overrun
2002-12-04 00:27:09 +01:00
unknown
1fd17cce36 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-12-03 22:06:48 +02:00
unknown
9b515ad043 row0sel.c:
Fix a hang introduced in 4.0.5 in INSERT INTO ... SELECT ... when binlogging is not on


innobase/row/row0sel.c:
  Fix a hang introduced in 4.0.5 in INSERT INTO ... SELECT ... when binlogging is not on
2002-12-03 18:16:48 +02:00
unknown
2d4e07f233 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-12-03 14:53:11 +02:00
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
a0efe927ec Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-12-02 21:22:56 +02:00
unknown
89c564cdfe Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-12-02 20:24:38 +02:00
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