vva@eagle.mysql.r18.ru
d124cd5bd7
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-4.0
2003-05-21 14:58:11 -04:00
vva@eagle.mysql.r18.ru
09348e271a
fixed 'STARTING BY' in replication
2003-05-21 14:54:02 -04:00
monty@mashka.mysql.fi
6aa8929cf3
After merge fixes
...
Added initialization of all important global variables
2003-05-21 21:39:58 +03:00
bar@bar.mysql.r18.ru
8d52377a5c
Some SHOW VARIABLES have been renamed:
...
collation_client -> character_set_client
collation_results -> character_set_results
character_set -> character_set_server
SET NAMES now doesn't start client->server conversion
SET CHARACTER SET now starts both client->server and server->client conversion
2003-05-21 17:44:12 +05:00
bar@bar.mysql.r18.ru
189d1373b8
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-05-21 13:59:00 +05:00
bar@bar.mysql.r18.ru
7f771ce2e1
"character_sets" has been removed from SHOW VARIABLES. Use SHOW CHARACTER SET instead.
...
"character_set_system" has been added to display the system character set
2003-05-21 13:58:30 +05:00
bar@bar.mysql.r18.ru
c725a34b80
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-05-21 13:34:07 +05:00
venu@myvenu.com
3f1a05d316
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-05-21 01:21:51 -07:00
venu@myvenu.com
0c25993d24
Fix merge conflict by changing warning codes to new one
2003-05-21 01:21:06 -07:00
ram@mysql.r18.ru
13607aedd8
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.latest
2003-05-21 12:27:27 +05:00
bar@bar.mysql.r18.ru
76900a9f4b
Two separate startup arguments for mysqld:
...
--default-character-set and --default-collation
2003-05-21 12:26:35 +05:00
ram@mysql.r18.ru
d90720704b
Added AsBinary alias for AsWKB function.
2003-05-21 12:26:06 +05:00
venu@myvenu.com
97a2c472bc
Resolve merge conflict
2003-05-21 00:14:56 -07:00
venu@myvenu.com
39cbb547d4
Resolve merge colflict
2003-05-21 00:12:09 -07:00
wax@kishkin.ru
93325f7b6c
add check of __NT__ definition for shared_memory for tree 4.1
2003-05-21 04:57:59 +06:00
vva@eagle.mysql.r18.ru
666d46b6ee
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-4.1
2003-05-20 17:03:50 -04:00
vva@eagle.mysql.r18.ru
ec247fd6af
changed processing of LOAD DATA in mysqlbinlog
2003-05-20 17:03:18 -04:00
bar@bar.mysql.r18.ru
5b788e660a
A separate, better error message when it's impossible to aggregate strings for some operation
2003-05-20 16:36:59 +05:00
monty@narttu.mysql.fi
dd2b7918cd
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
monty@narttu.mysql.fi
fc0df599dc
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-05-19 12:02:11 +03:00
monty@narttu.mysql.fi
c01678bc3d
Added option --read-only (Thanks to Markus Benning)
2003-05-19 12:01:38 +03:00
monty@narttu.mysql.fi
524878e935
Fix for when compiling with HAVE_ISAM enabled
2003-05-19 11:53:42 +03:00
monty@narttu.mysql.fi
dad4025e3f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-05-19 11:09:46 +03:00
monty@narttu.mysql.fi
755c89e29f
Add empty() function for baselist.
2003-05-19 11:09:24 +03:00
guilhem@mysql.com
e9c2a37008
LOCAL is an alias of NO_WRITE_TO_BINLOG
2003-05-16 15:28:17 +02:00
heikki@hundin.mysql.fi
5359d04608
buf0lru.c, buf0flu.c, buf0buf.c, buf0lru.h:
...
Search first only 10 % of the LRU list for a replaceable block before doing an LRU flush; enable again flushing of close pages also in a flush list (checkpointing) flush
trx0trx.c:
Add forgotten return value (it was not used anywhere, fortunately)
ha_innodb.h, mysql_priv.h:
Move declaration of srv_buf_pool_max_modified_pct to ha_innodb.h and enclose it to denote it is a C variable, not C++
2003-05-16 16:27:50 +03:00
guilhem@mysql.com
50c9a79826
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-05-15 18:36:29 +02:00
guilhem@mysql.com
4a0e006230
Scrum task 845. Thi is a behaviour change :
...
now by default, FLUSH, OPTIMIZE, ANALYZE, REPAIR commands are written to the
binlog, unless the new NO_WRITE_TO_BINLOG keyword was used :
OPTIMIZE NO_WRITE_TO_BINLOG table t;
Previously these commands were never written to the binlog, but there are
2 reasons to change this :
- the RENAME TABLE in MERGE table bug (#175 ) on slave
- the possible "differently optimised queries may lead to different
updates on the master and slave" bug, until we have automatic ORDER BY.
FLUSH LOGS/SLAVE/MASTER/TABLES WITH READ LOCK are never written to the binlog.
New test for the new logging behaviour.
Other small change : reload_acl_and_cache() and reset_slave() don't send their errors themselves,
this is more usual.
2003-05-15 18:35:39 +02:00
monty@narttu.mysql.fi
c935709140
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-05-15 00:31:32 +03:00
monty@narttu.mysql.fi
04004534ea
Fixed new bug in ORDER BY
2003-05-15 00:31:12 +03:00
monty@narttu.mysql.fi
dcb7b452bd
Fixed bug in CREATE ... DECIMAL(-1,1). Bug #432
2003-05-14 22:12:55 +03:00
monty@narttu.mysql.fi
413bb98b5c
SHOW TABLE STATUS displayed wrong Row_format for myisampack'ed tables. (Bug #427 )
2003-05-14 09:37:04 +03:00
monty@narttu.mysql.fi
d8a6c1ca22
Fix for checking global_access rights
2003-05-14 01:55:23 +03:00
monty@narttu.mysql.fi
717cbb6da1
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-05-14 01:28:59 +03:00
monty@narttu.mysql.fi
3e72b423e3
Fix for MacOSX and symlinks
...
Fix for USE_FRM and crashed index file
2003-05-14 01:27:26 +03:00
guilhem@mysql.com
6f9f6066f2
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-05-13 23:03:33 +02:00
guilhem@mysql.com
05c8973671
Fix for bug 343 : we require only REPLICATION CLIENT for
...
SHOW SLAVE STATUS and SHOW MASTER STATUS, because this is what
the manual states. We still accept SUPER.
2003-05-13 23:03:00 +02:00
guilhem@mysql.com
da0e28b7d6
Proper replication of CONNECTION_ID() and 4.1 PASSWORD() (bugs 177 and 344),
...
new test for this.
2003-05-13 22:50:28 +02:00
monty@narttu.mysql.fi
c4d3270460
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-05-13 22:35:41 +03:00
jani@hynda.(none)
f0a2ca1a7b
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into hynda.(none):/home/my/bk/mysql-4.0
2003-05-13 22:34:04 +03:00
jani@hynda.(none)
447bebfd77
Fixed a bug in DROP DATABASE when database had a RAID type table.
...
Bug ID 381.
2003-05-13 22:28:34 +03:00
monty@narttu.mysql.fi
d9aa95631e
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-05-13 22:09:03 +03:00
pem@mysql.com
44026b18b4
Fix of bug 390: primary key now implies (silently) NOT NULL for key fields.
2003-05-13 19:16:30 +02:00
monty@narttu.mysql.fi
41d2103e26
Fixed 'Unknown error' when using 'UPDATE ... LIMIT'. Bug 373
2003-05-13 20:07:43 +03:00
jani@hynda.(none)
c9c5841760
- Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 and 342
...
- Fix for QNX: UNIX sockets available since 6.2.1
2003-05-13 19:34:51 +03:00
monty@narttu.mysql.fi
2693203a08
Fixed problem with ansi mode and GROUP BY with constants. (Bug #387 )
2003-05-13 19:26:07 +03:00
monty@narttu.mysql.fi
13530887cb
Fix for UNION and LEFT JOIN (Bug #386 )
...
Fixed wrong logging of Access denied error (Bug #398 )
2003-05-13 18:58:26 +03:00
monty@mashka.mysql.fi
60dfb25be3
Give warning if MySQL doesn't honor given storage engine
...
Allow syntax CREATE TABLE t1 (LIKE t2)
2003-05-13 11:15:11 +03:00
monty@mashka.mysql.fi
0eeee3670e
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-05-13 10:54:42 +03:00
monty@mashka.mysql.fi
4bde719df7
Safety fix to enable RAID in max binaries
...
Better fix for format('nan')
Fix for HAVING COUNT(DISTINCT...)
2003-05-13 10:54:07 +03:00