Commit graph

5390 commits

Author SHA1 Message Date
unknown
fab06ac587 Fix error handling in last patch (BLOB's in temporary tables) if
create_tmp_table fails.
2002-10-15 01:52:41 +03:00
unknown
5dcaaf4e04 removed annecessary assignment found by Monty 2002-10-14 22:41:42 +03:00
unknown
af3789c151 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-distinct-4.1
2002-10-14 21:50:01 +03:00
unknown
e3cb8abd37 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-10-14 19:33:37 +03:00
unknown
060626bee9 fix 4.1 build 2002-10-14 17:55:21 +03:00
unknown
a08b786b09 Merge
VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
heap/_check.c:
  Merge: Fixed DBUG_PRINT() usage
2002-10-14 17:50:44 +03:00
unknown
4ae92cf96b Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-distinct-4.1
2002-10-14 17:50:44 +03:00
unknown
9e6b04a285 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_lex.h:
  Auto merged
2002-10-14 17:50:44 +03:00
unknown
393e96afdc Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-10-14 14:50:43 +00:00
unknown
afea355bc6 DEBUG_PRINT() has been fixed 2002-10-14 19:50:42 +05:00
unknown
e11dfa3763 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Docs/manual.texi:
  Auto merged
2002-10-14 17:13:45 +03:00
unknown
a86c172f58 Fixed a bug in key optimizing handling where the expression
WHERE column_name = key_column_name was calculated as true
for NULL values.


Docs/manual.texi:
  Changelog
mysql-test/r/distinct.result:
  Updated results caused by bug fix.
mysql-test/r/null_key.result:
  New tests
mysql-test/t/null_key.test:
  New tests
sql/sql_select.cc:
  Additional change for previous changeset for using BLOB in GROUP BY
2002-10-14 17:04:12 +03:00
unknown
57ec26c1e4 bad merge fixed 2002-10-14 11:55:28 +00:00
unknown
65c4fdc007 merged
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
2002-10-14 11:36:48 +00:00
unknown
8290f609a7 fixed cteate temporary field of subselect bug
mysql-test/r/subselect.result:
  test of cteate temporary field of subselect bug
mysql-test/t/subselect.test:
  test of cteate temporary field of subselect bug
2002-10-14 14:33:42 +03:00
unknown
db85094bc5 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-10-14 10:44:17 +00:00
unknown
6fc7e94616 merge
client/mysql.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_union.cc:
  Auto merged
2002-10-14 12:07:16 +03:00
unknown
61632073ac Allocate HEAP blocks in smaller blocks to get better memory utilization and more speed when used with safemalloc.
Don't initalize memory areas when run with --skip-safemalloc.


Docs/manual.texi:
  ChangeLog
heap/heapdef.h:
  Allocate HEAP blocks in smaller blocks to get better memory utilization and more speed when used with safemalloc.
heap/hp_open.c:
  Allocate HEAP blocks in smaller blocks to get better memory utilization and more speed when used with safemalloc.
mysys/safemalloc.c:
  Don't initalize memory areas when run with --skip-safemalloc.
  This can in some cases increase speed with 20 times when debugging
2002-10-13 23:42:37 +03:00
unknown
0d7fd11d10 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-automake
2002-10-13 16:58:20 +02:00
unknown
4a498d6891 - replaced Docs/LICENSE with Docs/MySQLEULA.txt
- Updated scripts/make_binary_distribution and scripts/mysql-copyright*
   accordingly


BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
  Delete: Docs/LICENSE
BitKeeper/deleted/.del-MySQLEULA.doc~e7fa298916345cf3:
  Delete: Docs/MySQLEULA.doc
Build-tools/mysql-copyright-2:
   - replaced LICENSE with MySQLEULA.txt
Build-tools/mysql-copyright:
   - replaced LICENSE with MySQLEULA.txt
scripts/make_binary_distribution.sh:
   - replaced LICENSE with MySQLEULA.txt
2002-10-13 16:57:33 +02:00
unknown
4442b7faeb - fixed formatting in MySQLEULA.txt
Docs/MySQLEULA.txt:
   - replaced tabs with spaces
2002-10-13 16:53:19 +02:00
unknown
e484a91efe - Tagged ChangeSet 1.1224 as "mysql-3.23.53"
- bumped up version number to 3.23.54 in configure.in
 - replaced Docs/LICENSE with Docs/MySQLEULA.txt and modified
   scripts/make_binary_distribution.sh and Build-tools/mysql-copyright*
   accordingly.


BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
  Delete: Docs/LICENSE
Build-tools/mysql-copyright-2:
   - replaced LICENSE with MySQLEULA.txt
Build-tools/mysql-copyright:
   - use "tar" instead of "gtar"
   - replaced LICENSE with MySQLEULA.txt
configure.in:
   - Bumped up version number to 3.23.54 now that 3.23.53 has been
     tagged
scripts/make_binary_distribution.sh:
   - replaced LICENSE with MySQLEULA.txt
2002-10-13 16:26:28 +02:00
unknown
a299a27021 fixed bug of multi-level EXPLAIN
mysql-test/r/subselect.result:
  test of multi-level EXPLAIN
mysql-test/t/subselect.test:
  test of multi-level EXPLAIN
2002-10-13 14:25:16 +03:00
unknown
78aa5f7730 Builder C++ Embedded Server Sample 2002-10-13 03:08:44 -02:00
unknown
228bfb05e3 Two bug fixes
Docs/manual.texi:
  added text for fixes
mysql-test/r/multi_update.result:
  new test case for multi-table deletes
mysql-test/t/multi_update.test:
  new test case for multi-table deletes
sql/sql_delete.cc:
  fix for multi-table deletes
sql/sql_update.cc:
  fix for multi-table updates
2002-10-12 21:36:39 +03:00
unknown
2b70d7e567 --tmpdir=dir1:dir2... uses (is_windows ? ";" : ":") as a delimiter 2002-10-12 17:43:40 +00:00
unknown
c05fc7c9bd Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


include/my_sys.h:
  Auto merged
mysys/Makefile.am:
  Auto merged
2002-10-12 17:40:57 +00:00
unknown
70a1cebb88 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-10-12 15:52:51 +03:00
unknown
8926c0bc38 Fixed bug where we could reference a freed tmp_table->table_name variable for some
GROUP BY ... ORDER BY queries.


Docs/manual.texi:
  ChangeLog
2002-10-12 12:38:48 +03:00
unknown
9bca9fb751 Task 430: Allowing braces in joins by simply removing them.
This is a simple fix, allowing a join_table_list in the right reduction of a
normal_join sequence, instead of just a join_table. This makes things like
"t1, (t2 left join t3)" work, but it also allows "join" and "cross join" instead
of ",".

This should fix the bug reported as:
  Subject: ODBC SQL syntax issue 
  From: Ivan Vazharov 
  Date: Mon, 30 Sep 2002 12:02:42 +0200 


mysql-test/r/select.result:
  Results from new test cases for removing braces in joins.
mysql-test/t/select.test:
  New test cases for removing braces in joins.
sql/sql_yacc.yy:
  Allow (and remove) braces in all parts of a normal_join list, not just the
  first one.
  Also added three missing ';'.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-10-12 11:07:54 +02:00
unknown
102cec1465 fixed subselect * bug
mysql-test/r/subselect.result:
  test of subselect * bug
mysql-test/t/subselect.test:
  test of subselect * bug
2002-10-12 01:09:47 +03:00
unknown
c41f19c2d5 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_class.cc:
  Auto merged
2002-10-11 21:50:38 +03:00
unknown
e6403485ed SCRUM task
mysql-test/r/select.result:
  SELECT ... INTO user_variables
mysql-test/t/select.test:
  SELECT ... INTO user_variables
sql/sql_class.cc:
  SELECT ... INTO user_variables
sql/sql_class.h:
  SELECT ... INTO user_variables
sql/sql_lex.h:
  SELECT ... INTO user_variables
sql/sql_parse.cc:
  SELECT ... INTO user_variables
sql/sql_yacc.yy:
  SELECT ... INTO user_variables
2002-10-11 21:49:10 +03:00
unknown
261c22a87a fixed bug in subselect value storing
mysql-test/r/subselect.result:
  test for bug in subselect value storing
mysql-test/t/subselect.test:
  test for bug in subselect value storing
2002-10-11 17:00:11 +03:00
unknown
23cce6c266 os0thread.c:
Fix compilation error on HP-UX-11: pthread_t is a scalar there, not a struct like in HP-UX-10.20


innobase/os/os0thread.c:
  Fix compilation error on HP-UX-11: pthread_t is a scalar there, not a struct like in HP-UX-10.20
2002-10-11 15:44:45 +03:00
unknown
ac471d1daf libraries should be always prepended to $LIBS, never appended 2002-10-10 15:14:47 +00:00
unknown
16f5d95308 Don't use sort_order directly 2002-10-10 17:32:24 +05:00
unknown
08f44a4365 Don't use sort_order directly 2002-10-10 17:14:56 +05:00
unknown
72174d5b82 Move hash_sort and hash_caseup into CHARSET_INFO for all charsets 2002-10-10 16:52:22 +05:00
unknown
b9bb3534f1 Some reorganization to use less memory as well as to hide some implementation
aspects into *.c files from *.h files. Some steps to get closer to generating
*.c files from *.conf files again.
2002-10-10 15:52:32 +05:00
unknown
3d21a8cf0b - added missing changelog entry to manual.texi
Docs/manual.texi:
   - added missing changelog entry
   - fixed typo
2002-10-09 22:16:40 +02:00
unknown
782dccfbfe - removed some redundant version numbers for certain GNU tools required
from manual texi


Docs/manual.texi:
   - removed version numbers of GNU tools from the feature list
     (they are going to change from time to time again and the current
     required version number should probably be kept in one chapter only)
2002-10-09 21:18:19 +02:00
unknown
7bfbfc822e Merge
Docs/manual.texi:
  SCCS merged
2002-10-09 21:03:59 +02:00
unknown
8e60363821 changelog updated 2002-10-09 19:03:58 +00:00
unknown
d5a1a03774 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-10-09 19:01:24 +00:00
unknown
61c50cf761 fixed repair_by_sort FULLTEXT bug 2002-10-09 18:57:13 +00:00
unknown
f984ad0fbb - minor fixes and documentation for the update to automake 1.5
- currently, "make distcheck" fails - this needs to be investigated
   before the next release


Docs/manual.texi:
   - Updated toolchain version numbers
config.guess:
   - removed explicit setting of VENDOR=suse on SuSE systems
2002-10-09 20:54:47 +02:00
unknown
c05fc9fa31 ha_innobase.cc:
Fix bug: if skip-innodb was defined SHOW INNODB STATUS crashed


sql/ha_innobase.cc:
  Fix bug: if skip-innodb was defined SHOW INNODB STATUS crashed
2002-10-09 19:52:34 +03:00
unknown
d9383c5aaf Merge mysql.com:/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-automake
2002-10-09 15:02:50 +02:00
unknown
9909173b4a - Fixed typo in 3.23.53 changelog entry in manual.texi
Docs/manual.texi:
   - fixed typo in changelog entry (thanks to Jocelyn Fournier for spotting
     this)
2002-10-09 13:50:48 +02:00