lars@mysql.com
efb077502d
Merge
2005-03-21 23:05:55 +01:00
lars@mysql.com
c6d85289ab
WL#2472:
...
Renamed Table_filter to Rpl_filter
Eliminated very annoying memory leak
2005-03-21 22:09:42 +01:00
lars@mysql.com
f1ce374acc
Correction of a bad manual merge
2005-03-21 17:53:48 +01:00
lars@mysql.com
c198ce2ab7
Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1
2005-03-21 09:23:09 +01:00
igor@rurik.mysql.com
df12e29955
func_group.test, func_group.result:
...
Added a test case for bug #9210 .
sql_select.cc:
Fixed bug #9210 .
The function calc_group_buffer did not cover the case
when the GROUP BY expression was decimal.
Slightly optimized the other code.
2005-03-19 23:12:50 -08:00
konstantin@mysql.com
947065ddab
Clean up the warning inside sanity():decimal.c in valgrind-max builds.
2005-03-19 18:39:26 +03:00
konstantin@mysql.com
8ed6b8f82c
Cleanup, remove some -ansi -pedancit warnings (mysql_client_test.c)
2005-03-19 18:16:38 +03:00
heikki@hundin.mysql.fi
ecc3a17457
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-18 19:33:41 +02:00
heikki@hundin.mysql.fi
544fb39894
data0type.h:
...
The missing DATA_BINARY_TYPE in BLOBs created with < 4.0.14 does not cause any harm, because there were no indexes on such BLOBs
2005-03-18 19:16:11 +02:00
heikki@hundin.mysql.fi
c163b6831e
data0type.ic:
...
Change the sorting order of TEXT columns in InnoDB: pad with spaces at the end in comparisons; we MUST UPDATE the MySQL MANUAL to warn about the need to rebuild tables (also MyISAM) in certain cases in an upgrade to 5.0.3; TODO: study what complications the missing DATA_BINARY_TYPE flag in InnoDB < 4.0.14 causes: we would compare then also BLOBs with space padding, not just TEXT
2005-03-18 19:09:22 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
4ef20658d7
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-03-18 19:04:09 +02:00
heikki@hundin.mysql.fi
3ee989b2be
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-18 18:56:23 +02:00
lenz@mysql.com
37a9ce4420
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-03-18 17:36:54 +01:00
lenz@mysql.com
63b078c53f
Merge mysql.com:/space/my/mysql-5.0-build
...
into mysql.com:/space/my/mysql-5.0
2005-03-18 17:32:57 +01:00
kent@mysql.com
b3ba278116
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-03-18 17:26:03 +01:00
lenz@mysql.com
cf2d609a57
- removed MyISAM RAID from the Linux "Max" RPMs
2005-03-18 17:24:03 +01:00
kent@mysql.com
2e278b158b
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-03-18 17:20:14 +01:00
kent@mysql.com
ba510b0c2e
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-03-18 17:13:13 +01:00
pem@mysql.com
3bbbe5eff4
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-03-18 17:07:42 +01:00
joerg@mysql.com
8061260204
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-03-18 17:07:41 +01:00
pem@mysql.comhem.se
8af9a0d782
Fixed BUG#6600: Stored procedure crash after repeated calls with check table
2005-03-18 16:52:41 +01:00
kent@mysql.com
348c285d0f
mysql-test-run.sh:
...
Disabled old feature to disable test cases
2005-03-18 16:48:18 +01:00
joerg@mysql.com
cbba326273
Merge mysqldev@production.mysql.com:my/mysql-5.0-build
...
into mysql.com:/M50/build-5.0.3
2005-03-18 15:43:11 +01:00
pem@mysql.comhem.se
00c220eab5
Did some SP test style changes and added explanatory comments,
...
and removed a have_innodb.inc inclusion which was left by mistake
in an earlier change.
2005-03-18 14:33:46 +01:00
joerg@mysql.com
a485a10d46
Merge
2005-03-18 12:54:24 +01:00
joerg@mysql.com
e0d948922b
Move mis-placed assignments to their proper position.
2005-03-18 12:44:40 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
5537d21466
Added more tests to grant2. Fixed some previous tests.
...
Added new logic to ACL system:
1) If GRANT OPTION (not mysql db):
Ok to update existing user, but not password.
Not allowed to make a new user.
2) If UPDATE_ACL to mysql DB:
Ok to update current user, but not make a new one.
3) If INSERT_ACL to mysql DB:
Ok to add a new user, but not modify existing.
4) If GRANT OPTION to mysql DB:
All modifications OK.
2005-03-18 13:32:28 +02:00
heikki@hundin.mysql.fi
dfc0a5ce4f
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-18 08:20:51 +02:00
igor@rurik.mysql.com
d53423383b
Manual merge
2005-03-17 21:47:46 -08:00
igor@rurik.mysql.com
6f5fbaad59
olap.test:
...
Added a test case for bug #8617 .
sql_select.cc:
Fixed bug #8617 .
Queries with ROLLUP and LIMIT n returned more than n rows
if SQL_CALC_FOUND_ROWS was used.
2005-03-17 20:18:19 -08:00
jimw@mysql.com
845e02d3a7
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-17 17:59:52 -08:00
jimw@mysql.com
a1db46216e
Merge mysql.com:/home/jimw/my/mysql-5.0-build
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-17 17:27:07 -08:00
jimw@mysql.com
7214c51e72
Merge mysqldev@production.mysql.com:my/mysql-5.0-build
...
into mysql.com:/home/jimw/my/mysql-5.0-build
2005-03-17 17:24:47 -08:00
jimw@mysql.com
dcd336d79d
Fix merge of sql/sql_select.cc using Igor's patch (Bug #9254 )
2005-03-17 17:22:40 -08:00
brian@zim.(none)
4634b7c724
Merge zim.(none):/home/brian/mysql/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.1
2005-03-17 17:21:51 -08:00
brian@zim.(none)
499f12faf2
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/mysql-5.1
2005-03-17 17:16:31 -08:00
heikki@hundin.mysql.fi
3ec4d8a773
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-18 02:25:41 +02:00
lenz@mysql.com
afcedb8847
Merge mysql.com:/space/my/mysql-5.0-build
...
into mysql.com:/space/my/mysql-5.0
2005-03-18 01:25:40 +01:00
jimw@mysql.com
78897b46f0
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-17 15:59:11 -08:00
lenz@mysql.com
ac5cdb6125
- fixed two merge errors
2005-03-18 00:30:20 +01:00
brian@zim.(none)
904e329036
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-03-17 14:49:36 -08:00
brian@zim.(none)
0a5c73ecd4
Missed this file in the embedded server when MIT Threads were removed.
2005-03-17 14:48:38 -08:00
jimw@mysql.com
7b1b5f1656
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-17 14:24:29 -08:00
jimw@mysql.com
faaf5ba8c4
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-17 13:41:21 -08:00
konstantin@mysql.com
371850a459
Cleanup of Item_func_group_concat
2005-03-18 00:41:03 +03:00
jimw@mysql.com
25a1ca078a
Merge mysql.com:/home/jimw/my/mysql-5.0-build
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-17 13:38:07 -08:00
konstantin@mysql.com
60e7da0a67
Remove unexistent @MT_INCLUES@
2005-03-18 00:24:35 +03:00
mysqldev@mysql.com
c59e0fc78b
Merge
2005-03-17 22:17:37 +01:00
mysqldev@mysql.com
7d5c7f5ec6
sp.test, sp.result:
...
transactional test removed
sp_trans.test, sp_trans.result:
new file
2005-03-17 22:15:23 +01:00
lenz@mysql.com
608f957947
Merge mysql.com:/space/my/mysql-5.0-build
...
into mysql.com:/space/my/mysql-5.0
2005-03-17 21:54:10 +01:00