monty@mysql.com
309b1a2b6c
Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY
2005-01-03 23:04:52 +02:00
joreland@mysql.com
3ffeca9a5c
merge 5.0->5.0-ndb
2005-01-03 21:42:43 +01:00
bell@sanja.is.com.ua
8c39a4f463
fixed reporting error
2005-01-03 22:16:54 +02:00
monty@mysql.com
d35d4eab91
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-03 21:14:20 +02:00
monty@mysql.com
2299e1eca4
Better handling of ensuring that setup_tables() are not called twice
...
This fixed a bug in prepared statements when used with outher joins
Fixed a bug in SUM(DISTINCT) when used with prepared statements.
Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests
2005-01-03 21:04:33 +02:00
jimw@mysql.com
0e8d3f1ccd
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-03 19:56:20 +01:00
jimw@mysql.com
98d7964d2a
Fix 'SHOW CREATE FUNCTION' to say 'FUNCTION' in its error message. (Bug #6338 )
2005-01-03 19:53:54 +01:00
monty@mysql.com
a981ca050d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-03 15:35:58 +02: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
mskold@mysql.com
9647a076a6
Merge
2005-01-03 14:33:00 +01:00
mskold@mysql.com
31360fb01a
Merge for WL#2290 Add support for bit field in ndbcluster handler
2005-01-03 14:29:27 +01:00
mskold@mysql.com
ce103eeff7
Merge
2005-01-03 13:52:17 +01:00
serg@sergbook.mysql.com
e363e55b51
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-01-03 14:16:32 +02:00
monty@mysql.com
e205136170
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-01-03 13:57:17 +02:00
monty@mysql.com
ce456b6a20
Remove clear_insert_values() because it was far from trivial to handle the cleanup in all cases
...
(Old code failed for INSERT ... ON DUPLICATE with prepared statements)
Instead, always reset table->insert_values on open.
2005-01-03 13:56:23 +02:00
mskold@mysql.com
8edd9baa2c
Fixed failed merge
2005-01-03 11:56:51 +01:00
mskold@mysql.com
689748b548
Merge from fix for Bug #7480 Mysqld crash in ha_ndbcluster using Query Browser
2005-01-03 09:46:59 +01:00
monty@mysql.com
1e88bdbf90
Streamlined code for trim, ltrim and rtrim
...
Portability fixes
2005-01-02 23:31:37 +02:00
paul@snake-hub.snake.net
fc0d550bad
set_var.cc:
...
Silence compiler warning.
2005-01-02 15:10:08 -06:00
monty@mysql.com
1cd4c06874
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-02 15:25:47 +02:00
serg@sergbook.mysql.com
f5d54d58b5
typo fixed
2005-01-02 15:23:34 +02: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
joreland@mysql.com
fe8f4ab012
merge
2005-01-01 14:01:37 +01:00
joreland@mysql.com
a7c2a9e0b8
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-01 09:13:17 +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
serg@sergbook.mysql.com
a9c7fb9dfd
post-merge
2004-12-31 17:59:43 +01:00
serg@sergbook.mysql.com
a04fc26c54
manually merged
2004-12-31 15:26:24 +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
dlenev@brandersnatch.localdomain
4e17aab243
Yet another after merge fix.
...
Now max_user_connections is 36th field in mysql.user table
(two new SP-related privileges were added).
2004-12-31 14:02:40 +03:00
serg@sergbook.mysql.com
45ce994e5d
post-merge
2004-12-31 11:52:14 +01:00
joreland@mysql.com
3c52b247ac
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-31 11:39:43 +01:00
dlenev@mysql.com
2f8dcec05a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-1339
2004-12-31 13:33:00 +03:00
monty@mysql.com
78da7196ad
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-12-31 12:05:43 +02:00
monty@mysql.com
1bd22faa05
Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
...
This allows use to use INSERT IGNORE ... ON DUPLICATE ...
2004-12-31 12:04:35 +02:00
monty@mysql.com
e4ffff2918
Fix max_key_length and max_unique_length to take into account varchar and null extra lengths
...
This fixes a bug found by bdb.test
Fixes a portability issue with bdb tables
2004-12-31 11:56:50 +02:00
dlenev@mysql.com
536cb92195
Manual merge.
2004-12-31 12:48:27 +03:00
joreland@mysql.com
7f6fb4d9de
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-31 10:07:49 +01:00
vtkachenko@intelp4d.mysql.com
ae1b969c8f
Merge bk-internal:/home/bk/mysql-5.0
...
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
2004-12-31 09:00:34 +01:00
joreland@mysql.com
8f2d0ec1a1
merge
2004-12-31 06:36:32 +01:00
monty@mysql.com
5e03ebbcad
After merge fixes
...
Cleanup of mi_print_error() handling
Deleted 'merge' directory
2004-12-31 03:47:56 +02:00
monty@mysql.com
34d5331cee
Merge with global tree
2004-12-31 00:50:30 +02:00
monty@mysql.com
d71c030587
After merge fixes
2004-12-31 00:44:00 +02: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
