ram@mysql.r18.ru
8e23f54fec
backport fix for the bug #803 : INTERVAL(NULL, ....)
2003-07-14 12:39:10 +05:00
monty@mashka.mysql.fi
568e050ec9
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-07-14 10:18:04 +03:00
monty@mashka.mysql.fi
e1aa90a9bf
Safety and speedup fixes:
...
Changed is_open() to work as before.
Added back inited argument to LOG
2003-07-14 10:12:05 +03:00
ram@mysql.r18.ru
f7570df170
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.r18.ru:/usr/home/ram/work/4.0
2003-07-14 11:23:36 +05:00
venu@myvenu.com
f4518cdc31
Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-07-13 09:53:31 -07:00
bell@sanja.is.com.ua
35ab257c63
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-07-13 13:05:56 +03:00
bell@sanja.is.com.ua
a7cd3c66b7
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
2003-07-13 13:04:59 +03:00
guilhem@gbichot2
3110561e5d
Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS.
...
Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
Removed PURGE LOGS (now PURGE MASTER LOGS).
Added SHOW BDB LOGS as synonym for SHOW LOGS.
Note: tests key_cache.test hanged, rpl_log_pos.test, rpl_rotate_logs.test failed for me.
For the second and third one I guess this will disappear after merging 4.0.
2003-07-12 23:31:21 +02:00
venu@myvenu.com
fe7dc23f97
Merge
2003-07-11 18:56:39 -07:00
venu@myvenu.com
7d094db001
Add the support of 'SUBSTR' function compatible with Oracle and SAPDB (SCRUM #872 )
2003-07-11 18:55:03 -07:00
lenz@mysql.com
8fcda6a5d5
- fixed an error in the rpl_error_ignored_table test suite: the master
...
port number can be different from 3306 when doing the release builds
with Do-compile, therefore it has to be replaced with the correct
value during the test run using the "--replace_result" function.
2003-07-11 22:18:53 +02:00
ram@mysql.r18.ru
4ca9718375
Fix for the bug #801 : create table t1 select x'41'; doesn't work
2003-07-11 14:17:18 +05:00
ram@mysql.r18.ru
df0f59fcbd
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.r18.ru:/usr/home/ram/work/4.0
2003-07-11 13:29:25 +05:00
guilhem@mysql.com
2ca501f7ea
Fix for BUG#812
...
"mysqlhotcopy fails to copy tables but does not indicate a failure"
("does not indicate a failure");
this is about "mysqlhotcopy fails to copy tables".
2003-07-10 16:03:29 +02:00
pem@mysql.telia.com
035a4629ae
A test in subselect.test turned out to be correct after all, a difference between
...
5.0 and 4.1 (where it fails).
2003-07-10 12:45:34 +02:00
ram@mysql.r18.ru
82942ebf9d
Fix for the bug #803 .
...
Now INTERVAL(NULL, N1, N2, ...) returns NULL.
2003-07-10 15:27:02 +05:00
lenz@kallisto.local
92b3a231d4
- Updated error message tests in several results of the test suite after
...
the server error messages had been modified in errmsg.txt
2003-07-10 10:02:57 +02:00
Sinisa@sinisa.nasamreza.org
8d4e8b567a
Test case for bug #807
2003-07-09 22:33:26 +03:00
pem@mysql.telia.com
a8a29a39d2
Merging 4.1 into 5.0 (second pass; post-merge fixes).
...
One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-(
2003-07-09 17:07:12 +02:00
kostja@oak.local
941a8623ca
resolved conflict with pulled changeset
2003-07-09 18:24:43 +04:00
monty@mashka.mysql.fi
d495656ac5
Cleanups
2003-07-09 00:55:07 +03:00
monty@mashka.mysql.fi
d9e7072210
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-07-09 00:00:16 +03:00
monty@mashka.mysql.fi
b2cbd83913
Fixed bug in ALTER TABLE ... DISABLE/ENABLE KEYS
...
Removed double my_thread_end() which caused fatal error on windows if mysqld died on startup
2003-07-08 23:58:04 +03:00
monty@mashka.mysql.fi
8b54bff34c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
2003-07-08 23:48:04 +03:00
pem@mysql.telia.com
9c3a7a6ba3
Merge 4.1 into 5.0 (first pass).
2003-07-08 17:50:23 +02:00
guilhem@mysql.com
46b0e778b8
Fix for
...
BUG#797 "If query ignored on slave (replicate-ignore-table) the slave still checks if
the returned error (0) is the same as the one on the master, whereas it shouldn't
test this.
Plus a new test for BUG#797.
2003-07-08 15:50:57 +02:00
gluh@gluh.mysql.r18.ru
5709ed20ab
SAPDB date/time finctions
2003-07-08 15:06:05 +05:00
kostja@oak.local
0f28677af6
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
...
into oak.local:/home/kostja/mysql/mysql-4.1
2003-07-08 12:03:46 +04:00
bell@sanja.is.com.ua
7e10dada05
test of big subquery
2003-07-08 11:03:30 +03:00
gluh@gluh.mysql.r18.ru
e6eef74812
Merge gluh@gw:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC
2003-07-08 12:57:00 +05:00
kostja@oak.local
a232225b69
Preliminary support for options --secure-auth,
...
--old-passwords
Support for option --old-protocol was removed.
Some test performed.
Tests for SSL and replication are pending.
More strict following to specification for --old-passwords
is in the TODO.
2003-07-08 02:36:14 +04:00
bell@sanja.is.com.ua
8279740af4
new IN subquery engine added for simple IN with non-primary index but without NULL returning
...
(SCRUM) (part of WL#818)
2003-07-08 00:08:00 +03:00
serg@serg.mylan
5929f2101d
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-07 19:08:17 +02:00
serg@serg.mylan
bbe08e4a03
finally proper recursive descent for parsing expressions with MATCH ... AGAINST in add_ft_keys()
2003-07-07 19:02:58 +02:00
bell@sanja.is.com.ua
acece34bce
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-07-07 18:51:14 +03:00
bell@sanja.is.com.ua
5c836428eb
merge
2003-07-07 18:49:54 +03:00
bell@sanja.is.com.ua
6348e63f62
Optimisation if simple IN subselect with primary index
...
(SCRUM) (part of WL#818)
2003-07-07 18:40:19 +03:00
bell@sanja.is.com.ua
0aa4563e82
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1
2003-07-07 15:01:47 +03:00
bell@sanja.is.com.ua
7ad5331768
merge
2003-07-07 10:30:52 +03:00
monty@mashka.mysql.fi
ebcc7b5a4f
Support for variables with components
...
Added framework to create/drop and manager buffers for multiple key caches
2003-07-06 19:09:57 +03:00
guilhem@mysql.com
e386d0e126
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-07-06 18:01:39 +02:00
guilhem@mysql.com
9c73d91d54
WL#912 (more user control on relay logs):
...
FLUSH LOGS now rotates relay logs,
and a new variable max_relay_log_size.
Plus a very small bit of code cleaning.
2003-07-06 17:59:54 +02:00
bell@sanja.is.com.ua
9b6083dbe7
fixed memory leak in group_concat function (BUG#796)
...
fixed test func_gconcat to be repeatable independent of presend tables and avoid removing user tables
2003-07-06 18:11:19 +03:00
Sinisa@sinisa.nasamreza.org
ee9237e0d8
missing test case for DISTINCT .. LEFT ..
2003-07-05 16:29:11 +03:00
bell@sanja.is.com.ua
45e001f465
reduced using of slow current_thd/current_lex macro
...
initialization of item_thd moved to constructor (in any case we need thd in constructor)
initialization of group_concat_max_len to constructor to avoid incorrect length reporting (BUG#757)
removed Item_func_group_concat::fix_length_and_dec() because item have its own fix_fields and will not have inherited items
2003-07-05 03:03:31 +03:00
bell@sanja.is.com.ua
f9936c61f7
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-alloc_group-4.1
2003-07-05 00:10:51 +03:00
serg@serg.mylan
38a2ed6f8b
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-04 22:06:19 +02:00
bar@bar.mysql.r18.ru
de9ba3848c
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-07-04 18:12:59 +05:00
bar@bar.mysql.r18.ru
0c2041cfdf
New methods
...
Item_func::agg_arg_collations()
Item_func::arr_arg_collations_for_comparison()
to aggregate argument collations.
It helps to reuse a lot of code.
2003-07-04 18:12:23 +05:00
serg@serg.mylan
6a40b8e889
merge + order by (bug #515 ) temporary fix
...
properly fixed in 4.1
2003-07-04 14:42:57 +02:00