Commit graph

5612 commits

Author SHA1 Message Date
unknown
da023c7b0a Merge genie.(none):/home/vva/work/mysql.orig/compileable/4.1
into genie.(none):/home/vva/work/new_readline/4.1
2002-11-20 18:23:09 +04:00
unknown
666dd7ba7f discard warnings in readline 4.3 2002-11-20 13:30:48 +04:00
unknown
ecc59f6adc Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-19 19:45:03 +02:00
unknown
e96234aa6b fixed another small bug with LIMIT ) 2002-11-19 19:43:45 +02:00
unknown
888424a13a Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/mysql-4.1.bdb
2002-11-19 20:00:02 +04:00
unknown
f6da2b2460 added 'USING BTREE' for 'show create table' for HEAP 2002-11-19 19:58:46 +04:00
unknown
a629adc6f9 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-19 17:21:47 +02:00
unknown
9705257270 Makng sure that LIMIT 0 works in this case to:
select sql_calc_found_rows * from table limit 0;
It does ...
2002-11-19 17:20:57 +02:00
unknown
cffec6dccc Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/mysql-4.1.bdb
2002-11-19 18:49:45 +04:00
unknown
951669f048 fix for byte ordering bug in HEAP rb-tree 2002-11-19 18:48:22 +04:00
unknown
953f6c51fe upgrade readline to version 4.3
client/completion_hash.cc:
  correct headers of functions for readline 4.3 (add const modifier to char*)
client/completion_hash.h:
  correct headers of functions for readline 4.3 (add const modifier to char*)
client/mysql.cc:
  correct functions for readline 4.3
2002-11-19 18:26:53 +04:00
unknown
2f639e57a4 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/mysql-4.1.monty1
2002-11-19 16:03:59 +04:00
unknown
56b6433e66 fix for BDB 2002-11-19 16:02:19 +04:00
unknown
10de2720aa Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-18 23:14:58 +02:00
unknown
fb23575c7a small revert
sql/sql_base.cc:
  one more change reverted
2002-11-18 23:11:45 +02:00
unknown
1556ea9ae7 small change
sql/sql_class.cc:
  reverting some changes and fixig C style of Sanja ... ;o)
2002-11-18 22:41:57 +02:00
unknown
3a21e244a0 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-explain-4.1


sql/sql_select.cc:
  Auto merged
2002-11-18 22:20:28 +02:00
unknown
2eb4a1ea38 Fixed explain error handling
mysql-test/r/subselect.result:
  test of subselect explain
mysql-test/t/subselect.test:
  test of subselect explain
2002-11-18 22:19:15 +02:00
unknown
f22010c835 fix for message being sent in EXPLAIN ...
sql/sql_base.cc:
  temporary removal ...
2002-11-18 20:58:04 +02:00
unknown
8e2346e884 lot's of fixes with test cases
mysql-test/r/create.result:
  A test case for foreign key bug that is resolved
mysql-test/r/select_found.result:
  test case for new select ... limit 0 behaviour
mysql-test/t/create.test:
  test case for foreign key bug that is fixed
mysql-test/t/select_found.test:
  test case for new behaviour of SELECT ... LIMIT 0
sql/sql_select.cc:
  SELECT ... LIMIT 0
sql/sql_union.cc:
  replacing my dirty hack with Sanja's "proper" fix
2002-11-18 18:28:51 +02:00
unknown
4e864685b3 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_select.cc:
  Auto merged
2002-11-18 14:24:56 +02:00
unknown
0fb3b8d9ab fixed subselect explain bug
mysql-test/r/subselect.result:
  test of subselect explain bug
mysql-test/t/subselect.test:
  test of subselect explain bug
sql/sql_select.cc:
  remuved difference between optimization for execution and optimization for description
2002-11-17 22:23:57 +02:00
unknown
849b9ed913 typelib.h is required by mysql.h and should be installed
BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18:
  Delete: include/.my_sys.h.swp
2002-11-17 00:31:57 +01:00
unknown
e79eb98ba0 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-11-16 20:17:11 +01:00
unknown
a40a9d5916 Some new tests...................
mysql-test/r/derived.result:
  A test for derived table which requires creation on temporary MyISAM
  table ...
mysql-test/r/select_found.result:
  A test for LIMIT )
mysql-test/t/derived.test:
  A test for derived table which requires creation on temporary MyISAM
  table ...
mysql-test/t/select_found.test:
  A test for LIMIT 0
2002-11-16 16:41:29 +02:00
unknown
9c28568dc2 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_derived.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
2002-11-16 14:31:48 +02:00
unknown
1ce56c2ad8 Merge abelkin@work.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-16 14:13:23 +02:00
unknown
49aefe3fb7 Fixed bugs pointed by "Crash with 'big' derivated table in MySQL-4.1" bugreport
- fixed switching from heap to MyISAM table
 - fixed error handler


sql/sql_derived.cc:
  A fix for the bug when MyISAM tmp table has to be created in order to resolve derived table.
  fixed error handler
sql/sql_parse.cc:
  fixed error handler
sql/sql_union.cc:
  fixed switching from heap to MyISAM table
2002-11-16 00:01:48 +02:00
unknown
342dafb033 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-15 19:59:12 +02:00
unknown
27b7b8abbd A fix for the bug when MyISAM tmp table has to be created in order
to resolve derived table.

Will make a test case for this quite soon.
2002-11-15 19:58:07 +02:00
unknown
183a207fd7 few small bug fixes ...
sql/sql_delete.cc:
  A better fix for safe updates
sql/sql_table.cc:
  A fix for foreign key handling ...
2002-11-15 16:37:44 +02:00
unknown
ecd4ac2a3c test for NULL processing has been added 2002-11-15 17:34:10 +04:00
unknown
87db341dd5 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/mysql-4.1.bdb
2002-11-15 16:46:52 +04:00
unknown
a6007a364e fix for NULL processing 2002-11-15 16:45:08 +04:00
unknown
84deca32aa Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-15 13:51:25 +02:00
unknown
08253aa93d Copy from /sql directory 2002-11-15 13:58:24 +04:00
unknown
5a264eb9a7 move like_range into CHARSET_INFO structure 2002-11-15 11:44:23 +04:00
unknown
ff3fd7e5d2 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-15 11:01:04 +04:00
unknown
8d70a01f1a Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_select.cc:
  Auto merged
2002-11-14 22:10:17 +02:00
unknown
59436a6db1 Actually, I do it in order to pull new stuff
sql/sql_delete.cc:
  fix for safe_updates
  Actually, I do it in order to pull new stuff
sql/sql_select.cc:
  fix for LIMIT 0
  Actually, I do it in order to pull new stuff
2002-11-14 22:08:25 +02:00
unknown
f3af93f88e Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4sm 2002-11-15 00:18:37 +05:00
unknown
64dd949c41 Add shared memory protocol and option --protocol
client/client_priv.h:
  Add OPT_MYSQL_PROTOCOL and OPT_SHARED_MEMORY_BASE_NAME
include/config-win.h:
  Add shared memory protocol
include/errmsg.h:
  Add error codes of shared memory protocol
include/my_sys.h:
  Delete TYPELIB, moved to typelib.h
include/mysql.h:
  Add shared memory protocol
include/violite.h:
  Add shared memory protocol
libmysql/errmsg.c:
  Add texts of errors of shared memory protocol
sql/mysqld.cc:
  Add shared memory protocol and option --shared-memory, correct option --named-pipe
sql/set_var.cc:
  Add shared memory protocol variables
vio/vio.c:
  Add shared memory protocol
vio/viosocket.c:
  Add shared memory protocol
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-11-15 00:16:30 +05:00
unknown
fd5b16374c wild_case_compate(&String, &String, escape) doesn't exist anymor 2002-11-14 17:25:34 +04:00
unknown
5a8c6a33c2 removed unused function
some bug fixes


include/m_ctype.h:
  Macros bug fix
mysys/charset.c:
  wildcmp was not initialized
sql/mysql_priv.h:
  removed unused functions
sql/slave.cc:
  removed unused function
sql/sql_string.cc:
  removed unused functions
2002-11-14 16:47:48 +04:00
unknown
e7bbe3aa0b New wildcmp() function in CHARSET_INFO structure 2002-11-14 16:07:29 +04:00
unknown
7557af6f4d Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-11-14 11:55:03 +01:00
unknown
948a867123 fixed bug in cyclic reference refinition
mysql-test/r/subselect.result:
  test of cyclic reference
mysql-test/t/subselect.test:
  test of cyclic reference
sql/sql_parse.cc:
  fixed layout
  fixed bug in cyclic reference refinition
2002-11-14 09:43:24 +02:00
unknown
7642da10d4 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-14 00:26:40 +02:00
unknown
81a5afb925 fixed cyclic reference bug
mysql-test/r/subselect.result:
  test of cyclic reference
mysql-test/t/subselect.test:
  test of cyclic reference
sql/share/czech/errmsg.txt:
  new error message
sql/share/danish/errmsg.txt:
  new error message
sql/share/dutch/errmsg.txt:
  new error message
sql/share/english/errmsg.txt:
  new error message
sql/share/estonian/errmsg.txt:
  new error message
sql/share/french/errmsg.txt:
  new error message
sql/share/german/errmsg.txt:
  new error message
sql/share/greek/errmsg.txt:
  new error message
sql/share/hungarian/errmsg.txt:
  new error message
sql/share/italian/errmsg.txt:
  new error message
sql/share/japanese/errmsg.txt:
  new error message
sql/share/korean/errmsg.txt:
  new error message
sql/share/norwegian-ny/errmsg.txt:
  new error message
sql/share/norwegian/errmsg.txt:
  new error message
sql/share/polish/errmsg.txt:
  new error message
sql/share/portuguese/errmsg.txt:
  new error message
sql/share/romanian/errmsg.txt:
  new error message
sql/share/russian/errmsg.txt:
  new error message
sql/share/serbian/errmsg.txt:
  new error message
sql/share/slovak/errmsg.txt:
  new error message
sql/share/spanish/errmsg.txt:
  new error message
sql/share/swedish/errmsg.txt:
  new error message
sql/share/ukrainian/errmsg.txt:
  new error message
2002-11-14 00:26:18 +02:00
unknown
7721c7582a Some macros to make life easier 2002-11-13 17:58:07 +04:00