igor@rurik.mysql.com
c236568ac9
Auto Merge
2003-12-23 02:24:12 -08:00
konstantin@oak.local
d37da004f6
THD::lex now points to THD::main_lex like in 5.0
...
All tests pass (client_test included)
2003-12-19 20:52:13 +03:00
Sinisa@sinisa.nasamreza.org
35b8a0cde9
Already approved bug fix for #1561 .
...
Bug happens in INTERVAL function when number of compared arguments
is 8 or more.
2003-12-13 17:20:35 +02:00
konstantin@mysql.com
124c4ca346
cleanup: if there is return from if-part, we don't need else statement
2003-12-10 22:26:31 +03:00
igor@rurik.mysql.com
e235d796c9
Merge
2003-12-01 18:47:19 -08:00
pem@mysql.com
6e717133c5
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
igor@rurik.mysql.com
3938ac5436
This ChangeSet Introdices Item_equal.
...
The objects of this class represent multiple conjunctive equalities
in where conditions: =(f1,f2,...fn) <=> f1=f2 and f2= ... and =fn.
The objects are used to generate new possibale paths to access
the tables when executing a query.
They are also used to optimize the execution plan
chosen by the optimizer for the query.
2003-11-26 17:23:52 -08:00
monty@mysql.com
55e07608fd
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-20 22:07:02 +02:00
monty@mysql.com
7c6113a39f
Merge key cache structures to one
...
Fixed compiler warnings (IRIX C compiler and VC++)
2003-11-20 22:06:25 +02:00
bell@sanja.is.com.ua
1d84fa4d4e
fixed memory allocation
2003-11-20 14:31:10 +02:00
bell@sanja.is.com.ua
a1272bbfd2
fixed memory allocation problem in IN with const rows
2003-11-19 19:31:19 +02:00
monty@mashka.mysql.fi
0bd17351ca
Changed mysql_next_result() to return int instead of bool
...
Changed ~Item_func_in() to call cleanup() (to fix memory leak)
Fixed test_multi_statements() test in client_test
2003-11-19 17:31:57 +02:00
pem@mysql.com
28a2c6a96b
Merging 4.1->5.0.
2003-11-19 15:19:46 +01:00
konstantin@mysql.com
eb3c90095a
Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-11-05 14:35:20 +03:00
bell@sanja.is.com.ua
c56e75e2c1
after review fix
2003-11-03 12:28:36 +02:00
bell@sanja.is.com.ua
0747324ede
merge
2003-10-31 22:14:49 +02:00
konstantin@oak.local
e3bf30fdfb
follow-up to Sanja fix:
...
fix_fields() never accepts (THD *)(0)
2003-10-31 17:52:00 +03:00
ram@gw.mysql.r18.ru
c5b481d99a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.wl1056
2003-10-31 13:03:12 +04:00
ram@gw.mysql.r18.ru
90ffe1be00
WL #1056 : Eliminate NOT operators from where condition
2003-10-31 13:02:16 +04:00
bell@sanja.is.com.ua
807391a031
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-print_subselect-4.1
2003-10-30 15:56:52 +02:00
bell@sanja.is.com.ua
33346e26af
added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor()
...
added string length for more speed
made code covarage for print() method of Item
fixed printability of some items (SCRUM) (WL#1274)
2003-10-30 12:57:26 +02:00
konstantin@oak.local
20ca2dcc09
added fixed= 1 to the end of Item_in_optimizer::fix_fields()
2003-10-30 12:44:25 +03:00
pem@mysql.com
337238b78a
Merging 4.1->5.0
2003-10-22 16:10:22 +02:00
bell@sanja.is.com.ua
a7bdd19707
subqueries made printable
...
new EXPLAIN parameter to show real query as it was interpreted
(SCRUM) (WL#1274)
2003-10-16 15:54:47 +03:00
bell@laptop.sanja.is.com.ua
ddf4d1e529
fixed printability of Items (all items except subselects)
...
(SCRUM) (WL#1274)
2003-10-12 17:56:05 +03:00
bell@laptop.sanja.is.com.ua
18bb43671d
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
2003-10-07 01:31:16 +03:00
bell@laptop.sanja.is.com.ua
e527f268d5
fixed error names
2003-10-06 22:35:05 +03:00
bell@laptop.sanja.is.com.ua
e1b53fdd42
Merge
2003-10-06 20:55:06 +03:00
pem@mysql.com
8d884c02bb
Merging 4.1 -> 5.0
2003-09-24 11:29:38 +02:00
lenz@kallisto.local
f01a6f7eae
- Polished mysql-copyright a bit and added call to remove
...
cmd-line-utils/readline from the commercial distribution
- fixed some copyright headers so mysql-copyright can process them
2003-09-23 00:38:01 +02:00
monty@mashka.mysql.fi
7538242e4f
merge with 4.1 tree
2003-09-11 20:31:40 +03:00
monty@mashka.mysql.fi
45aa92c574
After merge fixes.
...
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
2003-09-11 19:06:23 +03:00
bell@sanja.is.com.ua
51374e569d
fixed BUG#1180 (changing WHERE clause of prepared statements by optimisation)
2003-09-02 19:56:55 +03:00
monty@narttu.mysql.fi
77a70a0a24
merge with 4.0.15
2003-08-29 13:44:35 +03:00
vva@eagle.mysql.r18.ru
60fc3ae02b
Merge
2003-08-27 21:26:00 -04:00
vva@eagle.mysql.r18.ru
40757beb81
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1
2003-08-27 19:15:27 -04:00
vva@eagle.mysql.r18.ru
cde2b50514
fixed bug #910 (right type of ifnull function)
2003-08-27 19:11:54 -04:00
monty@narttu.mysql.fi
381202354b
Fixed unlikely stack bug when having a BIG expression of type 1+1-1+1-1... in certain combinations. Bug #871
2003-08-27 20:00:18 +03:00
monty@narttu.mysql.fi
66b160c253
vio ssl structure renames (to get rid of ending _)
...
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
2003-08-27 02:51:39 +03:00
pem@mysql.com
7f158dd12a
Merge 4.1 into 5.0
2003-08-26 11:51:09 +02:00
Sinisa@sinisa.nasamreza.org
ced195f8a9
After merge fixes
2003-08-22 18:43:46 +03:00
bell@laptop.sanja.is.com.ua
c514948a30
merge
2003-08-20 22:17:57 +03:00
bell@laptop.sanja.is.com.ua
30913419ec
after merge changing
...
uninitialized value fixed
2003-08-20 17:35:12 +03:00
monty@narttu.mysql.fi
359846f052
Fixed some varnings from valgrind
...
Set min value of max_allowed_packet to 1024
Fixed problem with UNION's without braces and SQL_CALC_FOUND_ROWS, LIMIT #,#
and ORDER BY...LIMIT
2003-08-20 16:25:44 +03:00
bell@laptop.sanja.is.com.ua
dd9cbce47b
merge
2003-08-19 20:14:35 +03:00
monty@mashka.mysql.fi
10c4acfb4f
merge
2003-08-19 00:10:21 +03:00
bell@sanja.is.com.ua
011d905391
merge
2003-08-12 17:48:58 +03:00
bar@bar.mysql.r18.ru
e5e81f45a0
LIKE didn't work with non-default charset
2003-08-12 16:42:52 +05:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
bell@sanja.is.com.ua
cbb3a78d8d
merge
2003-08-11 12:00:33 +03:00