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
7ac525fc1b
union.test: drop table added
2004-09-05 11:27:31 +02: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
pem@mysql.com
dfd59e296e
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
ingo@mysql.com
4de7e18b81
Hand-resolved auto merge
2004-04-07 14:56:24 +02:00
ingo@mysql.com
376f252659
ignore:
...
added install
2004-04-07 13:57:09 +02:00
lenz@kallisto.local
bbbb3f6540
- install all *.sql files into the "shared" directory for the binary tar.gz
...
distribution (this is more in line with how "make install" would install
them) - this should also fix a test failure in the "system_mysql_db_fix"
test.
2004-04-01 17:34:26 +02:00
serg@serg.mylan
ed2e1aa14d
my_gethwaddr() for linux/freebsd
...
UUID() function
2004-02-27 20:30:08 +01:00
monty@mashka.mysql.fi
3b83cce5eb
merge with 4.0
2004-02-22 09:50:59 +02:00
serg@serg.mylan
870a7f23d6
ignore:
...
added scripts/make_win_binary_distribution
2004-02-21 14:00:54 +01:00
serg@serg.mylan
6af8a93052
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-17 17:07:14 +01:00
serg@serg.mylan
de240a1ce2
ft_boolean_syntax made changeable
2004-02-16 18:53:00 +01:00
monty@mysql.com
ce14578909
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
konstantin@mysql.com
2a4cfe8b4f
merge 3.23 -> 4.0, 2003/02/06
2004-02-06 15:23:41 +03:00
lenz@mysql.com
9736c9c457
- renamed myisam/ft_dump to myisam/mysam_ftdump and added it to the
...
binary distribution and Server RPM
2004-02-03 22:25:02 +01:00
monty@mysql.com
151b558e21
Mark that strings may change on index only reads (for BDB tables).
...
This fixed problem with index reads on character fields with BDB tables. (Bug #2509 )
2004-01-29 15:16:48 +01:00
igor@rurik.mysql.com
c236568ac9
Auto Merge
2003-12-23 02:24:12 -08:00
monty@mysql.com
c6ed2a625b
Update for VC++
...
(Fixed project files, compiler warnings etc..)
2003-12-21 02:07:45 +02:00