serg@serg.mylan
78fa465b92
bug#3964 and related issues: FTB problems with charsets where one byte can match many
...
correct prefix compare with my_strnncoll
2004-06-10 21:18:57 +02:00
guilhem@mysql.com
e816a757db
WL#1689 "Map OPTIMIZE TABLE to ALTER TABLE for InnoDB"
...
exactly it's mapped to "ALTER TABLE t; ANALYZE TABLE t;"
2004-06-10 16:41:24 +02:00
monty@mysql.com
17db9de543
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-06-10 12:36:11 +03:00
monty@mysql.com
c56a16b598
Cleanup
2004-06-10 11:58:16 +03:00
guilhem@mysql.com
9799c5ba33
complement to previous fix (which was for SQLCOM_DROP_DB), for COM_DROP_DB.
2004-06-09 15:27:15 +02:00
guilhem@mysql.com
e76a332165
Fix for BUG#4066 "DROP DATABASE case sensitive even if lower-case-table-names > 0"
2004-06-09 15:22:31 +02:00
serg@serg.mylan
a8a8da3920
different (simpler and more compatible) fix for bug#4046
2004-06-09 00:08:24 +02:00
sergefp@mysql.com
1e05e6cb82
Post review fixes for "SQL Syntax for Prepared Statements".
2004-06-07 12:09:10 +04:00
sergefp@mysql.com
bec20d1fd7
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-04 05:37:14 +04:00
guilhem@mysql.com
da835a0a06
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2004-06-03 23:19:01 +02:00
guilhem@mysql.com
86e8ecc965
Implementation of WL#1824 "Add replication of character set variables in 4.1",
...
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill.
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput if query uses
variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
2004-06-03 23:17:18 +02: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
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
serg@serg.mylan
2e1ded2fe1
backport wild_compare fix from 4.1 - bug#3924
2004-05-29 17:52:20 +02:00
sergefp@mysql.com
d7dd97089e
Manually merged, requirees more merging
2004-05-25 08:15:50 +04:00
konstantin@mysql.com
f207b33a7b
Support for character set conversion in binary protocol: another go
...
after Monty's review.
- Item_param was rewritten.
- it turns out that we can't convert string data to character set of
connection on the fly, because they first should be written to the binary
log.
To support efficient conversion we need to rewrite prepared statements
binlogging code first.
2004-05-25 02:03:49 +04:00
sergefp@mysql.com
ef260fa754
Merge
2004-05-24 21:13:38 +04:00
sergefp@mysql.com
700adb9ae9
Added support for PREPARE stmt1 FROM @var,
...
Fixed the problem of previous patch with replication,
More post-review fixes
2004-05-24 21:08:22 +04:00
vva@eagle.mysql.r18.ru
7e93d385d4
Introduced parameter object "ALTER_INFO" for mysql_alter_table
...
to make list of parameters in mysql_alter_table shorted
to avoid warning in MSVC (windows) building
2004-05-21 19:57:03 +05:00
sergefp@mysql.com
f75b1adece
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-05-21 04:31:07 +04: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
hf@deer.(none)
af39bd4125
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.ps
2004-05-19 10:28:24 +05:00
serg@serg.mylan
d9a6ff1125
don't try to purge closed logs
2004-05-18 10:29:20 +02:00
hf@deer.(none)
bbfe390afd
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.ps
2004-05-17 18:45:50 +05:00
monty@mysql.com
cd3dab49cc
Merge with 4.0.20
2004-05-17 01:52:13 +03:00
hf@deer.(none)
e18cd2ea9f
Fixes for #3371 , #3372 , #3374 , #3375 , #3376
2004-05-15 17:07:44 +05:00
monty@mysql.com
1e860400f3
Extra safety fixes (probably not needed, but can't hurt)
2004-05-15 09:08:03 +03:00
sergefp@mysql.com
3711c98b2a
Trivial manual merge
2004-05-15 00:06:16 +04:00
heikki@hundin.mysql.fi
02f51ccf2d
Many files:
...
Fix remaining cases of Bug #3596 : fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
2004-05-14 16:48:56 +03:00
monty@mysql.com
116f61c656
Don't automaticly generate a new key for a foreign key constraint if there is already a usable key.
...
Prefer not automatic keys before automatic keys. If there is two conf
2004-05-12 00:29:52 +03: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
bell@sanja.is.com.ua
62fca61bc4
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
2004-05-05 21:24:13 +03:00
bell@sanja.is.com.ua
c5c35c667e
caching of queries with isammerge tables forbiden using general way
...
SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
correct table list passed to class constructor of select_update
2004-05-05 21:21:41 +03:00
sergefp@mysql.com
963ae8a9a7
WL#1622: Post-merge fixes
2004-05-05 19:11:40 +04:00
miguel@hegel.local
4d8235b849
Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hegel.local:/home/miguel/bk/mysql-4.1
2004-05-05 10:55:39 -03:00
sergefp@mysql.com
fdfcadc735
Manual merge for WL#1622 code, will need fixes
2004-05-05 16:10:16 +04:00
monty@mysql.com
82c50dc49d
Delete Items created during Prepared Stat (memory leak bug) (Bug #3451 )
2004-05-05 12:40:33 +03:00
miguel@hegel.local
8d1480f7c5
Windows fixes for VC++ compiler compability
2004-05-05 02:59:17 -03:00
sergefp@mysql.com
b55d59fe2f
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-04-30 19:24:57 +04:00
monty@mysql.com
6678ecf19a
Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647 )
...
Added checking of cut read lines in bootstrap thread (Bug #2874 )
2004-04-30 14:02:17 +03: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
lenz@mysql.com
692e9dd6f0
- Fixed compile error in sql_parse.cc
2004-04-15 04:55:49 +02:00
sergefp@mysql.com
194027d5d8
Merged
2004-04-13 02:18:09 +04:00
sergefp@mysql.com
a314cbefa1
WL#1622 "SQL Syntax for Prepared Statements": post-review fixes:
...
Moved PS name to Statement class, Statement_map now handles name-to-statement resolution.
Both named and unnamed statements are now executed in one function (sql_prepare.cc:execute_stmt)
Fixed a problem: Malformed sequence of commands from client could cause server to use previously deleted objects.
Some code cleanup and small fixes
2004-04-13 01:58:48 +04:00
monty@mysql.com
7d9a9fd93a
Added missing return statement
2004-04-12 03:26:32 +03:00
bell@sanja.is.com.ua
a535342d57
after review PS fixes
2004-04-10 01:14:32 +03:00
bell@sanja.is.com.ua
555eb86616
merge
2004-04-08 23:50:10 +03:00
sergefp@mysql.com
a298c6d4fa
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-04-08 19:14:11 +04:00
monty@mysql.com
62fa4013ce
Don't enable HA_EXTRA_WRITE_CACHE if too few rows
...
Revert main parts of patch for online index builds. Should be done differently
Added support for %lx in my_snprintf()
2004-04-08 17:56:45 +03:00