monty@mysql.com
3b14ba64fd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2004-12-12 18:44:15 +02:00
gluh@gluh.mysql.r18.ru
58e75f6f24
fix according to review
2004-12-10 18:25:12 +03:00
gluh@gluh.mysql.r18.ru
2e912bbbe8
Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
...
mysqldump skips information_schema db
'use' now can use information_schema db
changed value of column 'Null' to 'NO' if column is not nullable
2004-12-10 12:07:11 +03:00
monty@mysql.com
36d11d950a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2004-12-10 02:58:39 +02:00
guilhem@mysql.com
eac128ef2d
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2004-12-09 15:42:06 +01:00
guilhem@mysql.com
1cbc904c59
Changing the default of libmysqlclient : it's now NO reconnection.
...
All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
and fixes BUG#2555.
2004-12-09 14:44:10 +01:00
monty@mysql.com
1316954b3f
Fixed that mysql-test-run --ps-protocol works with system_mysql_db_fix.test
2004-12-08 01:17:52 +02:00
monty@mysql.com
77207d19f2
Merge with new VARCHAR code
2004-12-06 19:18:35 +02:00
monty@mysql.com
0de4777187
Merge with 4.1
2004-12-06 11:38:56 +02:00
monty@mysql.com
67ce247965
Add support for up to VARCHAR (size up to 65535)
...
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
2004-12-06 02:00:37 +02:00
tsmith@build.mysql.com
88f48f33c5
Merge bk-internal:/home/bk/mysql-4.1
...
into build.mysql.com:/users/tsmith/m/41/b
2004-12-02 15:33:12 +01:00
konstantin@mysql.com
dc4f845103
Fix for Bug#6377 "Password Generation Discrepancy"
2004-12-02 14:28:59 +03:00
brian@avenger.(none)
b85f4677d5
Merge for Matt for Innodb bug.
2004-11-30 10:10:40 -08:00
ram@gw.mysql.r18.ru
0ca8fd2ee9
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101
2004-11-30 12:27:17 +04:00
tsmith@build.mysql.com
c02e81b018
Merge
2004-11-30 03:24:17 +01:00
tsmith@build.mysql.com
6968523df1
mysqldump.c:
...
minor cleanup to the --order-by-primary feature code
2004-11-30 02:26:24 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
57b30a1eef
Applied some patches for Netware.
2004-11-29 18:32:52 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b09068f8a4
Applied some Netware related patches.
2004-11-29 17:41:47 +02:00
brian@avenger.(none)
2b0b6ec20c
Merging 4.1 to 5.0
2004-11-24 12:34:44 -08:00
joerg@mysql.com
9e467cc009
Merge from 4.0 for immediate use in the current 5.0 builds.
2004-11-24 17:32:11 +01:00
joerg@mysql.com
c356b37b0c
Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/mysql-4.1
2004-11-24 15:29:35 +01:00
joerg@mysql.com
cf722bc3f5
Ensure consistent sources up to 5.0 where a C++ problem occurs.
2004-11-24 15:24:23 +01:00
joreland@mysql.com
5ac41f60e3
merge error
2004-11-24 12:33:09 +01:00
joreland@mysql.com
41222efa7b
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/wl2077
2004-11-22 08:20:34 +01:00
paul@kite-hub.kitebird.com
4720cc1fae
Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2004-11-20 15:22:57 -06:00
serg@serg.mylan
2d3dd65cc1
merged
2004-11-20 18:36:41 +01:00
paul@kite-hub.kitebird.com
59c0102e23
mysql.cc:
...
Tweak some help text.
2004-11-19 14:53:40 -06:00
petr@mysql.com
bc0f2ea51c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/cps/mysql/trees/mysql-4.1
2004-11-19 20:21:28 +03:00
tomas@poseidon.ndb.mysql.com
65d31b3e92
Makefile.am, mysqladmin.cc:
...
reverting linking ndbclisnt to mysqladmin.cc
2004-11-19 17:21:27 +00:00
petr@mysql.com
edc868e397
Added --disable-log-bin option to the mysqlbinlog (WL1787)
2004-11-19 18:35:36 +03:00
tomas@poseidon.ndb.mysql.com
bcd7f9a907
Merge
2004-11-18 22:06:51 +00:00
tomas@poseidon.ndb.mysql.com
3f36910639
fix for mysqladmin link problem
...
.c -> .cc
fix source dist problem for ndb
fix type check problem for mysqladmin
2004-11-18 20:28:36 +00:00
tomas@poseidon.ndb.mysql.com
7ec0239162
changed mysqladmin.c to mysqladmin.cc
...
no need for dvlags to have DEFINE_CXA_PURE_VIRTUAL anymore
aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
removed all dependencies of LocalConfig, except for mgmapi internals
enabled multiple management servrs to fetch data configurations from eachother
2004-11-18 18:38:38 +00:00
serg@serg.mylan
e68bd85b77
merged
2004-11-17 18:04:36 +01:00
tsmith@build.mysql.com
decd710b59
Add --order-by-primary option, which adds an ORDER BY
...
clause the the SELECT statement used to dump the data
for any table which has a primary or unique key. This
is useful for dumping MyISAM tables which will be later
imported into InnoDB tables.
2004-11-16 23:45:24 +01:00
tomas@poseidon.ndb.mysql.com
4d89516226
Makefile.am:
...
changed link order to fix linking problems
2004-11-16 09:10:29 +00:00
guilhem@mysql.com
9d54779de5
Merge mysql.com:/home/mysql_src/mysql-4.1-clean
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2004-11-16 00:14:46 +01:00
guilhem@mysql.com
fb8b9ca6a4
compilation failures fixes. mysqldump now compiles on AIX 4.3.
2004-11-16 00:10:32 +01:00
guilhem@mysql.com
e38dae0bc1
Merge
2004-11-16 00:04:12 +01:00
guilhem@mysql.com
99417e07eb
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-15 23:52:04 +01:00
tomas@poseidon.ndb.mysql.com
16e34bd27d
changed compile order, mysqladmin with ndbcluster extensions needs ndb to be compiled first
...
added libs variable for ndbmgmclient used by mysqladmin
add linkage with @ndb_mgmclient_libs@
additional options for ndbcluster
added support for managing the cluster to mysqladmin
added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
2004-11-15 12:40:32 +00:00
guilhem@mysql.com
e8049f0649
Try to lower the probability of a stall of mysqldump AND most client connections, when mysqldump does a FLUSH TABLES WITH READ LOCK
...
(doing FLUSH TABLES first).
2004-11-14 17:45:37 +01:00
guilhem@mysql.com
8387d0000c
allowing --master-data without arg to be compatible with < 4.1.8 mysqldump.
2004-11-14 17:18:31 +01:00
monty@mysql.com
addd1a0da8
Merge with 4.1
2004-11-12 19:58:24 +02:00
monty@mysql.com
e9c3887b58
After merge fixes
2004-11-12 17:44:17 +02:00
pem@mysql.comhem.se
232abd5f6e
Fixed merge bug(?) in mysqldump.c.
2004-11-12 13:02:17 +01:00
monty@mysql.com
9252656d49
merge with 4.0
2004-11-12 11:17:53 +02:00
brian@avenger.(none)
1d8a6a06a5
Merge avenger.(none):/export/brian/mysql/test/4.1
...
into avenger.(none):/export/brian/mysql/test/5.0
2004-11-11 22:12:01 -08:00
brian@avenger.(none)
3e4ca194f8
Mainly resolving Guilhem's 4.1 patch to 5.0
2004-11-11 19:01:46 -08:00
brian@avenger.(none)
f05daf02ba
Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)
2004-11-11 18:58:57 -08:00