Commit graph

13803 commits

Author SHA1 Message Date
joreland@mysql.com
f5294ebd5a Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/gcc34
2004-07-04 21:20:39 +02:00
bell@sanja.is.com.ua
41bd6aa4b6 do not assign values of left expression of IN/ANN/ANY subquery in case of PS preparation (BUG#4403) 2004-07-04 10:40:24 +03:00
bell@sanja.is.com.ua
130740248b aggregate functions check during substitution made only for single row subselects (BUG#4400)
restoring current senect pointer before PS rexecution (backport from 5.0)
removed spaces at  lines ends
2004-07-04 08:46:28 +03:00
paul@ice.snake.net
fb7f15188a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-07-02 17:32:47 -05:00
bell@sanja.is.com.ua
1b54d08a1c right join print fixed 2004-07-03 01:08:46 +03:00
paul@ice.snake.net
8ead38a5dc item_geofunc.cc:
Minor comment tweaks.
2004-07-02 16:22:46 -05:00
gordon@zero.local.lan
c87812d8e6 Added comments to the PS test files, to prevent modifications which may destroy the tests . 2004-07-02 20:01:34 +02:00
guilhem@mysql.com
83dbc6b006 Fixing a bug in mysqltest.c:
if a command has a comment at the end of line, like:
error 2002 ; # this is error 2002
then the parsing of comment should not make mysqltest
forget about the value of expected error.
Reason it forgot it (so the next query caused the test to fail)
is that internally the above line is 2 queries.
2004-07-02 19:20:30 +02:00
bar@mysql.com
4df5a14a6f Bug #4374 SHOW TABLE STATUS FROM ignores collation_connection 2004-07-02 16:52:02 +05:00
serg@serg.mylan
24b84fbc87 unused (and unnecessary) mysqltest commands removed 2004-07-02 11:02:21 +02:00
bar@mysql.com
a597b077c6 configure.in:
armscii8_bin was referenced to as armscii_bin.
2004-07-02 13:33:26 +05:00
bar@mysql.com
b41e009b04 armscii8_bin was referenced to as armscii_bin in a mistake. 2004-07-02 13:27:46 +05:00
paul@ice.snake.net
b10c110b18 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 23:33:44 -05:00
bell@sanja.is.com.ua
ce19102645 fixed join_nested test independence of environment
spaces at line end in fresh definitions removed
fixed printing of nested joins (BUG#4352)
2004-07-01 23:46:43 +03:00
mwagner@here.mwagner.org
199d4f15d6 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0
2004-07-01 14:55:23 -05:00
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