mwagner@here.mwagner.org
6cd34875cf
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into here.mwagner.org:/Volumes/BK/mysql-4.1
2004-07-01 14:48:58 -05:00
sergefp@mysql.com
731c2acaed
Remove compiler warning
2004-07-01 23:31:48 +04:00
paul@ice.snake.net
f5decb3d1c
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-07-01 12:01:26 -05:00
gordon@zero.local.lan
8462b8aeb8
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zero.local.lan:/GORDON/MySQL/mysql-4.1/src
2004-07-01 16:35:52 +02:00
gordon@zero.local.lan
7071d062c9
WL#1564 Intensive test of prepared statements via 'mysqltest'
2004-07-01 16:30:29 +02:00
monty@mysql.com
78c1938848
Portability fixes (For Netware)
2004-07-01 17:26:45 +03:00
lenz@mysql.com
2c6537e2cb
- tagged ChangeSet 1.2023 as "mysql-4.1.3"
...
- bumped up version number in configure.in: 4.1.3-beta -> 4.1.4-beta
2004-07-01 14:41:51 +02:00
paul@ice.snake.net
cdceda82fd
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-07-01 07:40:32 -05:00
mwagner@here.mwagner.org
4ba6a73d54
Merge here.mwagner.org:/Volumes/BK/mysql-4.1
...
into here.mwagner.org:/Volumes/BK/mysql-4.1-work
2004-06-30 23:31:33 -05:00
mwagner@here.mwagner.org
35b512f079
mysql-copyright:
...
Fix for the condition when "the_fat" doesn't end with 'dnl\n', but ')\n'.
2004-06-30 23:29:47 -05:00
paul@kite-hub.kitebird.com
c53dc62ece
client.c, libmysql.c:
...
Symbol spelling change.
errmsg.c:
Client error message edits.
errmsg.h:
Two symbol spelling changes.
2004-06-30 22:18:41 -05:00
bell@sanja.is.com.ua
24a8dc2337
fixed WHERE condition optimisation in PS
2004-07-01 01:52:05 +03:00
paul@ice.snake.net
707429332a
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-30 14:18:34 -05:00
paul@kite-hub.kitebird.com
0c6cc6951a
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2004-06-30 10:38:56 -05:00
guilhem@mysql.com
01dc75dfef
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-06-30 16:16:57 +02:00
guilhem@mysql.com
74809f7445
Fix for BUG#4326 "Replicated LOAD DATA INFILE show nothing in
...
processlist on slave":
we now report in SHOW PROCESSLIST that we are writing to the temp
files or loading the table. When we are writing to the tmp file:
| 3 | system user | | | Connect | 6 | Making temp file /tmp/SQL_LOAD-2-1-2.data |
and when we are actually loading the .data temp file into the table:
| 3 | system user | | test | Connect | 2 | | LOAD DATA INFILE '/tmp/SQL_LOAD-2-1-2.data' INTO TABLE `t` <...> |
2004-06-30 15:41:35 +02:00
igor@rurik.mysql.com
a0c83c0f68
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-1
2004-06-30 05:55:37 -07:00
igor@rurik.mysql.com
d70f886f17
subselect2.result, select.result:
...
Post-merge fixes for nested joins.
The join_tab_cmp function in sql_select has been changed.
join_nested.result:
Post-merge fixes for nested joins.
The join_tab_cmp function in sql_select has been changed
sql_select.cc:
Post-merge fixes for nested joins.
Avoided re-execution of eliminate_not_funcs and simplify_joins
in optimize_cond.
Changed the join_tab_cmp function to take into account
the dependent relation.
sql_lex.cc, sql_lex.h:
Added the first_cond_optimization flag to st_select_lex to avoid
re-execution of some optimizations in optimize_cond.
sql_base.cc:
Post-merge fixes for nested joins.
Fixed problems with a proper column list substituted for '*' in
queries with natural joins.
2004-06-30 05:54:32 -07:00
lenz@mysql.com
b112cbee53
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-06-30 14:19:31 +02:00
lenz@mysql.com
f20d4d4d4e
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-build
2004-06-30 14:02:32 +02:00
lenz@mysql.com
0cba9b482e
- fixed server RPM postinstall (mysql_install_db was called with the
...
wrong parameter)
2004-06-30 14:01:31 +02:00
bar@mysql.com
a1aa3da96a
ctype-uca.c:
...
mbminlen was wrong for UTF8.
2004-06-30 14:45:08 +05:00
serg@serg.mylan
648a2fea15
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-30 11:26:49 +02:00
serg@serg.mylan
08738d2847
fowwlowup fixes for index_flags()
2004-06-30 10:40:15 +02:00
paul@ice.snake.net
547c56078e
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-29 21:33:05 -05:00
paul@kite-hub.kitebird.com
925c5ce711
Reword some client error messages.
2004-06-29 12:28:45 -05:00
monty@mysql.com
533f2e7777
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-06-29 18:20:06 +03:00
monty@mysql.com
93d0736e96
Apply patch from Novell
2004-06-29 18:19:35 +03:00
ram@gw.mysql.r18.ru
6acd105b16
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4089
2004-06-29 13:51:35 +05:00
ram@gw.mysql.r18.ru
c0c1c3200a
a fix (bug #4304 : TRUNCATE <table of type BDB> , wrong result).
2004-06-29 13:49:50 +05:00
mwagner@here.mwagner.org
1adf2aacc6
my_md5sum:
...
Added code to use locally installed perl modules first
2004-06-29 02:13:24 -05:00
paul@ice.snake.net
f5f335aa68
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-06-28 23:30:37 -05:00
bell@sanja.is.com.ua
36bf1e7195
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-06-28 20:53:08 +03:00
bell@sanja.is.com.ua
b8742e4a56
unused field removed
2004-06-28 20:01:11 +03:00
paul@kite-hub.kitebird.com
f1218f982a
Message/comment touchup.
2004-06-28 11:26:54 -05:00
guilhem@mysql.com
00394f591e
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-28 15:39:04 +02:00
guilhem@mysql.com
ba22a7aaa9
Fix for BUG#4240 "mysql_fix_privilege_tables Does not use --password properly"
...
Pass password if it is NOT empty. Typo fixed.
2004-06-28 15:37:42 +02:00
sergefp@mysql.com
4d8e95111e
Fixed test results to reflect range optimizer fixes
2004-06-28 16:49:09 +04:00
vva@eagle.mysql.r18.ru
e228547a61
s/\r\n/\n/ in mysql-test/*/system_mysql_db*
...
according to http://www.bitkeeper.com/Documentation.FAQS.Windows_NT.html
2004-06-28 15:53:49 +05:00
serg@serg.mylan
a99468259b
after merge fix
2004-06-28 11:06:22 +02:00
monty@mysql.com
152528b669
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-06-28 00:42:38 +03:00
monty@mysql.com
eca9418ca7
Added missing my_time.c file to mysqlclient project
...
Moved include <assert.h> to my_global.h
2004-06-28 00:42:02 +03:00
serg@serg.mylan
2be661a204
portability fix
2004-06-27 20:30:48 +02:00
serg@serg.mylan
5c371299b8
tell make how to create mysql_tzinfo_to_sql.cc
2004-06-27 20:17:32 +02:00
monty@mysql.com
406ae8a59e
Ensure that we don't create long temporary .o file (breaks on qnx)
2004-06-27 20:07:21 +03:00
monty@mysql.com
e22f983a37
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-06-27 19:18:03 +03:00
monty@mysql.com
39a3c4deda
Merge with 4.0
2004-06-27 19:17:24 +03:00
monty@mysql.com
f65b0c6be5
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-06-27 18:21:14 +03:00
monty@mysql.com
380ff9c228
Fix to be able to cross-compile for modesto
2004-06-27 18:20:06 +03:00
serg@serg.mylan
b8369481fe
correct casting void->char
2004-06-27 17:16:05 +02:00