Commit graph

2561 commits

Author SHA1 Message Date
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
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
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
unknown
ffff4af264 Oops, didn't actually commit the script. 2001-10-18 21:50:25 -05:00
unknown
ef86dbc3c8 Merge arjen@work.mysql.com:/home/bk/mysql-4.0
into co3064164-a.rochd1.qld.optushome.com.au:c:/home/mysql-4.0


Docs/manual.texi:
  Auto merged
2001-10-19 12:46:19 +10:00
unknown
3a31f3bceb Added script to update reserved word list.
Updated reserved word list.


Docs/manual.texi:
  updated reserved word list
2001-10-18 21:46:18 -05:00
unknown
ca59a8b2bb Quick rearrange and ordering of "main features" list. 2001-10-19 12:39:11 +10:00
unknown
8f8f6edd83 Another reserved words fixup.
BitKeeper/etc/ignore:
  Added Docs/tex.fmt to the ignore list
2001-10-19 11:40:51 +10:00
unknown
6eee8c3e49 Add the export functions definition file for libmysql.dll.
When should add a function with STDCALL defined should be
add to this file, in this way the functions is exported for
the client application on Win32.
2001-10-18 23:00:15 -02:00
unknown
6c1d7ded48 Merge miguel@work.mysql.com:/home/bk/mysql-4.0
into light.local:/home/miguel/develop/mysql-4.0.0
2001-10-18 22:32:40 -02:00
unknown
0adf6a56af Avoid the redefinition warning message from winsock.h 2001-10-18 22:31:42 -02:00
unknown
0211da9897 Some minor fixups.
Updated reserved words list.
2001-10-19 09:55:19 +10:00
unknown
dd5f9b4a4f ./mysql-test-run --gdb 2001-10-18 15:45:33 +02:00
unknown
2357106c60 Heaps of little structural fixups.
Added Jorge to developers.
Added activities for Miguel.
2001-10-18 14:26:27 +10:00
unknown
b5ac2b7e75 Merge arjen@work.mysql.com:/home/bk/mysql-4.0
into co3064164-a.rochd1.qld.optushome.com.au:c:/home/mysql-4.0


Docs/manual.texi:
  Auto merged
2001-10-18 10:21:15 +10:00
unknown
4231e7712b Added reference to Software Portal in 'Contributed Programs' appendix. 2001-10-18 10:18:39 +10:00
unknown
431518d49f merge 2001-10-17 19:12:05 -05:00
unknown
0d864fd6c4 Small fixes.
Docs/Support/docbook-fixup.pl:
  Changed Appendix killing list.
Docs/manual.texi:
  Misplaced ChangeLog entry. (Thanks nickg!)
2001-10-17 18:49:39 -05:00
unknown
56bf5d7ad7 Section 'Conventions Used in This Manual' now subsection under 'About This Manual' 2001-10-18 09:09:00 +10:00
unknown
0889d8dc84 fixed sleep
bug on reconnect


sql/slave.cc:
  fixed sleep bug
2001-10-17 14:12:14 -06:00
unknown
02cbb3fa80 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
BitKeeper/etc/ignore:
  auto-union
Docs/manual.texi:
  Auto merged
2001-10-17 19:40:52 +03:00
unknown
aeaf3fcf12 Don't do signal() on windows (Causes instability problems)
Safer, a bit faster filesort.
Code changes to avoid calls to current_thd() (faster code).
Removed all compiler warnings from readline.


BitKeeper/etc/ignore:
  Add my_global.h back.
Docs/manual.texi:
  4.0.1 Changelog
include/my_sys.h:
  Added strmake_root
libmysql/libmysql.c:
  Don't do signal() on windows (Causes instability problems)
mysys/my_alloc.c:
  Added strmake_root
readline/bind.c:
  Remove warnings
readline/complete.c:
  Remove warnings
readline/display.c:
  Remove warnings
readline/funmap.c:
  Remove warnings
readline/histexpand.c:
  Remove warnings
readline/histfile.c:
  Remove warnings
readline/history.h:
  Remove warnings
readline/histsearch.c:
  Remove warnings
readline/isearch.c:
  Remove warnings
readline/kill.c:
  Remove warnings
readline/macro.c:
  Remove warnings
readline/readline.c:
  Remove warnings
readline/readline.h:
  Remove warnings
readline/rltty.c:
  Remove warnings
readline/search.c:
  Remove warnings
readline/shell.c:
  Remove warnings
readline/terminal.c:
  Remove warnings
readline/tilde.c:
  Remove warnings
readline/tilde.h:
  Remove warnings
readline/undo.c:
  Remove warnings
readline/util.c:
  Remove warnings
readline/vi_mode.c:
  Remove warnings
sql-bench/server-cfg.sh:
  Added use of truncate table
sql-bench/test-insert.sh:
  Added use of truncate table
  Changed some tests to use keys instead of 'range'
sql-bench/test-wisconsin.sh:
  Cleanup
sql/field.cc:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/field.h:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/filesort.cc:
  Safer memory allocation;  Don't allocate pointer to buffers directly, but use an IO_CACHE instead.
  This will allow us to use more memory for keys and will also work better if the number of rows that is to be sorted is much larger than expected.
sql/item.cc:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/item.h:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/item_func.h:
  Cleanup
sql/opt_range.cc:
  Use mem_root instead of sql_alloc() to get more speed
sql/sql_class.cc:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/sql_class.h:
  Added strmake()
sql/sql_handler.cc:
  Add 'thd' to send() (To avoid usage of 'current_thd')
sql/sql_lex.cc:
  Use mem_root instead of sql_alloc() to get more speed
sql/sql_select.cc:
  Add 'thd' to send() (To avoid usage of 'current_thd')
tests/fork2_test.pl:
  Fixed typos
tests/fork_big.pl:
  Fixed typos
tests/insert_and_repair.pl:
  Fixed typos
tests/rename_test.pl:
  Fixed typos
tests/test_delayed_insert.pl:
  Fixed typos
2001-10-17 19:39:39 +03:00
unknown
34645e3caf Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2001-10-17 14:53:01 +02:00
unknown
83ba8a138f typo fixed
mysql-test/r/fulltext.result:
  new test
mysql-test/t/fulltext.test:
  new test
2001-10-17 14:49:54 +02:00
unknown
8b0c95add1 manual.texi:
* Fix kernelnotes.de mirror FTP url
  * Add a mirror in Germany


Docs/manual.texi:
  * Fix kernelnotes.de mirror FTP url
  * Add a mirror in Germany
2001-10-17 14:05:11 +02:00