joerg@mysql.com
8200cadeae
Update the version, as 5.0.3 was already cloned, and future changes will go into 5.0.4
2005-03-24 10:48:28 +01:00
konstantin@mysql.com
223bf565af
Add the test case for Bug#8722 "prepared statement with view crashes
...
server" to the test suite, the bug is no longer repeatable.
2005-03-24 00:48:16 +03:00
serg@serg.mylan
1321740df6
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-23 22:33:47 +01:00
konstantin@mysql.com
7c2d154e76
Fix a valgrind warning spotted while trying to repeat Bug#7166
...
"Server crashes when running out of connections"
2005-03-23 23:39:20 +03:00
serg@serg.mylan
5c0b772838
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-23 21:37:56 +01:00
konstantin@mysql.com
39d4db50bd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/media/sda1/mysql/mysql-5.0-6282
2005-03-23 21:38:00 +03:00
konstantin@mysql.com
06cfe9a4a4
A test case for Bug#6282 "Packet error with SELECT INTO"
...
(the bug itself is no longer repeatable).
2005-03-23 21:36:15 +03:00
serg@serg.mylan
9a0dd5c7e4
sql/sql_acl.cc
...
report correct errror in MODE_NO_AUTO_CREATE_USER
cleanup
after merge fixes
2005-03-23 19:18:25 +01:00
paul@kite-hub.kitebird.com
e4b5fe3efe
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
2005-03-23 10:52:26 -06:00
paul@kite-hub.kitebird.com
4472235a68
Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
...
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2005-03-23 10:47:24 -06:00
paul@kite-hub.kitebird.com
555815734e
README:
...
Fix typo.
2005-03-23 10:45:57 -06:00
heikki@hundin.mysql.fi
7c40ac32ba
ha_innodb.cc:
...
Fix bug #9314 in InnoDB true VARCHAR: InnoDB stored the 'position' of a row wrong in a column prefix primary key index; this could cause MySQL to complain 'ERROR 1032: Can't find record in ...' in an update of the primary key, and also some ORDER BY or DISTINCT queries
2005-03-23 18:00:22 +02:00
ramil@mysql.com
00aaa80dbd
A fix (bug #9309 : Wrong order in INFORMATION_SCHEMA)
2005-03-23 17:39:20 +04:00
mskold@mysql.com
da48115b2b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-03-23 11:49:11 +01:00
georg@lmy002.wdf.sap.corp
626fcc4390
added symbols mysql_server_init and mysql_server_end to allow windows
...
applications with embedded server to connect to external servers too.
(required for Connector/OO.org)
2005-03-23 10:18:43 +01:00
serg@serg.mylan
d6bedfa8e0
merged
2005-03-23 09:42:24 +01:00
serg@serg.mylan
8fad60734e
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-23 09:27:59 +01:00
jimw@mysql.com
252bbe9eb9
Merge mysql.com:/home/jimw/my/mysql-5.0-5036
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-22 16:09:51 -08:00
mskold@mysql.com
68e5cf494e
Merged
2005-03-22 22:31:51 +01:00
mskold@mysql.com
9347abfe8d
Simplified rounding up to nearest 64-bit boundry
2005-03-22 22:12:24 +01:00
jimw@mysql.com
8372ba4c95
Merge mysql.com:/data0/mysqldev/my/mysql-5.0-build
...
into mysql.com:/data0/mysqldev/jimw/mysql-5.0-build
2005-03-22 21:57:03 +01:00
jimw@mysql.com
3ef3c59ed0
Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if
...
the row type is dynamic (For 4.1 tables old 'VARCHAR' fields are converted to
true VARCHAR in the next ALTER TABLE)
This ensures that one can use MySQL 5.0 privilege tables with MySQL 4.1.
(Fix imported from main 5.0 tree to 5.0.3 build tree.)
2005-03-22 21:52:01 +01:00
serg@mysql.com
cc440db7db
Merge mysql.com:/data0/mysqldev/my/mysql-5.0-build
...
into mysql.com:/data0/mysqldev/serg/m50b
2005-03-22 20:15:56 +01:00
serg@mysql.com
f7cbe9a2cc
BUG#9339 - Updating a column does not work if the table has a UTF-8 VARCHAR primary key
...
fixed my_charpos() call in Field_varstring::get_key_image
2005-03-22 20:13:49 +01:00
jimw@mysql.com
df015d61d6
Merge mysql.com:/data0/mysqldev/my/mysql-5.0-build
...
into mysql.com:/data0/mysqldev/jimw/mysql-5.0-build
2005-03-22 20:02:53 +01:00
mskold@mysql.com
2adabcb328
Added better comment for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index
2005-03-22 17:48:28 +01:00
mskold@mysql.com
27dbed4384
Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index
2005-03-22 17:42:08 +01:00
serg@serg.mylan
e029e3eb61
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-22 16:11:43 +01:00
kent@mysql.com
2a53e9d9a6
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-22 15:57:20 +01:00
mysqldev@mysql.com
45b810c8a7
Merge
2005-03-22 15:55:24 +01:00
mysqldev@mysql.com
ad26a667e6
sql_acl.cc, sql_acl.h, sql_parse.cc
...
New privilege CREATE USER (CREATE_USER_ACL, Create_user_priv) added
grant2.test:
new tests (mostly backported from jani's patch)
system_mysql_db.result, sp.result, grant2.result, grant.result:
results updated
2005-03-22 15:54:18 +01:00
kent@mysql.com
b87ebf30bb
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-03-22 15:31:56 +01:00
kent@mysql.com
466d3bff25
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
2005-03-22 15:14:40 +01:00
kent@mysql.com
f3d284c8bc
mysql-test-run.sh, mysql-test-run.pl:
...
InnoDB needs longer start time for second slave on slow hosts
2005-03-22 15:12:05 +01:00
jani@ua141d10.elisa.omakaista.fi
40c951314e
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-03-22 15:58:07 +02:00
jani@ua141d10.elisa.omakaista.fi
01dddf095a
- Added new error message.
...
- Changed error message in sql_acl.cc
- Added some more tests for GRANT.
2005-03-22 15:57:24 +02:00
monty@mysql.com
cc56005130
Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if the row type is dynamic
...
(For 4.1 tables old 'VARCHAR' fields are converted to true VARCHAR in the next ALTER TABLE)
This ensures that one can use MySQL 5.0 privilege tables with MySQL 4.1
2005-03-22 15:48:06 +02:00
joerg@mysql.com
06862bc15f
Merge mysql.com:/M50/build-5.0.3 into mysql.com:/M50/push-5.0
2005-03-22 11:53:29 +01:00
gbichot@production.mysql.com
fc7234cb4a
disabling rpl_timezone.test if --ps-protocol, as binlogging of CONVERT_TZ(,,@@time_zone)
...
fails there; until we find reason (me and possibly Konstantin).
2005-03-22 11:38:51 +01:00
joerg@mysql.com
4fd932b772
Revert the inclusion of 'signal.h' as the module contains 'kill()'.
2005-03-22 10:39:26 +01:00
jimw@mysql.com
dd39350074
Merge jwinstead@production.mysql.com:mysql-5.0-build
...
into mysql.com:/data0/mysqldev/jimw/mysql-5.0-build
2005-03-22 02:06:34 +01:00
monty@mysql.com
f849ac68a5
Fixed newly introduced bug in ROLLUP
2005-03-22 02:36:31 +02:00
gbichot@production.mysql.com
ac47ee1808
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
2005-03-22 01:32:24 +01:00
gbichot@production.mysql.com
56495a3691
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
2005-03-22 00:28:33 +01:00
gbichot@production.mysql.com
c766efdc5d
Last part of WL#1062: better replication of timezones: no more use
...
of SET ONE_SHOT; storing tz info directly in event (if this info is needed),
it's now allowed to have different global tz on master and slave.
2005-03-22 00:26:12 +01:00
petr@mysql.com
b10b7017fc
Merge mysql.com:/home/cps/mysql/devel/im-failure-fix
...
into mysql.com:/home/cps/mysql/devel/merge-5.0
2005-03-22 02:22:48 +03:00
petr@mysql.com
b072eaa3da
Fix for AIX compilation failure: sacred knowledge of my_global.h nature (it should be
...
included before any other include) was hidden from me.
2005-03-22 02:04:14 +03:00
jimw@mysql.com
4c67678f15
Fix Windows compile warnings, declarations of walk functions
2005-03-22 00:00:24 +01:00
jimw@mysql.com
7b985df2a0
Remove references to no-longer-used MySqlManager project files
2005-03-21 23:32:27 +01:00
monty@mysql.com
d8b078e423
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-21 23:46:11 +02:00