gluh@gluh.mysql.r18.ru
fe0b425e0a
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-5.0.8941
2005-03-25 15:09:22 +03:00
gluh@gluh.mysql.r18.ru
a1e6b80b46
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-25 13:33:28 +03:00
gluh@gluh.mysql.r18.ru
bbd27199b6
Bug#9317: Wrong count for tables in INFORMATION_SCHEMA(fix after review)
2005-03-25 13:31:29 +03:00
gluh@gluh.mysql.r18.ru
d5e448870d
Fix for bug #8941 : garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.*
...
-skip the print of 'MAX_ROWS=#' for 'SHOW CRETAE TABLE' with information schema tables
2005-03-25 12:19:11 +03:00
bar@eagle.intranet.mysql.r18.ru
9fbfa7a9af
func_str.result:
...
post-merge fix.
,
2005-03-25 11:47:25 +04:00
bar@eagle.intranet.mysql.r18.ru
2a1ad57732
Merge
2005-03-25 10:43:35 +04:00
msvensson@neptunus.(none)
f953016a6f
Removed faulty merge
2005-03-24 18:15:58 +01:00
msvensson@neptunus.(none)
66b31520e9
Manual merge
2005-03-24 18:11:13 +01:00
gbichot@quadita2.mysql.com
7b0e872695
testing repl of timezone with LOAD DATA INFILE (hourra!)
2005-03-24 16:43:50 +01:00
gbichot@quadita2.mysql.com
62fc95b985
rpl_deadlock.result:
...
result update (default value changed from 4.1 to 5.0)
2005-03-24 16:11:58 +01:00
gbichot@quadita2.mysql.com
32f1e3b029
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-03-24 15:44:50 +01:00
bar@mysql.com
15378f833f
myisamchk.c:
...
Wrong help string fix.
2005-03-24 18:21:56 +04:00
bar@mysql.com
56b931f818
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2005-03-24 18:11:35 +04:00
bar@mysql.com
29ffcad226
Fixed that LEFT OUTER JOIN was replaced with a regulat join
...
in some cases, because "charset(x) = 'string'" was considered
as "x is not null" due to incorrect not_null_tables().
2005-03-24 18:10:46 +04:00
gbichot@quadita2.mysql.com
5acca04c7c
merge from 4.1
2005-03-24 14:32:40 +01:00
gluh@gluh.mysql.r18.ru
6ec480910d
Bug #9317 : Wrong count for tables in INFORMATION_SCHEMA
...
there was no check of result of
table->file->write_row() function. When count of rows was
more than table max_rows(HEAP table) the following recodrs
were not inserted to the table
-'schema_table_store_record' function is added.
The function checks result of write_row function
and convert HEAP table to MyISAM if necessary
- Result check after write_row is added into all
I_S function which store the records to I_S tables
2005-03-24 16:32:11 +03:00
msvensson@neptunus.(none)
ccea1af2ae
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug9303
2005-03-24 14:26:39 +01:00
msvensson@neptunus.(none)
bf2f6ff2d4
BUG#9303 blob field with specified length < 256 does not create tinyblob
2005-03-24 13:48:38 +01:00
konstantin@mysql.com
a8c1316c6b
Manual merge
2005-03-24 15:17:39 +03:00
konstantin@mysql.com
fd54ee4539
Fixes and test cases for Bug#8880 "Commands out of sync error with cursors"
...
and Bug#9159 "Server crash during mysql_stmt_close".
The patch adds support for single-row result sets in cursors.
2005-03-24 15:12:53 +03:00
msvensson@neptunus.(none)
fc7a83be00
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-03-24 12:30:57 +01:00
msvensson@neptunus.(none)
c4a698ea3e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-24 12:21:55 +01:00
joerg@mysql.com
c9d997b98c
The separate NDB information must be upgraded, too.
2005-03-24 10:52:29 +01:00
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
msvensson@neptunus.(none)
ef04608ecf
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-03-24 09:42:52 +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
msvensson@neptunus.(none)
50ac19ba37
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-03-23 22:01:19 +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
gbichot@quadita2.mysql.com
bd74a139dc
Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
2005-03-23 19:50:42 +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
gbichot@quadita2.mysql.com
19499229ed
"After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
...
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared
2005-03-23 19:19:36 +01: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
msvensson@neptunus.(none)
9f05cbfbd7
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-03-23 13:25:31 +01: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
msvensson@neptunus.(none)
a430d5a1a5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-23 09:41:01 +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