monty@mysql.com
3d0f7eca4e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-11-09 21:45:36 +02:00
serg@sergbook.mylan
c79f4c08d6
Merge sergbook.mylan:/usr/home/serg/Abk/mysql-5.0
...
into sergbook.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2004-11-09 16:44:23 +01:00
monty@mysql.com
1087186657
Merge with 4.1 to get new thd->mem_root handling
2004-11-08 17:53:32 +02:00
serg@sergbook.mylan
342fb28efa
decimal.c:
...
test_ro("999999999999999999999.999", 0, CEILING);
test_da("5", "-6.0");
ignore:
added gdbinit
2004-11-08 10:06:32 +01:00
petr@mysql.com
b2e3626e52
fix for the IM linking problem
2004-11-06 02:14:56 +03:00
joerg@mysql.com
16b280b11d
Ensure that even the (relatively new) "mysql-test/Makefile.am" gets into the source tar-ball.
2004-11-05 15:50:53 +01:00
serg@serg.mylan
353dd4fe35
dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all features
...
charset2html moved from mysys to extra
ignore: new files added, garbage removed
2004-11-04 22:29:00 +01:00
petr@mysql.com
96aa04bf8e
protability fix
2004-11-04 11:24:14 +03:00
monty@mysql.com
7d3be517a4
Merge on pull
2004-11-03 13:01:38 +02:00
monty@mysql.com
afbe601302
merge with 4.1
2004-10-29 19:26:52 +03:00
timour@mysql.com
b67f86728b
Fix for BUG#6303 + fix for discovered bug with sub-queries when analyzin queries for MIN/MAX optimization (WL#1724).
2004-10-29 18:20:09 +03:00
serg@serg.mylan
0ad752e8af
s/puts/printf/
2004-10-21 15:34:26 +02:00
igor@rurik.mysql.com
a03e5ad8e4
Merge for post-merge fixes for Item_equal patch.
2004-10-19 16:07:10 -07:00
serg@serg.mylan
f7419aaa61
Merge bk-internal:/home/bk/mysql-5.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-10-18 14:09:41 +02:00
serg@serg.mylan
bd10f962f2
arbitrary precision decimal numbers
2004-10-18 14:06:46 +02:00
timour@mysql.com
3bb2c4e325
After merge adjustment of tests due to changes in cost estimates.
2004-10-11 20:10:07 +03:00
igor@rurik.mysql.com
71f6ab7a09
Merge for Item_equal.
2004-10-09 10:34:13 -07:00
bell@sanja.is.com.ua
4cb6527421
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-show-5.0
2004-09-10 13:11:33 +03:00
bell@sanja.is.com.ua
a7de21c3e0
thd pointer fixed
2004-09-10 13:09:27 +03:00
dlenev@brandersnatch.localdomain
7c8213ea20
Fixed --with-embedded builds.
...
Added previously missing sql_trigger.cc file to embedded library.
2004-09-10 10:29:08 +04:00
monty@mysql.com
31122efde7
Merge with 4.1
...
(Includes merge of arena code in 4.1 and 5.0)
2004-09-06 15:14:10 +03:00
serg@serg.mylan
b5b7603542
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 22:02:08 +02:00
serg@serg.mylan
0dc5945b19
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-24 21:07:08 +02:00
vva@eagle.mysql.r18.ru
3e6d1022d6
upgrade to libedit-2.6.7
...
(fixed Bug #4462 libedit compile failure)
2004-08-24 20:41:41 +05:00
serg@serg.mylan
62722e7b05
merged
2004-08-20 00:52:43 +02:00
serg@serg.mylan
3f2210c064
after merge fixes
2004-08-19 03:02:09 +02:00
serg@serg.mylan
754fafd28f
copied new my_vsnprintf from 4.1. use "ul" when merging
2004-08-19 02:35:59 +02:00
joreland@mysql.com
556488dcd2
Added more ndb binaries to ignore
2004-08-12 12:37:16 +02:00
joreland@mysql.com
d913e55e1b
Add ndb binaries to ignore list
2004-08-12 07:48:18 +02:00
konstantin@mysql.com
d3e520ce7e
Port of cursors to be pushed into 5.0 tree:
...
- client side part is simple and may be considered stable
- server side part now just joggles with THD state to save execution
state and has no additional locking wisdom.
Lot's of it are to be rewritten.
2004-08-03 03:32:21 -07:00
bell@sanja.is.com.ua
bbe121c0c9
memory leak removing
2004-07-16 15:20:51 +03:00
monty@mysql.com
1e31199995
Merge with 4.1.3-beta
2004-07-07 11:29:39 +03:00
monty@mysql.com
137b8517c4
Cleanup for creating windows source distribution
2004-06-26 10:57:00 +03:00
monty@mysql.com
b1d08ba2b4
Merge with 4.0 to get the latest bug patches to 4.1
2004-06-25 20:13:05 +03: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
dlenev@brandersnatch.localdomain
47e03a0099
Final solution to mysql_tzinfo_to_sql problem.
2004-06-23 13:07:00 +04:00
dlenev@brandersnatch.localdomain
c110ec1a22
Fix for build from bk failures with old automake.
...
mysql_tzinfo_to_sql converter was moved to extra/ directory and its build was made
compatible with older automake versions.
2004-06-22 23:36:26 +04:00
monty@mysql.com
d69a36d118
merge
2004-06-21 10:24:40 +03:00
dlenev@brandersnatch.localdomain
09ba29e539
WL#1264 "Per-thread time zone support infrastructure".
...
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
WL#1266 "CONVERT_TZ() - basic time with time zone conversion
function".
Fixed problems described in Bug #2336 (Different number of warnings
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated
at Field object level not in conversion functions).
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
2004-06-18 10:11:31 +04:00
monty@mysql.com
fd0153304d
Fixed some byte order bugs with prepared statements on machines with high-byte-first. (Bug #4173 )
...
Fixed problem with NULL and derived tables (Bug #4097 )
Cleanup of new pushed code
2004-06-18 03:02:29 +03:00
pem@mysql.com
71eddc362e
Merging 4.1 to 5.0.
2004-05-26 17:04:45 +02:00
pem@mysql.com
df69f93ae9
Post-merge post-merge fix (new error codes for fparser).
2004-05-14 16:10:31 +02:00
hf@deer.(none)
a4bbf5d15b
client_test with embedded library will be built so one can check if he broke
...
something in embedded PS
2004-05-13 10:30:42 +05:00
monty@mysql.com
116f61c656
Don't automaticly generate a new key for a foreign key constraint if there is already a usable key.
...
Prefer not automatic keys before automatic keys. If there is two conf
2004-05-12 00:29:52 +03:00
bell@sanja.is.com.ua
3c5cec08c0
file parser for new .frm
2004-05-11 23:23:49 +03:00
pem@mysql.com
bf45960eef
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
serg@serg.mylan
0c281ecd7e
symlink a whole dir, not individual files (symlinking individual files is one subdir below and results in broken links)
2004-04-26 13:27:23 +02:00
serg@sergbook.mylan
606073084e
symlink, not hardlink
...
mkdir in Makefile, not in configure
chmod a-x
2004-04-21 14:55:39 -05:00
magnus@neptunus.(none)
770fe3fc91
More files to ignore
2004-04-14 13:15:18 +02:00
magnus@neptunus.(none)
75317dafdc
Ignore .depend and .depend.mk
2004-04-14 13:11:30 +02:00
