brian@brian-akers-computer.local
e24e1350a3
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-06-05 10:43:22 -07:00
sergefp@mysql.com
bd04f52552
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-03 20:54:46 +04:00
monty@mysql.com
70c2256d2f
Merge with 4.0 to get fixes for netware
2004-06-02 00:09:14 +03:00
hf@deer.(none)
12c217bb21
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.ftr
2004-06-01 22:47:28 +05:00
hf@deer.(none)
39f69a2126
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.ftr
2004-06-01 22:37:39 +05:00
jani@a80-186-24-72.elisa-laajakaista.fi
2953c23ab0
Changed --log-warnings to be integer instead of boolean. Given --skip-log-warnings
...
will disable warnings, --log-warnings will increment warning level by one, or the
level can be given as an optional argument. Default level is 1.
Changed aborted connection warning to be logged only if the level is > 1.
2004-06-01 17:29:24 +03:00
sergefp@mysql.com
dc38512390
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-01 17:29:13 +04:00
hf@deer.(none)
38334f62a4
Proposed fix for bug #3412 (embedded server: prepared statement returns
...
empty recordset where some records should be found)
2004-05-28 15:59:29 +05:00
hf@deer.(none)
15ea09b79d
WL#1163 (Make spatial code separable for other parts)
...
--with-geometry and
--with-embedded-privilege-control
configure switches added
2004-05-27 20:31:30 +05:00
dlenev@brandersnatch.localdomain
03b705ff44
Made my_snprintf() behavior snprintf() compatible when printing %x arguments (it should
...
produce hex digits in lower case). (fixed version)
Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays.
Added extra argument to int2str function which controls case of digits you get.
Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str()
function.
Removed unused my_itoa/my_ltoa functions.
2004-05-27 17:54:40 +04:00
monty@mysql.com
dab0b7d415
VC++ portability fix
2004-05-26 21:45:58 +03:00
monty@mysql.com
7d8f8bc77b
Changed prototype of killed_ptr() to make it more portable
...
Applied patches for Netware
2004-05-26 19:12:49 +03:00
brian@brian-akers-computer.local
fee4ed7f1c
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-05-25 14:53:55 -07:00
monty@mysql.com
390d9898f9
merge with 4.0 to get Netware patches and fixes for libmysqld.dll
2004-05-25 22:54:00 +03:00
monty@mysql.com
ca8dbc24ee
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/tmp/skr99/mysql-4.0
2004-05-25 22:01:50 +03:00
monty@mysql.com
f2e1e3ce4c
Added patches from Novell
2004-05-25 22:00:14 +03:00
monty@mysql.com
af44187bff
Merge with 4.0 to get fixes for Windows project files
2004-05-25 02:47:25 +03:00
monty@mysql.com
0babddff40
New MYSQL_SERVER_SUFFIX usage (for easier compilation)
...
Update of VC++ project files.
2004-05-25 02:28:44 +03:00
sergefp@mysql.com
ef260fa754
Merge
2004-05-24 21:13:38 +04:00
brian@brian-akers-computer.local
9c84b9b691
Archive merge
2004-05-22 12:16:49 -07:00
brian@avenger.(none)
467cad0bfc
First commit of archive example. Archive is a simple storage engine that handles inserts and selects.
2004-05-20 18:13:11 -07:00
sergefp@mysql.com
fb17025b3e
WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2)
2004-05-21 04:27:50 +04:00
monty@mysql.com
a4b0ec1ede
Merge with 4.0, mainly to get changes to windows project files
2004-05-20 00:54:52 +03:00
monty@mysql.com
b6188818b1
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-05-19 16:51:03 +03:00
monty@mysql.com
86a966256b
Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
...
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.
2004-05-19 16:38:12 +03:00
guilhem@mysql.com
319f83ef9b
Fix for BUG#3829 "Setting server_id on fly doesn't allow replication to start"
...
(fix by our Harrison Fisk): when one does SET GLOBAL SERVER_ID=x, we must set
server_id_supplied to 1.
2004-05-19 15:03:32 +02:00
sergefp@mysql.com
67ad78cb5d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-05-06 23:02:32 +04:00
monty@mysql.com
a5d8b846fa
after merge fixes
2004-05-05 21:24:21 +03:00
monty@mysql.com
d21d49a32a
Merge with 4.0.19
2004-05-05 17:05:24 +03:00
sergefp@mysql.com
fdfcadc735
Manual merge for WL#1622 code, will need fixes
2004-05-05 16:10:16 +04:00
guilhem@mysql.com
5fcd62a13a
useless fixes for --report-password and --show-slave-auth-info (almost undocumented options),
...
just for beauty of truth.
2004-05-04 16:35:31 +02:00
ingo@mysql.com
c0aad5a1a8
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-wl1700-diff
2004-05-03 16:15:45 +02:00
ingo@mysql.com
5a78b4c746
WL#1700 - Properly count key_blocks_used and key_blocks_current.
...
Introduced a new free blocks list. Free blocks are now re-used before
new blocks are allocated from the pool. There is a new status variable
which can be queried by "show status like key_blocks_unused".
2004-05-03 15:55:21 +02:00
serg@serg.mylan
7df9f7d621
myisam_data_pointer_size
2004-05-01 15:41:59 +02:00
guilhem@mysql.com
3fc39188ec
A new option --replicate-same-server-id to force a slave to execute queries originating from itself
...
(WL#794). This can be of interest in some recovery-from-backup scenarios, and also when you have
two databases in one mysqld, having a certain similarity and you want one db to be updated when the other is
(some sort of trigger).
Plus small fix for BUG#3568 "MySQL server crashes when built --with-debug and CHANGE MASTER +MASTER_POS_WAIT"
2004-04-28 18:24:46 +02:00
sergefp@mysql.com
d4e9522962
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-04-28 19:27:56 +04:00
tomas@mc05.(none)
ecfe6ebb59
mysqld.cc:
...
changed default for nbdcluster to DISABLED
2004-04-19 14:34:07 +02:00
magnus@neptunus.(none)
af263160f2
Fix mysql-test-run to work better with NDB
...
Fix broken string constant in mysqld.cc
2004-04-15 17:30:50 +02:00
magnus@neptunus.(none)
88478c28b1
Merge conflicts with EXAMPLE handler
2004-04-15 09:22:29 +02:00
magnus@neptunus.(none)
7c2c408cb8
Added NDB storage engine
2004-04-15 09:14:14 +02:00
sergefp@mysql.com
9250a0e4e1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-04-14 23:49:47 +04:00
brian@brian-akers-computer.local
86952cd9a6
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1-examples
2004-04-14 11:59:51 -04:00
brian@brian-akers-computer.local
4d5a8cb78c
All changes are to allow someone to compile the example storage engine and use it.
2004-04-12 21:01:45 -07:00
sergefp@mysql.com
ac563b1b8e
Merge
2004-04-08 17:08:56 +04:00
serg@serg.mylan
7899158736
correct SET GLOBAL ft_boolean_syntax=DEFAULT behaviour
2004-04-07 20:58:33 +02:00
monty@mysql.com
70c4eb5838
Portability fixes
...
Fixed problems with group_concat() and HAVING
Updated crash-me values
2004-04-07 04:33:58 +03:00
monty@mysql.com
49330f61da
Fixed warnings from valgrind (not a bug)
...
Don't add -debug to server version if MYSQL_SERVER_PREFIX is used
Indentation cleanups
2004-04-06 12:13:43 +03:00
sergefp@mysql.com
1f8505d66f
Post-merge fixes
2004-04-05 19:52:10 +04:00
sergefp@mysql.com
a8386d01c2
Many files:
...
SQL Syntax for Prepared Statements (WL#1622)
ps.test, ps.result:
new file
2004-04-05 19:43:37 +04:00
monty@mysql.com
0013516951
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-04-05 16:28:16 +03:00