igor@rurik.mysql.com
9bafeecb24
Merge rurik.mysql.com:/home/igor/mysql-4.0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
2004-09-07 10:08:17 -07:00
guilhem@mysql.com
168e4c9c6b
when we update thd->db in replication, it's safer to update thd->db_length too.
...
This does not fix any known bug, but is still a good idea.
2004-09-07 14:57:54 +02:00
jani@rhols221.adsl.netsonic.fi
e04e50b6b7
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0
2004-09-07 11:40:48 +03:00
jani@rhols221.adsl.netsonic.fi
56b4c31633
Fixed Bug#3645, "PROCEDURE ANALYSE() recommends illegal
...
FLOAT columns".
2004-09-07 11:40:27 +03:00
ram@gw.mysql.r18.ru
04fd903157
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2631
2004-09-07 12:53:12 +05:00
guilhem@mysql.com
de5d1e780e
Fix of previous push.
2004-09-06 23:20:33 +02:00
guilhem@mysql.com
f25d3fca92
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0-opt
2004-09-06 22:47:50 +02:00
guilhem@mysql.com
99444c3311
Replacing class Disable_binlog by macros. Patch already approved by Monty.
2004-09-06 22:47:26 +02:00
guilhem@mysql.com
e2aca8cbea
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-09-06 22:30:58 +02:00
guilhem@mysql.com
01ad1bb569
Dependency fix. We observed that doing any change to class THD in sql_class.h resulted in mysqld going crazy (parsing errors,
...
query cache errors in query_cache.test). This is because sql_yacc.cc depends on several .h files but those were not listed in
the dependencies of sql_yacc.o. The present patch does fix the issue; but my auto*-expert colleagues may have a better one.
2004-09-06 22:30:16 +02:00
serg@serg.mylan
130d2fd57f
bug#5389 merge.test fails on qnx - uninitalized variable in myrg_open()
2004-09-06 22:20:40 +02:00
paul@kite-hub.kitebird.com
38f462ae6f
sql_yacc.yy:
...
Allow FROM or IN in SHOW KEYS, as in other SHOW statements.
2004-09-03 10:56:55 -05:00
ram@gw.mysql.r18.ru
f91ca0bd66
A fix (Bug #4980 : union statement with () union () order by produces wrong explain).
2004-09-03 19:59:29 +05:00
ram@gw.mysql.r18.ru
3c85a363e5
A fix (bug #2631 : mlockall called after dropping root permissions).
2004-09-03 19:26:11 +05:00
igor@rurik.mysql.com
5625988ca3
Merge rurik.mysql.com:/home/igor/mysql-4.0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
2004-09-02 22:07:07 -07:00
igor@rurik.mysql.com
f888026fdc
select.result, select.test:
...
Added a test case for bug #5333 .
null_key.result, key_primary.result:
Made covering index usable for const tables.
sql_select.cc:
Made covering index usable for const tables:
downported the corresponding code from 4.1.
Simultaneously fixed bug #5333 reported for 4.1.
The bug was due to the fact that field index in join
structures was always set to 0 for const tables.
2004-09-02 22:06:30 -07:00
paul@kite-hub.kitebird.com
f7bc60e0fc
errmsg.txt:
...
Add GPL comment
2004-09-02 18:12:05 -05:00
ram@gw.mysql.r18.ru
c6b2b2f09d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5232
2004-09-02 16:25:32 +05:00
miguel@hegel.txg.br
fc11887596
Fix for bug #5302
2004-09-02 01:17:28 -03:00
miguel@hegel.txg.br
ca42de54a1
Fix for bug #5302
2004-09-01 14:02:11 -03:00
lenz@mysql.com
7b8b5d8969
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/space/my/mysql-4.0
2004-09-01 16:17:49 +02:00
lenz@mysql.com
1483564b49
Merge mysql.com:/space/my/mysql-4.0
...
into mysql.com:/space/my/mysql-4.0-build
2004-09-01 16:04:51 +02:00
lenz@mysql.com
80879cffe6
- removed swedish errmsg.OLD
2004-09-01 16:04:01 +02:00
heikki@hundin.mysql.fi
40c0fde904
ha_innodb.cc:
...
If ALTER TABLE ... DROP FOREIGN KEY ... fails because of a wrong constraint name, return a table handler error number 150 instead of 152; the value 152 was misleading, as it referred to '152 = Cannot delete a parent row', whereas '150 = Foreign key constraint is incorrectly formed' is less misleading
2004-09-01 16:41:09 +03:00
ram@gw.mysql.r18.ru
b93a973b12
Added global my_getopt_error_reporter function pointer which is
...
used in the handle_options() function (instead of using additional
handle_option() parameter). The default value of the
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.
2004-08-31 21:27:58 +05:00
serg@serg.mylan
079678be7b
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-30 10:17:51 +02:00
serg@serg.mylan
38d9ce96f9
typo fixed
2004-08-30 10:13:13 +02:00
rburnett@build.mysql.com
547b46b7c9
log.cc:
...
Fixed missing * in comment in setup_windows_event_source
2004-08-30 00:50:39 +02:00
guilhem@mysql.com
0485e5d3f0
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-29 14:14:32 +02:00
guilhem@mysql.com
93101561fd
Fix for BUG#4500 "set character set replicates incorrectly"
...
We must not reset the charset in slave after each statement, otherwise the SET CHARACTER SET is cancelled immediately.
Instead, we write a SET CHARACTER SET DEFAULT to the master's binlog when needed (like we already do for SET FOREIGN_KEY_CHECKS);
such writing is not necessary in 4.1 (in 4.1 the bug does not exist, as the SET ONE_SHOT syntax is used).
I have written a test and it works, but I'm not pushing the test as it requires building with all charsets.
I have noticed differences between what is inserted in the master's table in 4.0 and 4.1, and alerted Bar.
2004-08-29 14:13:51 +02:00
monty@mysql.com
f574cd4e8f
Code style fixes.
...
Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
2004-08-28 00:49:54 +03:00
bar@mysql.com
4d1dedd70d
Compile all charset conversion tables if --with-extra-charsets=all
...
or --with-extra-charsets=complex is given.
2004-08-27 21:17:29 +05:00
ram@gw.mysql.r18.ru
3acccb988a
A fix (Bug #5232 : CREATE TABLE ... SELECT can deadlock itself).
2004-08-27 16:43:01 +05:00
bar@mysql.com
5258ea12cf
table.cc:
...
Bug #4558 Escape handling error for ENUM values in SJIS encoding
2004-08-27 12:09:28 +05:00
bar@mysql.com
43b792d5cf
win1251.conf:
...
Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed.
bug#5110
2004-08-27 10:54:57 +05:00
rburnett@build.mysql.com
0e44c9fdab
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into build.mysql.com:/users/rburnett/mysql-4.0
2004-08-26 13:43:27 +02:00
monty@mysql.com
91ec38a74e
merge
2004-08-26 00:39:43 +03:00
monty@mysql.com
4fccf1c4ac
Remove default argument to mysql_truncate()
...
Update to new valgrind
2004-08-26 00:37:25 +03:00
rburnett@build.mysql.com
358900236a
Bug #4792 lower_case_table_names does not resolve db.tbl.column in SELECT list
...
sql_base.cc:
Added code to lowercase database name in insert_fields when lower_case_table_names=1. This fixes bug# 4792
2004-08-25 15:12:31 +02:00
rburnett@build.mysql.com
52a973c5ff
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into build.mysql.com:/users/rburnett/mysql-4.0
2004-08-25 06:39:19 +02:00
gluh@gluh.mysql.r18.ru
1786a388e4
Fix for bug #4340 : find_in_set is case insensitive even on binary operators(2nd version)
2004-08-24 17:29:08 +04:00
guilhem@mysql.com
7bfc78f573
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-23 17:16:22 +02:00
gluh@gluh.mysql.r18.ru
7ff0c3978c
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0
2004-08-23 19:16:21 +04:00
gluh@gluh.mysql.r18.ru
23535cce16
Fix for bug #5134 : WHERE x = 'bar' AND x LIKE BINARY 'bar' returns
...
wrong results
2004-08-23 19:13:47 +04:00
guilhem@mysql.com
252ebd2b30
Fix for BUG#5033 "When using temporary tables truncate does NOT reset the auto_increment counter"
...
(ok'd by CTO to fix it in 4.0).
Fix to make mysql-test-run work with all Valgrind versions.
2004-08-23 16:15:57 +02:00
pem@mysql.com
66a3f65d98
Fixed: BUG#5135: cannot turn on log_warnings with SET in 4.1 (and 4.0)
2004-08-23 15:29:55 +02:00
igor@rurik.mysql.com
4b760fcb94
null.test, null.result:
...
Added test case for bug #4256 .
join_outer.result:
Fixed bug #4256 .
item_cmpfunc.h:
Fixed inconsistency of values of used_tables_cache and
const_item_cache for Item_func_isnull objects.
This inconsistency caused bug #4256 .
2004-08-20 23:48:30 -07:00
guilhem@mysql.com
02e93b5758
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-20 17:16:03 +02:00
guilhem@mysql.com
5db56a106b
Making FLUSH TABLES WITH READ LOCK block COMMITs of existing transactions,
...
in a deadlock-free manner. This splits locking the global read lock in two steps.
This fixes a consequence of this bug, known as:
BUG#4953 'mysqldump --master-data may report incorrect binlog position if using InnoDB'
And a test.
2004-08-20 16:35:23 +02:00
serg@serg.mylan
068a57b12c
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-19 23:11:16 +02:00