Commit graph

5288 commits

Author SHA1 Message Date
unknown
3de4f87503 some fixes for SELECT INTO @vars ..
sql/sql_parse.cc:
  Simplification of code
2002-10-16 16:55:08 +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
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
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
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
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
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
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
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
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
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
1b623a4032 my_sortcmp -> my_strnncoll
BitKeeper/deleted/.del-mf_casecnv.c~c269ed3dcafea441:
  Delete: mysys/mf_casecnv.c
2002-10-09 16:33:35 +05:00
unknown
edb8ae0f38 Simple charsets now have strncoll() field too 2002-10-09 15:40:57 +05:00
unknown
ac97cce461 removed 'this' pointer from initialization list of constructors 2002-10-08 23:49:59 +03:00
unknown
09a5e75c60 Merge tfr@work.mysql.com:/home/bk/mysql-4.0
into beta.frontier86.ee:/stuff/bk/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-10-08 21:14:46 +03:00
unknown
4af0a5cea2 manual.texi:
Contrib overhaul


Docs/manual.texi:
  Contrib overhaul
2002-10-08 21:11:47 +03:00
unknown
a7430f38b3 --tmpdir=dir1:dir2:... support in myisamchk 2002-10-08 14:34:04 +00:00
unknown
4dcdf3f318 Merge mysql.com:/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-automake
2002-10-08 16:22:35 +02:00
unknown
13da94b7a2 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
2002-10-08 14:17:38 +00:00
unknown
81a82f0d6e support for --tmpdir=dir1:dir2:... 2002-10-08 12:39:37 +00:00
unknown
58dc03066c removed compiler warnings 2002-10-08 15:34:39 +03:00
unknown
efacfcade0 additions for compiling for Win via samba
Docs/bk.txt:
  instructions for compiling for Win via samba
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  add some options
VC++Files/mysys/mysys.dsp:
  add some options
2002-10-08 16:55:39 +05:00
unknown
e8e3f7728f fixed couple of bugs in field/reference name resolution
fixed error handling in subselect fix_field


mysql-test/r/subselect.result:
  test of name resolution
mysql-test/t/subselect.test:
  test of name resolution
sql/item.cc:
  fixed couple of bugs in field/reference name resolution.
sql/item_subselect.cc:
  fixed error handling
sql/mysql_priv.h:
  fixed couple of bugs in field/reference name resolution.
sql/sql_base.cc:
  fixed couple of bugs in field/reference name resolution.
sql/sql_select.cc:
  new find_item_in_list interface
2002-10-08 14:50:12 +03:00
unknown
956c993f64 test case for auto_increment for HEAP 2002-10-08 15:54:51 +05:00
unknown
8ff88bb940 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/work-4.0


Docs/manual.texi:
  Auto merged
2002-10-08 09:46:00 +03:00
unknown
d45eb60f1d changelog entry for query cache with system database bug. 2002-10-08 09:44:35 +03:00
unknown
e263e73790 Fixup. 2002-10-08 15:13:49 +10:00
unknown
e1390e2331 Fixup. 2002-10-08 15:13:36 +10:00
unknown
92d037bae5 Update reserved words (from 4.1) 2002-10-08 13:06:51 +10:00
unknown
f422878665 Update reserved words list (4.1) 2002-10-08 13:04:39 +10:00
unknown
76ab191d75 Sync wth 3.23 changelog. 2002-10-08 12:55:54 +10:00
unknown
ef6b6baac4 Sync with 3.23 changelog. 2002-10-08 12:55:10 +10:00