Commit graph

2583 commits

Author SHA1 Message Date
unknown
381007fa6a Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


sql/sql_yacc.yy:
  Auto merged
2001-10-25 14:50:50 +03:00
unknown
1c90833606 New alternate UNION syntax and bug fix for multi-table deletes
mysql-test/r/union.result:
  New results for optional UNION syntax
mysql-test/t/union.test:
  New  test for alternate syntax for UNION
sql/sql_delete.cc:
  Fixed bug in multi-table delete's with transactional tables
sql/sql_parse.cc:
  A small change to enable new UNION syntax
sql/sql_union.cc:
  New alternate UNION syntax
sql/sql_yacc.yy:
  New alternate UNION syntax
2001-10-25 14:41:49 +03:00
unknown
73c7c2adba Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


libmysql/libmysql.c:
  Auto merged
2001-10-25 13:09:04 +02:00
unknown
d1eeab3fb9 Merge
libmysql/libmysql.c:
  SCCS merged
2001-10-25 13:05:26 +02:00
unknown
53a6a37313 manual.texi:
* Update WideXS mirror URLs


Docs/manual.texi:
  * Update WideXS mirror URLs
2001-10-25 10:49:51 +02:00
unknown
59645d1d15 General and Windows fixups. 2001-10-25 15:36:50 +10:00
unknown
02e9f4be25 Rewrite of Windows binary/source installation/configuration. 2001-10-25 15:08:47 +10:00
unknown
366106a09c Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-10-24 17:20:27 -06:00
unknown
e889c5260a O'Reilly fixups. 2001-10-25 09:00:35 +10:00
unknown
7fd9574117 bug in libmysql.c:mysql_reconnect() fixed
libmysql/libmysql.c:
  bug fixed (if mysql_real_connect() failed there were two pointers to malloc'ed strings, with memory corruption on free(), of course)
2001-10-24 21:38:48 +02:00
unknown
bed2496584 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2001-10-24 20:17:46 +02:00
unknown
1b61fdc42d Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-10-24 11:53:06 -06:00
unknown
3bd0819a91 merge of lost change
mysql-test/r/keywords.result:
  merged lost change back
2001-10-24 11:52:19 -06:00
unknown
b4ed4460d3 manual.texi:
* Change mirror URL


Docs/manual.texi:
  * Change mirror URL
2001-10-24 19:03:21 +02:00
unknown
8f5e9a1e89 Merge serg.mysql.com:/usr/home/serg/Abk/mysql
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/sql_table.cc:
  Auto merged
2001-10-24 14:59:50 +02:00
unknown
d320ee1a94 bug (introduced yesterday) fixed 2001-10-24 14:54:04 +02:00
unknown
a7e5f2f439 Various fixups. 2001-10-24 15:46:05 +10:00
unknown
1a01a507c1 Swapped InnoDB and BDB in manual (InnoDB now mentioned first). 2001-10-24 14:41:35 +10:00
unknown
6d965ed7ed Numerous fixups.
Updated "Contact Information".
2001-10-24 14:10:40 +10:00
unknown
8e7464fe48 Updated Dutch error messages. 2001-10-24 10:49:36 +10:00
unknown
aba008d6b3 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
2001-10-23 13:28:47 -06:00
unknown
8fc78e08b0 cleanup
removal of duplicate code in mf_iocache.cc 
work on failsafe replication
work on SEQ_READ_APPEND io cache


include/my_sys.h:
  updates for SEQ_READ_APPEND
libmysql/Makefile.am:
  fix for mysys/mf_iocache.c
libmysql/libmysql.c:
  updates for new format of SHOW SLAVE HOSTS
mysql-test/r/rpl000001.result:
  test replication of LOAD DATA LOCAL INFILE
mysql-test/r/rpl000002.result:
  updated test result
mysql-test/t/rpl000001.test:
  test LOAD DATA LOCAL INFILE
mysys/mf_iocache.c:
  cleanup to remove duplicate functionality
  some work on SEQ_READ_APPEND
sql/mf_iocache.cc:
  cleanup to remove duplicate functionality
sql/repl_failsafe.cc:
  more work on failsafe replication
sql/repl_failsafe.h:
  more work on failsafe replication
sql/slave.cc:
  cleanup
  more work on failsafe replication
sql/sql_load.cc:
  fixed bug on replicating empty file loads
  got LOAD DATA LOCAL INFILE to work again, and to be replicated
sql/sql_repl.cc:
  cleanup
  more work on failsafe replication
sql/sql_repl.h:
  more work on failsafe replication
2001-10-23 13:28:03 -06:00
unknown
4bbbfc01d5 errmsg.txt:
* Updated a lot


sql/share/estonian/errmsg.txt:
  * Updated a lot
2001-10-23 17:34:51 +02:00
unknown
4c0532108b merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/russian/errmsg.txt:
  merged (partially translated)
2001-10-23 11:20:01 +02:00
unknown
2f7bbeaaad Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2001-10-23 10:56:08 +02:00
unknown
adb261ec4d Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
sql/ha_innobase.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
2001-10-23 10:54:12 +02:00
unknown
11572916ff HA_NO_FULLTEXT_KEY and an appropriate error message
include/mysqld_error.h:
  New error message added
libmysql/violite.c:
  FreeBSD fix
sql/ha_berkeley.h:
  HA_NO_FULLTEXT_KEY
sql/ha_heap.h:
  HA_NO_FULLTEXT_KEY
sql/ha_innobase.h:
  HA_NO_FULLTEXT_KEY
sql/ha_isam.h:
  HA_NO_FULLTEXT_KEY
sql/ha_isammrg.h:
  HA_NO_FULLTEXT_KEY
sql/ha_myisammrg.h:
  HA_NO_FULLTEXT_KEY
sql/share/czech/errmsg.txt:
  New error message added
sql/share/danish/errmsg.txt:
  New error message added
sql/share/dutch/errmsg.txt:
  New error message added
sql/share/english/errmsg.txt:
  New error message added
sql/share/estonian/errmsg.txt:
  New error message added
sql/share/french/errmsg.txt:
  New error message added
sql/share/german/errmsg.txt:
  New error message added
sql/share/greek/errmsg.txt:
  New error message added
sql/share/hungarian/errmsg.txt:
  New error message added
sql/share/italian/errmsg.txt:
  New error message added
sql/share/japanese/errmsg.txt:
  New error message added
sql/share/korean/errmsg.txt:
  New error message added
sql/share/norwegian-ny/errmsg.txt:
  New error message added
sql/share/norwegian/errmsg.txt:
  New error message added
sql/share/polish/errmsg.txt:
  New error message added
sql/share/portuguese/errmsg.txt:
  New error message added
sql/share/romanian/errmsg.txt:
  New error message added
sql/share/russian/errmsg.txt:
  New error message added
sql/share/slovak/errmsg.txt:
  New error message added
sql/share/spanish/errmsg.txt:
  New error message added
sql/share/swedish/errmsg.txt:
  New error message added
sql/share/ukrainian/errmsg.txt:
  New error message added
sql/sql_table.cc:
  FULLTEXT checks fixed
sql/violite.c:
  FreeBSD fix
2001-10-23 10:52:51 +02:00
unknown
74867ff0bf Merging old/new info in chapter 1. 2001-10-23 15:59:19 +10:00
unknown
74f49f9f34 Remove unused lines in mysiam/Makefile.am that confused automake.
myisam/Makefile.am:
  Comment out unused _DEPENDENCIES
2001-10-22 18:30:53 -04:00
unknown
47d42a13f6 Fix the NOHUP_NICENESS test in mysqld_safe.
scripts/mysqld_safe.sh:
  Fix the NOHUP_NICENESS test; previously it would break if the
  process already had a negative priority.
2001-10-22 11:22:55 -04:00
unknown
d0ea7a53c9 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/item_func.h:
  Auto merged
2001-10-22 11:57:48 +02:00
unknown
9433c5387e I have to commit to be able to pull
include/ft_global.h:
  I have to checkin to be able to pull
myisam/ft_boolean_search.c:
  I have to checkin to be able to pull
myisam/ft_nlq_search.c:
  I have to checkin to be able to pull
myisam/ftdefs.h:
  I have to checkin to be able to pull
sql/item_func.cc:
  I have to checkin to be able to pull
sql/item_func.h:
  I have to checkin to be able to pull
2001-10-22 11:52:17 +02:00
unknown
8a015dc327 Typo fixes.
Shuffling sections.
2001-10-22 16:33:01 +10:00
unknown
2f0c4c7318 Little fixups. 2001-10-22 12:14:11 +10:00
unknown
fe2be67362 Adding Win32 IDE Stuff
-WorkSpace and Project Files for VC++6.0
-InstallShield Files for setup program.
2001-10-21 23:11:13 -02:00
unknown
b09eb95869 two bugs in ft_update
myisam/ft_update.c:
  two bugfixes
mysql-test/r/fulltext.result:
  new tests
mysql-test/t/fulltext.test:
  new tests
2001-10-20 16:37:26 +02:00
unknown
440de598ee Update test results after merge
mysql-test/r/join_outer.result:
  Update test results
mysql-test/r/null.result:
  Update test results
2001-10-20 11:56:49 +03:00
unknown
0625a0dab8 Fix after merge 2001-10-20 11:27:03 +03:00
unknown
460a348116 merge
Docs/manual.texi:
  Auto merged
2001-10-20 11:27:02 +03:00
unknown
c31859900e merge
Docs/manual.texi:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/slave.cc:
  keep local copy
2001-10-20 10:27:01 +02:00
unknown
fef5292a47 Fix bugs in LEFT JOIN and field=NUL
BUILD/FINISH.sh:
  Remove all config.cache files
BUILD/compile-alpha-debug:
  Update
BUILD/compile-ia64-debug-max:
  Update
Docs/manual.texi:
  Added auto_increment example
sql/sql_select.cc:
  Fix bugs in LEFT JOIN and field=NULL
sql/sql_yacc.yy:
  Remove compiler warnings
2001-10-20 11:04:23 +03:00
unknown
fdfcea5801 Fixes to tables per Andy Oram.
Sigh, should be all the remaining errors!
2001-10-20 01:29:09 -05:00
unknown
87e036a233 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-10-19 22:11:19 +03:00
unknown
253b9ecb11 Don't use signal() on windows.
Added missing InnoDB variables to SHOW VARIABLES.
Fixed bug when doing WHERE 'column_name=NULL' on an indexed column that had NULL values.
Fixed bug when doing 'LEFT JOIN ...  ON (column_name = constant) WHERE column_name = constant'


Docs/manual.texi:
  Changelog
libmysql/libmysql.c:
  Don't use signal() on windows.
mysql-test/r/join_outer.result:
  Test for bugfix
mysql-test/r/null.result:
  Test for bugfix
mysql-test/t/join_outer.test:
  Test for bugfix
mysql-test/t/null.test:
  Test for bugfix
sql/mysqld.cc:
  Add missing InnoDB variables to SHOW VARIABLES.
sql/sql_select.cc:
  Fixed bug when doing WHERE 'column_name=NULL' on an indexed column that had NULL values.
  Fixed bug when doing 'LEFT JOIN ...  ON (column_name = constant) WHERE column_name = constant'
2001-10-19 22:10:54 +03:00
unknown
f9b331ff8a Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


BitKeeper/etc/ignore:
  auto-union
2001-10-19 17:46:51 +03:00
unknown
7b440a7326 Unchecked changes, so that I could run mysql-test.
If I ruined anything, write your complaints to sasha@mysql.com


sql/sql_delete.cc:
  Unchecked changes, so that I could run mysql-test
sql/sql_lex.h:
  Unchecked changes, so that I could run mysql-test
sql/sql_parse.cc:
  Unchecked changes, so that I could run mysql-test
sql/sql_union.cc:
  Unchecked changes, so that I could run mysql-test
sql/sql_yacc.yy:
  Unchecked changes, so that I could run mysql-test
BitKeeper/etc/ignore:
  Added libmysqld/examples/link_sources to the ignore list
2001-10-19 17:43:30 +03:00
unknown
61b7f807ad Fast fix to support one more possible directory of OpenSSL include files. 2001-10-19 13:09:54 +02:00
unknown
25e6899bfe Minor fixes. 2001-10-19 14:42:32 +10:00
unknown
f6dc0b77a9 Typo fix. 2001-10-19 13:02:27 +10:00
unknown
3c92d80413 Merge arjen@work.mysql.com:/home/bk/mysql-4.0
into co3064164-a.rochd1.qld.optushome.com.au:c:/home/mysql-4.0
2001-10-19 12:55:29 +10:00