jimw@mysql.com
77fae11832
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-12 19:19:55 +01:00
jimw@mysql.com
0b041fe2e1
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-12 18:09:44 +01:00
heikki@hundin.mysql.fi
f55cb90f93
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-01-12 18:26:56 +02:00
heikki@hundin.mysql.fi
bdc9823cb6
ha_innodb.cc:
...
Add comments about why the InnoDB latching order is obeyed also for the MySQL query cache mutex; add an error printf if that is not the case
sync0sync.h:
Assign sync0sync.h ranks also for the MySQL query cache mutex and the MySQL binlog mutex; the latching order must be obeyed also for these
row0ins.c:
Add a comment why the query cache invalidate operation cannot deadlock in a cascaded FOREIGN KEY operation
2005-01-12 18:25:39 +02:00
jimw@mysql.com
fd7d355fbd
Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
...
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-12 17:05:33 +01:00
monty@mysql.com
073a8881ee
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-01-12 16:02:46 +02:00
shuichi@mysql.com
852d74a68e
renamed charset name 'eucjp_ms' to 'eucjpms'
2005-01-12 02:58:15 -08:00
monty@mysql.com
11c63eae01
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-01-12 11:45:04 +02:00
sergefp@mysql.com
4860bf9a06
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-look-valgrind
2005-01-12 09:05:10 +03:00
sergefp@mysql.com
ea8d861d23
Fix for use of unitialized variable errors: Manually delete
...
{min,max}_functions_it as it is not allocated on the pool.
2005-01-12 08:15:46 +03:00
shuichi@mysql.com
3126e82291
added new character set - cp932, eucjp_ms
2005-01-11 17:45:36 -08:00
monty@mysql.com
aad3d64a6f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-01-12 03:40:02 +02:00
monty@mysql.com
314cf993c6
Fixed memory reference errors found by valgrind
2005-01-12 03:38:53 +02:00
hf@deer.(none)
6f511796fc
Merging fixed
2005-01-11 23:28:56 +04:00
hf@deer.(none)
38baa28a10
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-01-11 22:15:29 +04:00
jani@ua141d10.elisa.omakaista.fi
fd79354273
Fixed Bug#2813, "analyse does not quot string values in enams from string".
2005-01-11 19:40:33 +02:00
hf@deer.(none)
196c95e938
Merging conflicts resolved
2005-01-11 21:00:53 +04:00
joreland@mysql.com
c9502b5567
merge
2005-01-11 17:02:30 +01:00
joreland@mysql.com
7f287d963c
removed compiler warnings from ha_ndbcluster
2005-01-11 17:00:31 +01:00
bar@mysql.com
2bd854c859
Bug #7730 Server crash using soundex on an utf8 table
...
Don't use my_tolower: it works only for 8bit charsets.
2005-01-11 19:58:53 +04:00
lenz@mysql.com
33795908a0
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-build
2005-01-11 16:02:45 +01:00
lenz@mysql.com
0d08e9b2c2
- Housekeeping: removed a few unreferenced variables, noticed while doing
...
Windows builds
2005-01-11 15:38:03 +01:00
serg@serg.mylan
9a43b64874
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-11 14:29:22 +01:00
mskold@mysql.com
082bd01572
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-11 14:21:58 +01:00
mskold@mysql.com
e72f9108ef
Removed compiler warnings
2005-01-11 14:06:44 +01:00
bar@mysql.com
691b3283d2
If VARCHAR strips only trailing spaces, then produce
...
a note, not a warning or error.
2005-01-11 16:49:45 +04:00
konstantin@mysql.com
a55cd1f1c4
Fixes for two compile-time failures.
2005-01-11 15:32:23 +03:00
konstantin@mysql.com
a0bc131743
Merge mysql.com:/home/kostja/work/mysql-4.1-7428
...
into mysql.com:/home/kostja/work/mysql-5.0-root
2005-01-11 14:47:12 +03:00
konstantin@mysql.com
067d13f632
A fix for linking failure of MySQL client when linking with imap libraries
...
(Bug#7428) (renamed: hash_reset -> my_hash_reset)
2005-01-11 13:53:10 +03:00
konstantin@mysql.com
876a96cd02
make it compile with -ansi -pedantic
2005-01-11 13:12:52 +03:00
serg@serg.mylan
b670f88287
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-11 10:34:38 +01:00
mskold@mysql.com
20184b7047
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-11 10:31:31 +01:00
jimw@mysql.com
64c04a4c26
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jwinstead2/mysql-5.0-clean
2005-01-11 05:11:42 +01:00
jimw@mysql.com
3d0e2e70c6
Merge
2005-01-11 05:10:08 +01:00
serg@serg.mylan
e9ac8dbc51
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-11 02:36:50 +01:00
jimw@mysql.com
e173b24f75
Merge mysql.com:/home/jwinstead2/mysql-4.1-7762
...
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 01:25:46 +01:00
jimw@mysql.com
699cb2c066
Fix style nit
2005-01-11 01:01:35 +01:00
kent@mysql.com
feee6ee30b
field.h, field.cc:
...
Did some more split TABLE to TABLE and TABLE_SHARE
2005-01-11 00:17:21 +01:00
jimw@mysql.com
2347e386d7
Fix double-initalization of mutex in archive storage engine. (Bug #7762 )
2005-01-10 23:59:28 +01:00
mskold@mysql.com
fb5e3b7245
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-01-10 23:27:37 +01:00
mskold@mysql.com
760b2a5f3b
Fix for failing INSERT IGNORE
2005-01-10 20:55:05 +01:00
guilhem@mysql.com
09b45d80d5
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-10 18:46:31 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
b67a1f697a
Initialize lex->mqh structure. Fixes valgrind warnings.
2005-01-10 16:24:05 +00:00
serg@serg.mylan
618d01e788
bad merge fixed
2005-01-10 16:03:06 +01:00
guilhem@mysql.com
b5a44aebbd
Merge mysql.com:/home/mysql_src/mysql-4.1-clean
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-01-10 15:15:49 +01:00
guilhem@mysql.com
da1d751b31
Merge mysql.com:/home/mysql_src/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-10 14:13:41 +01:00
guilhem@mysql.com
3439ce4ee3
Fix for BUG#7658 "optimize crashes slave thread (1 in 1000)]":
...
mysql_admin_table() attempted to write to a vio which was 0. I could have fixed mysql_admin_table()
but fixing my_net_write() looked more future-proof.
2005-01-10 13:52:32 +01:00
joreland@mysql.com
10f41d7cc4
merge
2005-01-10 11:49:58 +01:00
joreland@mysql.com
4ddd79fb69
bug#7761 - ndb does not autcommit - postreview fixes
2005-01-10 11:33:08 +01:00
joreland@mysql.com
6331241cb3
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-10 11:20:01 +01:00