igor@rurik.mysql.com
f928a0c499
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2003-06-12 06:20:11 -07:00
paul@ice.snake.net
38268be444
ft_update.c:
...
Fix parse error per serg instructions.
2003-06-11 16:27:26 -05:00
hf@deer.(none)
8fea9b451a
Bugfix for #614
...
Item_extract needs special implementation for eq().
Item_func::eq doesn't work correctly because we have to compare
Item_extract::int_type parameters also
We need to propagate this to 4.1
2003-06-11 20:09:37 +05:00
carsten@tsort.bitbybit.dk
725d5fdc43
Some error messages re. BLOBs are true for TEXTs as well
2003-06-09 15:22:28 +02:00
miguel@sartre.local
39660b1f24
Translation updated
2003-06-08 02:53:41 -04:00
monty@narttu.mysql.fi
dad0664579
merge with public tree
2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
40109c574a
Merge with 4.0.13
2003-06-04 19:21:51 +03:00
hf@deer.(none)
e5428b2fe9
Lots of conflicts resolved
2003-05-28 13:54:58 +05:00
vva@mysql.r18.ru
55d4e55f7c
fixed small merge bug
2003-05-27 16:58:57 +05:00
jani@ua126d19.elisa.omakaista.fi
3542dad33f
Merge jani@192.168.0.2:/my/mysql-4.0
...
into ua126d19.elisa.omakaista.fi:/home/my/bk/mysql-4.0
2003-05-26 15:50:05 +03:00
administrador@light.hegel.local
cded59cbd7
Translation English -> Protuguese
2003-05-23 03:06:00 -03:00
monty@narttu.mysql.fi
dd2b7918cd
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
mysqldev@build.mysql2.com
eb3ba82ec6
my_global.h:
...
- QNX 6.2.1 actually defines HAVE_RINT
- fixed rint(A) #define as it was causing compile errors on QNX
2003-05-16 13:03:47 +02:00
igor@rurik.mysql.com
a6c634b328
logging_ok:
...
Logging to logging@openlogging.org accepted
mf_keycache.c:
Fixed a deadlock when reading from an index file fails.
2003-05-13 12:06:34 -07:00
serg@serg.mylan
0f653b6fed
make compilation to work w/o InnoDB as well
2003-04-30 14:15:24 +02:00
serg@serg.mylan
d13e4fc532
CURRENT_USER() and "access denied" error messages now report hostname exactly as it was specified in the GRANT command (with wildcards, that is)
2003-04-29 00:15:18 +02:00
serg@serg.mylan
30ae0cdcc7
Merge bk-internal:/home/bk/mysql-3.23/
...
into serg.mylan:/usr/home/serg/Abk/mysql
2003-04-28 20:09:38 +02:00
bell@laptop.sanja.is.com.ua
7f51b1d3e4
Documentation fixed according bug 185 fixing patch (1.1551 03/04/23 00:
2003-04-28 20:40:41 +03:00
bell@laptop.sanja.is.com.ua
ed1b48185a
fixed incorrect number of affected rows in REPLACE...SELECT... (bug 130)
2003-04-26 15:53:27 +03:00
mmatthew@markslaptop.
44c8a1b012
config-win.h:
...
Enable 'LOAD LOCAL INFILE', for parity with unix binaries.
2003-04-23 13:43:31 -05:00
peterg@mysql.com
e918ea5488
Modify PeterG's internals documentation per Monty. Added
...
more detailed explanation of record header and column
storage.
2003-04-23 11:43:30 -07:00
vva@eagle.mysql.r18.ru
f237ae457a
fux bug #183
2003-04-03 20:26:13 -04:00
vva@eagle.mysql.r18.ru
af61a4c7fa
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-03-25 19:58:40 -04:00
vva@eagle.mysql.r18.ru
e1173e70a5
fix bug with parameters of LOAD DATA INFILE in exec_event
2003-03-25 19:57:38 -04:00
guilhem@mysql.com
45e3de8f32
Do not silently do RESET MASTER when one does 'mysqldump --master-data' ;
...
only do it if the user specifies --delete-master-logs (new option).
Safer + fixes bug #159 .
2003-03-19 15:16:51 +01:00
monty@narttu.mysql.fi
a434bca704
Merge with 4.0
2003-03-16 19:17:54 +02:00
mysql@home.(none)
c6efa7a8b7
New function my_charset_same()
2003-03-16 17:19:24 +04:00
root@home.(none)
f71a7e4b05
set_default_charset() is not used anymore
...
Some system_charset_info were removed
2003-03-16 10:56:14 +04:00
pgulutzan@linux.local
eda388ed3b
Added PeterG's new internals documenation.
2003-03-12 21:35:57 -08:00
gluh@gluh.mysql.r18.ru
6253889109
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.last
2003-03-11 13:52:19 +04:00
gluh@gluh.mysql.r18.ru
00314bfd88
Openssl test
2003-03-11 13:41:53 +04:00
hf@deer.mysql.r18.ru
2be2914a82
Handling of log-error added in embedded server
2003-03-10 14:06:21 +04:00
wax@kishkin.ru
15e69055a1
URGENT fixed bug in shared memory (handler_count)
2003-03-02 19:35:37 +05:00
guilhem@mysql.com
10735252ee
When the SQL thread cannot read an event from the relay log
...
("Event too big" etc), stop this thread instead of going on
with the next event, which would certainly lead to slave's data
corruption.
2003-03-02 00:34:44 +01:00
papa@gbichot.local
b9d94d2b6f
Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client.
...
Disabling can be safer when the server silently dies & restarts.
This is for SCRUM task #727 .
2003-03-01 23:34:34 +01:00
monty@narttu.mysql.fi
9a46698e1e
Merge with 4.0.11
2003-02-26 01:03:47 +02:00
igor@hundin.mysql.fi
726e59827a
opt_sum.cc:
...
Correction for min/max optimization of queries with outer joins
2003-02-23 04:27:03 +02:00
guilhem@mysql.com
e91a9c79ba
Test's result update because std_data/words.dat has been lengthened by 500 bytes.
...
Increased some tests' robustness a bit :
- Added RESET MASTER to all tests who do SHOW BINLOG EVENTS, to make them independent from previous tests.
- Added save_master_pos to these tests to wait for the slave to start before purging its binary logs.
2003-02-21 23:38:56 +01:00
greg@mysql.com
b080118808
mwldnlm, mwenv, mwccnlm, mwasmnlm, nwconfigure, nwbootstrap:
...
new file
2003-02-18 17:48:04 -05:00
monty@mashka.mysql.fi
023d6dd39b
Merge with 4.0.11
2003-02-04 21:52:14 +02:00
lenz@mysql.com
2f8ed79215
- really deleted makefile.w32 to resolve a namespace conflict on
...
case-insensitive File Systems (e.g. Mac OS X)
2003-02-03 14:39:15 +01:00
gweir@work.mysql.com
46e3b6157b
Many files:
...
new file
Makefile.am:
Changes from Novell diff
2003-02-01 00:42:26 +01:00
bell@sanja.is.com.ua
c6beb583f6
fixed functions to be able work with group function as argument
...
made bisone 1.75 compatible code
2003-01-29 10:38:56 +02:00
igor@hundin.mysql.fi
6fea54dd8d
my_pthread.h:
...
Missing merge in changeset 1.1435
2003-01-28 05:34:32 +02:00
venu@hundin.mysql.fi
961d2c3e89
Introduced a scalable key cache management.
...
Added some fields to the st_my_thread_var structure to be
able to link such structures into a list.
2003-01-28 03:37:57 +02:00
hf@deer.mysql.r18.ru
389680e04e
Conflicts resolving
2003-01-20 18:59:45 +04:00
gluh@gluh.mysql.r18.ru
6ac602142a
Replication: Optimize away string.append
...
Fixed problem with replication LOAD DATA INFILE when using --old-rpl-compat
Fixed rpl_temporary test
2003-01-17 16:39:29 +04:00
hf@deer.mysql.r18.ru
96089e2b3a
resolving conflicts
2003-01-15 13:15:35 +04:00
monty@mashka.mysql.fi
f9772317ee
merge
2003-01-04 15:40:55 +02:00
ram@mysql.r18.ru
8009c16a34
Fix for the QUOTE() function.
2003-01-03 19:46:15 +04:00
monty@mashka.mysql.fi
07daf3169e
Merge with 4.0.8
2003-01-03 00:04:33 +02:00
salle@banica.(none)
a2e82f5ff7
Removed ^M
...
Reported by Georg Richter as it brokes his build with mipspro
2002-12-27 18:13:32 +02:00
jani@dsl-kpogw4gb5.dial.inet.fi
a684fa70ed
mysql multiline comment, by Sergey Gluhov.
2002-12-24 00:53:07 +02:00
hf@deer.mysql.r18.ru
05de9d5fa9
Spatial-related fixes
2002-12-18 17:17:35 +04:00
hf@deer.mysql.r18.ru
c1e69d2cca
Merging
2002-12-16 18:58:55 +04:00
vva@eagle.mysql.r18.ru
4963f1c6c9
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
...
into eagle.mysql.r18.ru:/home/vva/work/SOUNDS_LIKE/4.1
2002-12-14 02:18:58 +04:00
vva@eagle.mysql.r18.ru
7050b5eb4d
add 'SOUNDS LIKE' syntax
2002-12-14 02:18:14 +04:00
ranger@regul.home.lan
8a46cc3868
- Fix handling of suffix option
...
- Replace function 'check_reserved_words' with correct one
2002-12-12 11:06:55 +02:00
hf@deer.mysql.r18.ru
dcb5293576
Some fixes
2002-12-12 12:16:34 +04:00
zak@mysql.com
f666bfcc85
A set of improvements to the German localized error messages
2002-12-11 20:17:15 -07:00
walrus@kishkin.ru
24bbcd92bc
merge Ranger's patches to crash-me, add new tests ( DEFAULT VALUES )
...
to crash-me
2002-12-10 18:40:38 +05:00
hf@genie.(none)
5e8b27c0d3
Pull conflicts resolutions
2002-11-29 12:35:48 +04:00
monty@mashka.mysql.fi
dac6498f9b
Merge with 4.0
2002-11-21 15:56:48 +02:00
wax@mysql.com
e91d1b2cbe
Add shared memory protocol and option --protocol
2002-11-15 00:16:30 +05:00
monty@mashka.mysql.fi
aa67a79632
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
2002-11-14 12:35:33 +02:00
monty@mashka.mysql.fi
7a70332836
Portability fix when using -DBIG_TABLES
2002-11-14 12:21:36 +02:00
serg@serg.mysql.com
31fa2c5084
merged
2002-11-13 23:38:19 +01:00
salle@geopard.(none)
abac2ef1e5
Merge akeremidarski@work.mysql.com:/home/bk/mysql
...
into geopard.(none):/storage/bk/mysql-3.23
2002-11-11 10:52:39 +02:00
serg@serg.mysql.com
14f819fe96
fixing gone file ONCE AGAIN
2002-11-09 13:54:27 +01:00
serg@serg.mysql.com
2dd302de62
fixed gone file ONCE AGAIN
2002-11-08 23:34:17 +01:00
serg@serg.mysql.com
4802cda2e9
fixing gone file ONCE AGAIN
2002-11-08 23:24:38 +01:00
walrus@mysql.com
b841b4e8cd
Merge akishkin@work.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/walrus/bk/40
2002-11-09 01:16:40 +05:00
hf@genie.(none)
25bd1e9a37
Merged by hands
2002-11-07 12:20:08 +04:00
bk@admin.bk
6efaffe407
BK automatic LOD removal.
2002-11-07 11:20:17 +04:00
monty@butch.
a2bdf9265f
Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.
2002-11-07 03:54:00 +02:00
walrus@mysql.com
a8ec12a499
Merge akishkin@work.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/walrus/bk/40
2002-11-05 00:26:45 +05:00
gluh@gluh.(none)
808d87f810
Some changes for SSL
2002-10-30 18:27:15 +04:00
nick@mysql.com
cb1d72e44d
set my checkout behavior to bk -r get
2002-10-29 17:34:17 -07:00
serg@serg.mysql.com
5e455f2e81
fixing after automerge with 3.23
2002-10-26 20:04:07 +00:00
serg@serg.mysql.com
1a1cafce63
merged
2002-10-25 22:07:04 +00:00
serg@serg.mysql.com
dede6634f6
merged
2002-10-25 21:15:52 +00:00
walrus@mysql.com
7f1263f130
Merge
2002-10-24 23:09:16 +06:00
bk@admin.bk
28ba53c2fe
BK automatic LOD removal.
2002-10-24 21:33:28 +06:00
salle@geopard.(none)
c0a1f2d91b
Merge akeremidarski@work.mysql.com:/home/bk/mysql
...
into geopard.(none):/storage/bk/mysql-3.23
2002-10-23 23:03:59 +03:00
bk@admin.bk
39208b2fae
BK automatic LOD removal.
2002-10-23 23:01:49 +03:00
hf@genie.(none)
893cc550e0
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.0
...
into genie.(none):/home/hf/work/04
2002-10-21 09:57:53 +05:00
hf@genie.(none)
8744bd0064
Embedded server bugfix
2002-10-21 09:56:30 +05:00
bk@admin.bk
ca08ed522c
BK automatic LOD removal.
2002-10-20 21:43:24 +02:00
bk@admin.bk
ba5feac4fd
BK automatic LOD removal.
2002-10-20 21:23:21 +02:00
bk@admin.bk
c3e3f73a50
BK automatic LOD removal.
2002-10-20 21:16:05 +02:00
hf@genie.(none)
8a88791fb1
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
...
into genie.(none):/home/hf/work/mysql-4.1
2002-10-18 15:55:21 +05:00
monty@hundin.mysql.fi
fbf6ab4465
merge with 4.0.5
2002-10-16 19:30:24 +03:00
pem@mysql.com
e1303c7b3c
Merge pmartin@work.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/pem/work/mysql-4.0
2002-10-15 16:12:53 +02:00
miguel@hegel.br
73506bb612
Added optional services
2002-10-15 02:04:43 -02:00
miguel@light.
d50045ede7
Added verification of the Administrator user when installing the service
2002-10-14 23:16:21 -03:00
serg@serg.mysql.com
fcb8bc061d
merged
2002-10-14 11:36:48 +00:00
pem@mysql.com
8bd61c3fce
Task 430: Allowing braces in joins by simply removing them.
...
This is a simple fix, allowing a join_table_list in the right reduction of a
normal_join sequence, instead of just a join_table. This makes things like
"t1, (t2 left join t3)" work, but it also allows "join" and "cross join" instead
of ",".
This should fix the bug reported as:
Subject: ODBC SQL syntax issue
From: Ivan Vazharov
Date: Mon, 30 Sep 2002 12:02:42 +0200
2002-10-12 11:07:54 +02:00
nick@mysql.com
ec04d28468
fixed race that caused sig11s on simultaneous FLUSH LOGS
...
(possibly also fixes binlog filename corruption problems--hasn't
been reproduced since)
2002-10-07 15:42:10 -06:00
hf@genie.(none)
55866b0615
Huge pull
2002-10-07 15:38:07 +05:00
mwagner@work.mysql.com
ccedc9efa4
manual.texi Added docs about how to clone public 4.1 repository
2002-10-07 11:32:10 +02:00
monty@mashka.mysql.fi
2e52a69b12
Merge work:/my/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
2002-10-03 16:56:09 +03:00
ram@mysql.r18.ru
d5ca940a4b
Merge mysql.r18.ru:/usr/home/ram/mysql-4.1.last
...
into mysql.r18.ru:/usr/home/ram/mysql-4.1
2002-10-03 17:26:05 +05:00
ram@mysql.r18.ru
032a4a927a
Additional key segment (HA_KEYTYPE_END) creation has been moved from handler to hp_create.c
2002-10-03 14:55:02 +05:00
Administrador@light.
d8a400da22
Update for Visual Studio Projects Files
2002-10-02 18:37:28 -03:00
monty@mashka.mysql.fi
0f39457613
Merge with 4.0.4
2002-10-02 17:55:12 +03:00
tfr@beta.frontier86.ee
9d8ec46b6c
manual.texi:
...
Clean out 'Graphical clients' section of the contributed software section
2002-09-27 00:33:48 +03:00
serg@build.mysql2.com
88ce8f68ec
Merge
2002-09-23 16:39:18 +02:00
serg@build.mysql2.com
140397d424
configure.in:
...
static nss linkingg issue
2002-09-23 16:39:17 +02:00
hf@genie.(none)
c8627ff18d
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
...
into genie.(none):/home/hf/work/mysql-4.1
2002-09-17 10:50:25 +05:00
vva@genie.(none)
098f4afa91
fix bug for slave..
2002-09-09 14:40:24 +05:00
monty@rescue.
cf640b91a6
Merge work:/home/bk/mysql-4.0 into rescue.:/my/bk/mysql-4.0
2002-09-05 17:17:21 +03:00
heikki@rescue.
e03d5bdca6
ha_innodb.cc:
...
Fix a typo in last night's push
2002-09-05 14:22:51 +03:00
monty@rescue.
d84c0990fd
Merge work:/home/bk/mysql-4.0 into rescue.:/my/bk/mysql-4.0
2002-09-05 14:00:05 +03:00
monty@rescue.
9bf7011c6f
Extend InnoDB key length to 1024
2002-09-05 13:47:41 +03:00
heikki@work.mysql.com
516cc0bd61
ha_innodb.cc Test a new clone
2002-09-04 18:00:58 +02:00
hf@bisonxp.(none)
6e4eda354c
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
...
into bisonxp.(none):/home/hf/work/mysql-4.1
2002-09-02 17:22:41 +05:00
serg@serg.mysql.com
b962da9aab
merged
2002-08-31 23:38:10 +00:00
monty@narttu.mysql.fi
7134ffec21
Merge with 4.0.3
...
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
2002-08-30 12:40:40 +03:00
nick@mysql.com
89ea5ee620
Added sync_slave_with_master [connection].
...
Equivalent to:
save_master_pos; connection slave; sync_with_master;
2002-08-29 12:08:54 -06:00
paul@teton.kitebird.com
0970e25d26
manual.texi minor fix to 3.23.53 change note
2002-08-28 10:00:48 -05:00
miguel@hegel.br
8c71a53b9c
Small fixes
2002-08-27 10:55:12 -03:00
bar@bar.mysql.r18.ru
12bdcaca55
Fix
2002-08-14 13:08:09 +05:00
serg@sergbook.mysql.com
545f616154
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-08-13 21:15:14 +02:00
bar@bar.mysql.r18.ru
9dd576c3f8
"make clean" problem fix
2002-08-13 19:13:23 +05:00
serg@sergbook.mysql.com
4dfe0a77c9
"ungone" include/global.h, though deleted, otherwise bk cannot pull from 3.23 (where this fiule is legally present)
2002-08-13 15:26:57 +02:00
serg@sergbook.mysql.com
35255fa72b
"ungone" files, that were some time ago erroneously (?) marked as "gone"
...
now it should be safe to do 'bk rmgone' to make the tree ~25M less :)
2002-08-12 16:06:50 +02:00
arjen@fred.bitbike.com
4861939801
Various little docs fixups.
2002-08-12 14:55:07 +10:00
ram@ram.(none)
b7403f3d84
new QUOTE() fuction has been added
2002-08-08 20:25:53 +05:00
monty@mashka.mysql.fi
1bb7665a9c
merge
2002-08-08 03:29:36 +03:00
monty@narttu.mysql.fi
bea3a43b20
merge
2002-08-05 22:18:39 +03:00
monty@narttu.mysql.fi
c0a6890292
Added some missing mutex_locks() when manipulating the table cache.
...
This should fix some possible table cache corruptions when doing
OPTIMIZE or REPAIR table when other threads are opening new tables.
2002-08-05 18:50:38 +03:00
salle@geopard.online.bg
de7b601d11
Two small patches proposed by Paul DuBois
2002-08-03 19:48:45 +03:00
hf@bisonxp.(none)
253c641900
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
...
into bisonxp.(none):/home/hf/work/mysql-4.1
2002-08-03 20:26:44 +05:00
nick@mysql.com
0c481e7b44
Some updates to the logging section.
2002-08-03 00:54:19 -06:00
bar@bar.udmsearch.izhnet.ru
92f3644480
Rows order has been made more explicit
2002-07-29 17:34:20 +05:00
monty@mashka.mysql.fi
bc035c71f1
Merge with 3.23.51
...
Fixed wrong usage of sprintf() in ha_innodb.cc
2002-07-25 22:46:28 +03:00
WAX@sergbook.mysql.com
1966f4b839
CREATE ... SELECT extension (WL 317)
2002-07-20 16:36:56 +02:00
peter@mysql.com
7213fd028e
Merge changes in docs do go further
2002-07-19 00:06:33 +04:00
salle@geopard.online.bg
b472f401b1
Some
...
C++ comments cleanup
2002-07-17 15:17:20 +03:00
peter@mysql.com
684bf18e4d
Arjens LOG functions changes with small changes and tests added to mysql-test
2002-07-17 12:11:48 +04:00
bar@bar.udmsearch.izhnet.ru
79536e0006
Brazilian Portuguesse messages
2002-07-16 16:48:56 +05:00
arjen@fred.bitbike.com
c2baeafbd3
My preferred bk checkout option.
2002-07-16 08:22:45 +10:00
ram@ram.(none)
5d62bde738
Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
...
into ram.(none):/home/ram/work/mysql-4.1.spatial
2002-07-10 12:46:01 +05:00
zgreant@mysql.com
d44f1a4f9d
Minor typo corrections and documenation improvements.
2002-07-09 22:14:07 -06:00
hf@bisonxp.(none)
d8c94e942b
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
...
into bisonxp.(none):/home/hf/work/mysql-4.1
2002-07-09 10:42:24 +05:00
hf@bisonxp.(none)
bc7e8b0915
Minor fixes
2002-07-09 10:39:22 +05:00
walrus@mysql.com
86a01b39ef
server-cfg.sh remove %smds, remove conversation from date to int for mysql,
...
server-cfg.sh set bdb as transactional
2002-07-03 07:17:35 +02:00
walrus@mysql.com
26f4536f7e
server-cfg.sh Remove smds, remove coversaton from date to int for mysql,
...
server-cfg.sh add transactional for bdb
2002-07-02 09:57:40 +02:00
serg@sergbook.mysql.com
6f3772b017
14Mb files removed from BitKeeper/deleted/ and permanently marked as gone.
2002-07-01 01:36:01 +02:00
salle@geopard.(none)
ffd9a80d26
Small comment typo fix
...
This is also my first attempt to commit and push
2002-06-29 18:52:24 +03:00
hf@bison.(none)
cc6407f1a5
Resolving of conflicts from pull
2002-06-17 17:14:20 +05:00
hf@bison.(none)
ede6ba5621
Removing net emulation out of embedded library
2002-06-17 16:24:51 +05:00
monty@mashka.mysql.fi
8d75ff64e1
Portability fix for HPUX
2002-06-17 09:56:27 +03:00
peter@linux.local
f85a002c68
Merge
2002-06-14 15:24:22 +04:00
venu@myvenu.com
75959e6e26
Client-Server Protocol 4.1 changes - Client side:
...
- Support of prepared execution
- Support of Original Table and Column names
- Support of direct transactional API
- And lot of misc handling
(Note that, the pull will not work, unless you have the Server side changes also which will be followed by this commit)
2002-06-12 13:47:32 -07:00
peter@linux.local
89b161d05d
This changeset is mostly new version of previous commit modified according
...
to Monty's code style and optimization comments
2002-06-11 13:37:48 +04:00
monty@mashka.mysql.fi
2aecdd1a91
Big code cleanup/review before 4.0.2 release.
...
(All commit emails since 4.0.1 checked)
This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree.
2002-06-11 11:20:31 +03:00
monty@hundin.mysql.fi
fc8490a111
merge with 4.0 to get last fixes to last merge
2002-06-04 08:29:08 +03:00
tfr@indrek.tfr.cafe.ee
1fe93ceadb
mirrors.texi:
...
Update mirror list
2002-06-03 17:50:12 +02:00
monty@hundin.mysql.fi
f0b28da6f9
merge with 4.0
2002-06-03 12:59:31 +03:00
monty@narttu.
747e8778c9
Portability fix for OSF1
2002-05-27 09:29:26 +03:00
serg@sergbook.mysql.com
c06cc02c5d
Merge work:/home/bk/mysql
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql
2002-05-26 12:59:02 +02:00
serg@sergbook.mysql.com
66b41d19c2
quick fix for some optimizer glitch (it appears as ft+const bug, but it, probably, isn't)
2002-05-25 20:59:50 +02:00
jani@rhols221.arenanet.fi
0c7ea54c9d
Merge work:/home/bk/mysql-4.0
...
into rhols221.arenanet.fi:/home/my/bk/mysql-4.0
2002-05-24 14:09:01 +03:00
jani@rhols221.arenanet.fi
16e3b892a6
Changed ft_dump, ft_eval, ft_test1, mi_test1, myisampack, gen_lex_hash,
...
mysqlmanager from using GNU getopt to use my_getopt.
Changed some files that just included old getopt.h to include
my_getopt.h now.
Fixed a bug in my_print_help() in my_getopt.c.
Made better documentation for option -G in mysql client.
2002-05-24 14:06:58 +03:00
worm@altair.is.lan
dfd2766099
mirrors.texi:
...
added new mirrors
2002-05-24 10:46:19 +03:00
jani@hynda.(none)
c2205c75ca
Changed mysqlbinlog, mysqlmanager-pwgen, mysqlmanagerc, mysqltest,
...
thread_test and isamchk to use my_getopt.
Fixed a bug in my_getopt.
2002-05-22 00:05:05 +03:00
akishkin@work.mysql.com
e9b3f1321e
Merge work.mysql.com:/home/bk/mysql-4.0
...
into work.mysql.com:/home/akishkin/mysql-4.0
2002-05-17 07:09:09 +02:00
akishkin@work.mysql.com
af8585a42c
compile-pentium-gcov Remove optimization, add innodb and bdb
2002-05-17 07:00:52 +02:00
monty@hundin.mysql.fi
f5ed8784a2
merge with 3.23.51
2002-05-16 18:20:49 +03:00
lenz@mysql.com
0fe3b5afbd
Fixed sql_yacc.yy to be compatible with bison 1.31 and above.
...
Made detection of GNU tar a bit more flexible.
Only use /usr/local/mysql-glibc if it actually exists
2002-05-15 11:06:44 +02:00
serg@sergbook.mysql.com
3bcf161611
Merge work:/home/bk/mysql-4.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-05-14 18:00:06 +02:00
serg@sergbook.mysql.com
859fb3e7c7
added --loose to --des-key-file in *.opt for mysql-test not to fail w/o ssl
2002-05-14 16:36:08 +02:00
jani@dsl-jkl1657.dial.inet.fi
4945fd4a05
- Fixed some option types in my_getopt struct in all clients.
...
- Added special option/variable prefix '--loose-' to my_getopt.c
2002-05-11 14:36:34 +03:00
monty@narttu.
31091c3b8b
merge
2002-05-09 06:29:49 +03:00
monty@narttu.
ea206309ef
Update manual information about libstdc++
2002-05-09 06:19:02 +03:00
zak@balfor.local
1405433568
Tiny fix to make the XML generated by the client well-formed.
...
(Thanks to Georg Richter!)
2002-05-08 03:16:58 -06:00
monty@tik.
1dcc450cfb
Remove docs from the bdb distribution
...
Hack to get MIT-pthreads to compile with glibc 2.2
2002-05-07 18:05:15 +03:00
nick@nick.leippe.com
2453d43ab0
Backport of Sasha's fix to 3.23 from 4.0
...
see dev-private email from sasha, subject:
URGENT: rpl_sporadic_master
2002-05-02 18:55:38 -07:00
lenz@mysql.com
1c2d9adbea
Fixed a typo and the wording of the message that is being displayed after "configure" has run
2002-04-26 17:52:50 +02:00
monty@narttu.mysql.fi
de8aba5622
Merge hundin:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0
2002-04-26 14:20:56 +03:00
monty@narttu.mysql.fi
2170b8ffa0
Small manual updates for email list answers
2002-04-26 14:14:01 +03:00
monty@hundin.mysql.fi
2421ba0fb3
Merge hundin.mysql.fi:/my/mysql-3.23
...
into hundin.mysql.fi:/my/bk/mysql-4.0
2002-04-26 10:32:43 +03:00
monty@work.mysql.com
6423437304
Removed copyrighted files from MIT-pthreads
2002-04-26 09:32:42 +02:00
ram@gw.udmsearch.izhnet.ru
b8a12a8cec
MI_KEYSEG -> HA_KEYSEG
...
_mi_key_cmp -> ha_key_cmp
2002-04-25 15:10:29 +05:00
monty@hundin.mysql.fi
727122aadd
merge
2002-04-25 01:16:42 +03:00
lenz@kallisto.mysql.com
40cd4aa27c
Some minor cosmetic/wording corrections in README file
2002-04-23 13:44:56 +02:00
monty@work.mysql.com
794eb03b29
Deleted some old Makefiles
2002-04-17 15:32:28 +02:00
monty@tik.mysql.fi
c987b8bab8
Fixed typo
...
Removed some files from the bitkeeper delete tree.
(To fix problem with duplicate filenames on MacOS X)
2002-04-17 16:06:19 +03:00
monty@hundin.mysql.fi
b5a145d872
merge
2002-04-13 15:34:39 +03:00
Sinisa@sinisa.nasamreza.org
0541b54fb7
libwrap bug fix for Linux only
2002-04-13 13:44:08 +03:00
arjen@george.bitbike.com
fa66d680c2
logging_ok:
...
Logging to logging@openlogging.org accepted
manual.texi:
'migration' not a keyword.
2002-04-09 17:53:38 +10:00
monty@hundin.mysql.fi
6e247490dc
Merge
2002-04-02 19:46:26 +03:00
sinisa@rhols221.adsl.netsonic.fi
254c26da3e
Two bug fixes
2002-03-28 18:35:21 +02:00
monty@hundin.mysql.fi
2faee46284
merge (remove conflicting zip files)
2002-03-27 06:44:23 +02:00
monty@hundin.mysql.fi
727e507bca
merge with 3.23.50
2002-03-27 01:56:10 +02:00
arjen@fred.bitbike.com
5b70bf57a8
Fixup of 3.23.50 Windows named pipe changes in manual.
2002-03-27 07:50:14 +10:00
miguel@hegel.local
26454665d9
Adding the new zlib tree for Windows
2002-03-19 01:08:09 -03:00
miguel@hegel.local
254df5fdd6
Adding the new zlib tree for Windows
2002-03-19 00:26:38 -03:00
zak@balfor.local
9a6cd145a5
Minor changes to allow colspec numbering
2002-03-16 16:18:49 -07:00