Commit graph

13743 commits

Author SHA1 Message Date
serg@serg.mylan
2b93adb9c1 Bug#3808 - fulltext index, delete, 2-level tree, the word on the 1st level has different length than the key (latin1_german2_ci) 2004-06-25 13:11:02 +02:00
ingo@mysql.com
57da928039 Merge 2004-06-25 12:59:47 +02:00
ram@gw.mysql.r18.ru
fe3bb82b2b Changed a comment. 2004-06-25 15:26:50 +05:00
ingo@mysql.com
958cf857a3 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug3565
2004-06-25 12:14:54 +02:00
ram@gw.mysql.r18.ru
65fe5e7289 a fix (bug #4241: system_mysql_db_fix.test fails) 2004-06-25 15:09:26 +05:00
igor@rurik.mysql.com
c5b289c577 sql_select.cc, sql_parse.cc:
Nested joins: review modifications.
2004-06-25 02:54:05 -07:00
ingo@mysql.com
0e76168e34 Prevent potential problems on 32-Bit machines. 2004-06-25 11:35:37 +02:00
serg@serg.mylan
3452445559 remove ^M's
compile even without InnoDB
2004-06-25 11:33:03 +02:00
bell@sanja.is.com.ua
4092635155 fixed EXPLAIN behaviour with prepared statements (BUG#4271) 2004-06-25 11:37:43 +03:00
patg@krsna.patg.net
f6ea88e8a3 Many files:
new file
2004-06-25 00:43:14 -07:00
dlenev@brandersnatch.localdomain
1013d3c7ec Small build fix.
Add my_time.h to list of headers which should be put ot include/ during make dist.
2004-06-25 10:30:24 +04:00
serg@serg.mylan
db46b47be8 undone 2004-06-25 01:43:41 +02:00
serg@serg.mylan
b511996ff4 workaround for gcc 2.95.3 bug
anybody knows how to distinguish 2.95.3 from 2.95.4 (which is ok) ?
2004-06-25 01:25:02 +02:00
serg@serg.mylan
04bd8c9a44 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-25 00:56:34 +02:00
serg@serg.mylan
d8984ba396 free open cursors 2004-06-25 00:50:48 +02:00
konstantin@mysql.com
f99224fe2d One more const method. 2004-06-25 01:30:43 +04:00
konstantin@mysql.com
b6cb8cb5f7 Followup to cleanup in handler interface. 2004-06-25 01:29:30 +04:00
paul@ice.snake.net
737735d81b Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-24 16:29:29 -05:00
serg@serg.mylan
8162e97ada Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-24 23:29:29 +02:00
konstantin@mysql.com
dc2b5c2ac2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2004-06-25 01:29:28 +04:00
serg@serg.mylan
37314708b7 merged 2004-06-24 23:29:28 +02:00
vva@eagle.mysql.r18.ru
dfd200c835 Merge 2004-06-25 02:29:27 +05:00
vva@eagle.mysql.r18.ru
8e651814e9 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_1851/mysql-4.1
2004-06-25 02:24:00 +05:00
vva@eagle.mysql.r18.ru
665d1451f2 fixed bug #1851 "mysqldump does not return
an error code if the output device is filled"
2004-06-25 01:14:12 +05:00
bell@sanja.is.com.ua
5db861c3e4 parameter of my_yyoverflow made independed from YYSIZE_T (BUG#4204) 2004-06-24 22:15:15 +03:00
konstantin@mysql.com
fccfcb98d5 Previous commit didn't make it (tree fix): I'd forgotten semicolon. 2004-06-24 22:47:05 +04:00
konstantin@mysql.com
998fd5a8f0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2004-06-24 22:37:41 +04:00
konstantin@mysql.com
a32bb3c0c4 Fix of broken 4.1 tree:
Initially my_time.c was added to sql/ link_sources target only.
As it turns out this target is sometimes not called; instead of it
make calls one hard-coded in top-level Makefile.am.
Now adding linking of my_time.c to the top-level Makefile.am
to (hopefully) cover all cases.
2004-06-24 22:33:40 +04:00
bell@sanja.is.com.ua
88877e6710 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-06-24 21:29:05 +03:00
konstantin@mysql.com
54615ebcc5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2004-06-24 21:50:30 +04:00
konstantin@mysql.com
2ad9e516c8 A little fix in libmysqld: my_time.c was added twice. 2004-06-24 21:50:04 +04:00
serg@serg.mylan
1c37f8e20e Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-24 19:47:53 +02:00
serg@serg.mylan
1ff21a9e64 bug#4089 - JOIN::join_free calling mysql_unlock w/o index_end() before 2004-06-24 19:46:50 +02:00
lenz@mysql.com
28adaa438a Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-06-24 19:30:34 +02:00
mwagner@here.mwagner.org
1afa895962 Merge here.mwagner.org:/Volumes/BK/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0-work
2004-06-24 12:23:28 -05:00
mwagner@here.mwagner.org
81c0732a45 logger.pm, Bootstrap:
Updates for output enhanced Bootstrap
2004-06-24 12:22:48 -05:00
lenz@mysql.com
a39a56ffe6 - start the ndb cluster on different TCP ports when running another
build thread
2004-06-24 19:16:44 +02:00
bell@sanja.is.com.ua
c6e2f6ac13 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
2004-06-24 19:43:47 +03:00
bell@sanja.is.com.ua
85c9d81c4b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
2004-06-24 19:40:18 +03:00
lenz@mysql.com
e2892e4180 - Windows compile fix: added missing file tztime.cpp to the mysqld
project file
2004-06-24 18:17:47 +02:00
konstantin@mysql.com
674a1c4e18 - fixed test_frm_bug test to work with increased number of columns in
result of SHOW TABLE STATUS
2004-06-24 20:08:42 +04:00
bell@sanja.is.com.ua
de9cefaa77 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
2004-06-24 19:03:58 +03:00
lenz@mysql.com
fbdcf59418 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-06-24 18:01:13 +02:00
paul@ice.snake.net
8813b5ebcd Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-24 10:10:21 -05:00
konstantin@mysql.com
29b88ff539 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-4030
2004-06-24 19:09:31 +04:00
konstantin@mysql.com
a30fcdc690 Fix for Bug#4030 "Client side conversion string -> date type doesn't
work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
  MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added.
2004-06-24 19:08:36 +04:00
bar@mysql.com
62aeb88638 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2004-06-24 18:51:32 +05:00
bar@mysql.com
aa27a7858e "Version" column in SHOW TABLE STATUS. 2004-06-24 18:46:41 +05:00
paul@ice.snake.net
1b6b5e8813 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-24 08:32:33 -05:00
mskold@mysql.com
8ba4ab195f Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-06-24 15:32:33 +02:00