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
wax@mysql.com
a18689892a
Merge mysql.com:/home/wax/mysql/mysql-5.0
...
into mysql.com:/home/wax/mysql/mysql-5.0service
2004-05-16 02:44:52 +06:00
pem@mysql.com
df69f93ae9
Post-merge post-merge fix (new error codes for fparser).
2004-05-14 16:10:31 +02:00
wax@kishkin.ru
7ed4ed54ef
SCRUM
...
add option --local-service when service is installed
2004-05-13 15:46:02 +06:00
timour@mysql.com
9ca265785e
Moved the declaration of status variable Last_query_cost to follow alphabetic order.
2004-05-12 09:52:35 +03:00
timour@mysql.com
f3dab7be12
Merge of WL#1469 with latest bk sources.
2004-05-11 12:15:58 +03:00
pem@mysql.com
bf45960eef
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +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
timour@mysql.com
9f1fd5bd90
Implementation of WL#1469 (Greedy algorithm to search for an optimal execution plan).
2004-04-16 13:21:08 +03: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
pem@mysql.com
dfd59e296e
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +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
monty@mysql.com
42cf92ce37
Fixed many compiler warnings
...
Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695 , #3381 and #3319 )
Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
Set locked_in_memory properly
2004-04-05 13:56:05 +03:00
vva@eagle.mysql.r18.ru
5f2d73ed96
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1
2004-04-03 02:46:12 +05:00
miguel@hegel.local
d17e85b764
Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hegel.local:/home/miguel/bk/mysql-4.1
2004-04-02 11:10:29 -03:00
dlenev@jabberwock.localdomain
a80f46bfdf
WL#775 "Add status variable identifying binlog_cache_size shortage"
...
Added two status variables:
binlog_cache_use - counts number of transactions that used somehow
transaction temporary binary log.
binlog_cache_disk_use - counts number of transactions that required
disk I/O for storing info in this this binary log.
2004-04-02 00:47:20 +04:00
miguel@hegel.local
79959f3777
Fix for bug #3359 . Bad named pipe name.
2004-04-01 16:22:54 -03:00
vva@eagle.mysql.r18.ru
15cd52c6cb
added synchronization in mysql_create_like_table
...
(
fixed BUG #2385 CREATE TABLE LIKE lacks locking on source and destination table
and added tests for it
)
2004-04-01 23:13:25 +05:00
paul@ice.snake.net
7b45773fa6
Some SHOW STATUS lines were in non-alphabetic order.
2004-03-21 15:58:08 -06:00
serg@serg.mylan
581996393a
select @@smth=@@sys_str_var crash fixed
2004-03-20 14:36:00 +01:00
monty@mysql.com
19d0a60eca
Don't change server suffix if given to configure
...
Portability fixes
2004-03-18 01:48:46 +02:00
monty@mysql.com
350b433569
merge with 4.0
2004-03-16 22:41:30 +02:00
konstantin@mysql.com
36120d420a
Fix of compilation failure of latest 4.1 tree: new constants in mysqld.cc
...
exceed unsigned long limit.
2004-03-15 22:39:36 +03:00
gluh@gluh.mysql.r18.ru
df0ede69fc
Task #835 : additional changes fot str_to_date
2004-03-15 18:28:21 +04:00
monty@mysql.com
e27960a44e
Ensure that install_test_db.sh script works with both 'make install' and 'make_binary_distribution' layouts
...
Abort if we can't allocate memory for table cache
Fix bug with multi-update-tables and BDB tables.
2004-03-12 01:10:22 +02:00
monty@mysql.com
7738d08294
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-03-10 13:48:41 +02:00
monty@mysql.com
4ee44751d9
Fixed memory leak in DROP DATABASE when using RAID tables (Bug #2882 )
2004-03-10 13:46:11 +02:00
paul@ice.snake.net
025be296b2
Touch up error message.
2004-03-08 15:58:45 -06:00
monty@mysql.com
73780de129
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-03-06 10:43:53 +02:00