kent@mysql.com
2205d1b8d5
mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln:
...
Added "client/mysqlslap"
mysqlslap.vcproj, mysqlslap.def:
new file
2005-12-19 01:12:11 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
7ded800078
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-12-13 19:46:35 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
13d7abe06f
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-12-13 18:44:20 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
32466b14fb
Minor Netware specific changes.
2005-12-13 18:30:10 +02:00
kent@mysql.com
a6849a9238
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2005-12-12 16:12:36 +01:00
kent@mysql.com
cf57f12407
make_win_src_distribution.sh:
...
Removed Visual Studio 6 project files, as they are not maintained
2005-12-11 09:21:13 +01:00
jimw@mysql.com
b3ba66495c
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2005-11-30 13:12:35 -08:00
jimw@mysql.com
085e7784b0
Merge mysql.com:/home/jimw/my/mysql-5.0-14610
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-30 13:10:50 -08:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-11-23 14:57:00 +02:00
joerg@mysql.com
3a7d81258c
Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/clone-5.1
2005-11-23 11:24:52 +01:00
kent@mysql.com
bcdd552d6e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
2005-11-19 11:20:52 +01:00
kent@mysql.com
bd80dc6c2e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-19 11:11:09 +01:00
guilhem@mysql.com
2f95fc2701
Merge mysql.com:/home/mysql_src/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
2005-11-18 16:38:01 +01:00
joerg@mysql.com
ebb6552b1c
scripts/make_binary_distribution.sh
...
Adapt to the directory hierarchy change in 5.1, "ndb" -> "storage/ndb".
2005-11-11 18:48:53 +01:00
jimw@mysql.com
bb742ae0fa
Don't try to mysqlhotcopy the INFORMATION_SCHEMA database. (Bug #14610 )
2005-11-10 17:05:36 -08:00
jimw@mysql.com
3506e1e58b
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-10 11:24:57 -08:00
jimw@mysql.com
56a56a789a
Merge mysql.com:/home/jimw/my/mysql-4.1-14469
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-11-10 11:23:52 -08:00
svoj@poseidon.ndb.mysql.com
3791197f0d
WL#2575 - Fulltext: Parser plugin for FTS
...
WL#2763 - MySQL plugin interface: step 1
Manual merge from CNET tree.
2005-11-06 13:13:06 +01:00
monty@mysql.com
a6f5375cb0
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
kent@mysql.com
4742f585b1
Merge
2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-04 01:15:35 +01:00
jimw@mysql.com
bb34222087
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-01 12:15:08 -08:00
jimw@mysql.com
6894cbc9eb
Fix harmless typo in mysql_fix_privilege_tables.sql (Bug #14469 )
2005-10-31 15:56:52 -08:00
jimw@mysql.com
1d9bfbf7d2
Handle decision to use mysqld-max over mysqld within mysqld_safe
...
even when --ledir option is specified. (Bug #13774 )
2005-10-31 11:15:44 -08:00
kent@mysql.com
85ab53357b
thread_registry.h, thread_registry.cc:
...
Add explicit Thread_info::Thread_info() and move both
initializers out of class definition, to solve link
problem on QNX
Makefile.am:
Preserve executable mode on scripts
make_binary_distribution.sh:
Copy *.imtest files
2005-10-16 06:49:19 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
63ac3040a8
Small fixes for Netware.
2005-10-14 08:45:41 +03:00
bar@mysql.com
fee9c13568
Merge abarkov@bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b9278
2005-10-13 22:18:35 +05:00
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-10-13 18:23:53 +03:00
jani@ua141d10.elisa.omakaista.fi
5dad171618
Some Netware related fixes and fixes for Metrowerks compiler.
2005-10-13 17:21:14 +03:00
bar@mysql.com
c229567887
Merge abarkov@bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b9278
2005-10-13 19:19:05 +05:00
bar@mysql.com
39b0712cf7
type_binary.result, type_binary.test:
...
new file
mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh:
Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
Many files:
Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
Adding true BINARY/VARBINARY: new pad_char structure member.
ctype-bin.c:
Adding true BINARY/VARBINARY: new pad_char structure member.
New strnxfrm, with two trailing length bytes.
field.cc:
Adding true BINARY/VARBINARY.
2005-10-13 19:16:19 +05:00
kent@mysql.com
94ea4f188a
make_binary_distribution.sh:
...
Copy *.cnf files in mysql-test/std_data/
Makefile.am:
Added std_data/*.cnf to copy ndb config
2005-10-12 22:49:33 +02:00
lenz@mysql.com
c0aa09884a
Merge mysql.com:/space/my/mysql-4.1-build
...
into mysql.com:/space/my/mysql-5.0-build
2005-10-11 21:54:23 +02:00
lenz@mysql.com
9b4ab5931a
Merge mysql.com:/space/my/mysql-4.0-build
...
into mysql.com:/space/my/mysql-4.1-build
2005-10-11 21:24:01 +02:00
lenz@mysql.com
8782f5a0e3
- added Docs/manual.chm to the windows source distribution (BUG#13899)
2005-10-11 21:16:08 +02:00
lars@mysql.com
57f36732ca
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/mysql-5.0
2005-10-10 17:50:19 +02:00
serg@serg.mylan
2e2d18b7cf
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2005-10-09 19:10:19 +02:00
kent@mysql.com
33f38f7ed8
make_binary_distribution.sh:
...
Copy zlib.a and valgrind.supp if exists
Copy disabled.def
2005-10-07 13:08:07 +02:00
kent@mysql.com
c68c4f3cb7
Merge
2005-10-07 12:55:00 +02:00
kent@mysql.com
ae62a58817
make_binary_distribution.sh:
...
Corrected platform name output
Services.cpp:
Dont print null address (back port from 5.0)
2005-10-07 01:56:11 +02:00
kent@mysql.com
87016b438c
make_binary_distribution.sh:
...
Reintroduced --machine
Better sh compatibility, "for i ; do" is not portable
2005-10-06 22:57:13 +02:00
kent@mysql.com
52181cc810
make_binary_distribution.sh:
...
Replaced --machine with --platform
General code cleanup
2005-10-06 18:00:23 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0
Merge
2005-10-06 10:54:07 +02:00
anozdrin@mysql.com
95327abcc2
Make mysql_fix_privilege_tables.sh not dependent on the current directory.
2005-10-05 01:08:22 +04:00
kent@mysql.com
21cf818a8d
Many files:
...
New VC7 project files
des_key_file.cc:
Visual C++ wants '"' for local include
mysql.cc:
Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
Added to convince VS .Net generate a lib for mysqlserver
2005-09-30 14:03:55 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b97a77e824
Fix for Bug#12629, "mysqld_multi produces syntax error".
...
Quote here is unneccessary as it should all be handled in
quote_opt_arg().
2005-09-30 14:02:31 +03:00
serg@serg.mylan
69909c460a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-30 09:40:49 +02:00
msvensson@neptunus.(none)
13161c2a84
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 15:32:05 +02:00
kent@mysql.com
5b79dbb2eb
mysql_config.sh:
...
Added -lz to link using libmysqld
2005-09-28 13:39:28 +02:00
msvensson@neptunus.(none)
fbf4a5e079
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-28 11:34:53 +02:00