guilhem@mysql.com
4e4f574645
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-12 19:44:19 +01:00
guilhem@mysql.com
44ce4b43ef
Fix for BUG#7793 "mysqlbinlog produces incorrect queries":
...
when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)
2005-01-12 19:42:46 +01:00
konstantin@mysql.com
2cc2844bbb
Merge mysql.com:/home/kostja/work/mysql-4.0-6761
...
into mysql.com:/home/kostja/work/mysql-4.1-root
2005-01-12 19:00:04 +03:00
konstantin@mysql.com
6058edbe18
A fix for Bug#6761 "mysql_list_fields() does not work": test
...
case will be added to client_test in 4.1
2005-01-12 17:04:45 +03:00
serg@serg.mylan
e83f49bd2f
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-01-12 12:35:34 +01:00
serg@serg.mylan
b86a512e37
added missing Com_update_multi status variable
2005-01-12 12:18:17 +01: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
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
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
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
jimw@mysql.com
2347e386d7
Fix double-initalization of mutex in archive storage engine. (Bug #7762 )
2005-01-10 23:59:28 +01:00
serg@serg.mylan
618d01e788
bad merge fixed
2005-01-10 16:03:06 +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
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
joreland@mysql.com
c9f7f0ffcf
bug#7761 - ndb does not autocommit during alter table
2005-01-10 11:17:01 +01:00
paul@kite-hub.kitebird.com
7585b5cb61
set_var.cc:
...
Whack duplicate variable line. (Affects SHOW VARIABLES.)
2005-01-08 19:43:15 -06:00
paul@kite-hub.kitebird.com
cbd56fce87
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2005-01-08 18:32:57 -06:00
pekka@mysql.com
50c3a883b2
ndb - wl-1442 fix Time ordering
2005-01-08 19:28:44 +01:00
pekka@mysql.com
0462ccfe3c
ndb - wl-1442 fix Date ordering
2005-01-08 16:57:51 +01:00
paul@kite-hub.kitebird.com
76b823cebe
set_var.cc:
...
Reorder variables to properly alphabetize SHOW VARIABLES output.
2005-01-07 14:17:08 -06:00
jimw@mysql.com
c2eb3bf9f6
Correctly truncate integers inserted into field and double columns
...
with a number of decimals specified. (Bug #7361 )
2005-01-07 17:44:18 +01:00
guilhem@mysql.com
60f5a69160
2 small fixes for binlog (sorry for grouping them - I won't do it again):
...
WL#2335 (wait if binlog or binlog index file hits disk full or quota exceeded),
fix for BUG#7236 ("--expire_logs_days does not apply if all statements
happen in transactions"), and a behaviour change: abort if mysqld can't start
binlog at startup (if running with --log-bin of course).
2005-01-06 23:53:58 +01:00
bell@sanja.is.com.ua
421738e8ce
removed unused label
2005-01-06 17:08:38 +02:00
jimw@mysql.com
954d0181ec
Make query_cache_wlock_invalidate visible in SHOW VARIABLES (Bug #7594 )
2005-01-04 02:45:01 +01:00
serg@sergbook.mysql.com
5e18c54646
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-03 15:35:58 +02:00
paul@snake-hub.snake.net
fc0d550bad
set_var.cc:
...
Silence compiler warning.
2005-01-02 15:10:08 -06:00
serg@sergbook.mysql.com
2c6bc59307
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-02 12:33:42 +02:00
mskold@mysql.com
3d50cc0457
Fixed failed merge
2005-01-01 22:47:50 +01:00
mskold@mysql.com
94845764ca
Fixed failed merge
2005-01-01 22:40:40 +01:00
serg@sergbook.mysql.com
203cc19e48
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2004-12-31 18:00:49 +01:00
mskold@mysql.com
20c89180fa
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2004-12-31 13:50:04 +01:00
serg@sergbook.mysql.com
b8cbe63bfe
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2004-12-31 12:55:42 +01:00
serg@sergbook.mysql.com
45ce994e5d
post-merge
2004-12-31 11:52:14 +01:00
dlenev@brandersnatch.localdomain
cd98fcf4e9
Merged fixes for bug #7297 "Two digit year should be interpreted
...
correctly even with zero month and day" and bug #7515 "from_unixtime(0)
now returns NULL instead of the Epoch" into 4.1 tree.
2004-12-30 23:44:42 +03:00
mskold@mysql.com
76b2df6043
Merged bugfix
2004-12-30 21:36:16 +01:00
serg@sergbook.mysql.com
c7e756f959
merged
2004-12-30 21:11:40 +01:00
serg@sergbook.mysql.com
12bf7dcd04
unsufficient privilege checks in GRANT, when a grantor has column-level privileges
2004-12-30 21:01:11 +01:00
marty@linux.site
1ddb554b8b
Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browser
2004-12-30 19:56:09 +01:00
dlenev@mysql.com
4ef7ac5c09
Manual merge of fix for bugs of #7297 and #7515 into 4.1 tree.
2004-12-30 21:37:32 +03:00
dlenev@mysql.com
2600fb3bdf
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg7297
2004-12-30 21:18:45 +03:00
dlenev@mysql.com
2878395ab1
Fix for bug #7515 "from_unixtime(0) now returns NULL instead of
...
the Epoch". (With after review fixes).
2004-12-30 21:18:10 +03:00
