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
igor@rurik.mysql.com
d64bdafb4c
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2003-12-08 11:26:34 -08:00
pem@mysql.com
63f4858030
Merged 4.1 -> 5.0
2003-12-05 13:11:50 +01:00
lenz@kallisto.local
84acc2054f
- Bumped up version number in configure.in 4.1.1-alpha -> 4.1.2-alpha
...
- tagged ChangeSet 1.1641 as "mysql-4.1.1"
2003-12-04 15:20:44 +01:00
igor@rurik.mysql.com
580b878562
The output of explain command for some queries has changed
...
after introducing Item_equal.
2003-12-02 16:41:53 -08:00
pem@mysql.com
6e717133c5
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
konstantin@oak.local
ad74f5bfe5
misplaced comment moved to relevant line
2003-11-25 15:28:43 +03:00
serg@serg.mylan
201f27702a
ignore:
...
added sql/udf_example.so scripts/make_win_src_distribution
2003-11-19 23:11:27 +01:00
pem@mysql.com
28a2c6a96b
Merging 4.1->5.0.
2003-11-19 15:19:46 +01:00
serg@serg.mylan
60d60a299e
Item_uint::save_in_field() added to take into account bigint->decimal case
2003-11-16 17:37:15 +01:00
monty@narttu.mysql.fi
6b79cd5c23
Merge
2003-11-03 22:48:03 +02:00
monty@narttu.mysql.fi
085b1c5608
Some simple things missing for last changeset
2003-11-03 22:18:16 +02:00
pem@mysql.com
337238b78a
Merging 4.1->5.0
2003-10-22 16:10:22 +02:00
serg@serg.mylan
f944fd4a65
merged
2003-10-21 11:58:43 +02:00
serg@serg.mylan
50d9b95b77
merged
2003-10-15 12:25:44 +02:00
monty@mashka.mysql.fi
e71b53a8fe
merge with 4.0 to get fix for SET enum_system_variable=NULL
2003-10-14 16:34:09 +03:00
monty@mashka.mysql.fi
2d3840f550
Fixed bug in SET enum_system_variable=NULL
2003-10-14 16:30:42 +03:00
serg@serg.mylan
8cc3951c8f
key_map with more that 64 bits width
2003-10-11 13:06:55 +02:00
monty@narttu.mysql.fi
6056cfadfc
Merge with 4.0.16
2003-10-07 15:42:26 +03:00
pem@mysql.com
8d884c02bb
Merging 4.1 -> 5.0
2003-09-24 11:29:38 +02:00
greg@mysql.com
564dad6c53
Remove 3.23 InstallShield files, improve make_win_src_distribution, add extra myTest.dsp to be copied into distributions as a fix for BUG#999
2003-09-15 17:39:50 -04:00
monty@narttu.mysql.fi
4b3b4b9250
merge
2003-09-03 19:53:08 +03:00
kostja@oak.local
711a3f6806
Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into oak.local:/home/kostja/mysql/mysql-4.1-root
2003-09-03 16:44:40 +04:00
dlenev@dlenev.mshome
bd49884c19
Added automatically created SSL certificates from mysql-test/std_data
...
to ignore list.
2003-09-03 12:19:30 +04:00
monty@narttu.mysql.fi
77a70a0a24
merge with 4.0.15
2003-08-29 13:44:35 +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