osku@127.(none)
945ea8a98b
Merge 127.(none):/home/osku/mysql/5.0/clean
...
into 127.(none):/home/osku/mysql/5.0/13315
2005-09-23 11:22:05 +03:00
osku@127.(none)
e6b3261556
InnoDB: Fix bug #13315 , index columns having a maximum length of 767.
2005-09-23 11:20:34 +03:00
brian@zim.(none)
f5c00b0dbd
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/fix-5.0
2005-09-22 19:46:16 -07:00
brian@zim.(none)
8eea3e5be0
This fixed bug 13369. Note, I dislike goto's as well.
...
The alias structure now is a bit more simple and just uses a pointer to replace with the currect name. The giant case statement should go away in the next patch.
2005-09-22 16:58:09 -07:00
konstantin@mysql.com
2d4c54ba1b
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-09-23 00:46:59 +04:00
msvensson@neptunus.(none)
4f03ab4943
Bug #13384 mysqltest, no protocol when script contains only lines with eval
2005-09-22 21:52:04 +02:00
joerg@mysql.com
cb77a6accb
Fixes needed to build 5.0.13 on Windows:
...
- reflect two "Makefile.am" changes in the respective "VC project" files,
- correct a typo in a (normally) unused macro parameter.
2005-09-22 18:57:07 +02:00
msvensson@neptunus.(none)
306dcf0620
Merge neptunus.(none):/home/msvensson/mysql/bug13164/my50-bug13164
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-22 12:29:11 +02:00
msvensson@neptunus.(none)
139601f997
Bug #13164 yassl: "SSL connection error" on several platforms
...
- it's a requirement fo yaSSL that either /dev/urandom or /dev/random is available on the target system.
- Added a fix that tries to open /dev/random if /dev/urandom is not available.
2005-09-22 12:19:09 +02:00
marko@hundin.mysql.fi
ff8127ffaa
InnoDB: correct two misleading comments
2005-09-22 13:09:14 +03:00
ramil@mysql.com
8660ccd9e1
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b11553
2005-09-22 12:53:37 +05:00
jonas@perch.ndb.mysql.com
2a002fc1ef
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-22 09:20:23 +02:00
jonas@perch.ndb.mysql.com
1f84a13977
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-22 09:10:11 +02:00
jonas@perch.ndb.mysql.com
f5761aa4e8
Add testcase for bug#13316
...
ndb big alter table
2005-09-22 09:09:27 +02:00
ramil@mysql.com
d9eb8958a2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b11553
2005-09-22 11:39:01 +05:00
jonas@perch.ndb.mysql.com
ac29fd0051
bug#13316
...
ndb alter table with big dicttabinfo
send alter_tab_req fragmented as signal can get larger than MAX_MESSAGE_SIZE
2005-09-22 08:35:27 +02:00
stewart@mysql.com
0d716ef8fa
GCC4 build fix
2005-09-22 15:48:40 +10:00
jonas@perch.ndb.mysql.com
dfd8cecad1
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-22 07:15:37 +02:00
jonas@perch.ndb.mysql.com
d25f763c2d
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-22 07:14:22 +02:00
jonas@perch.ndb.mysql.com
e02eb8d6e7
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-22 07:12:39 +02:00
jonas@perch.ndb.mysql.com
4009307f0b
ndb - fix gcc4 compile problem
2005-09-22 07:11:53 +02:00
monty@mysql.com
82fc54781b
Fixed problems found by valgrind
...
Fixed problems in test suite where some test failed
Fixed access to not initialized memory in federated
Fixed access to not initialized memory when using BIT fields in internal temporary tables
2005-09-22 03:23:07 +03:00
evgen@moonbone.local
2ba1eb1486
Manual merge
2005-09-22 02:38:14 +04:00
konstantin@mysql.com
6f8d3c4844
A fix and a test case for Bug#6513 "Test Suite: Values inserted by using
...
cursor is interpreted latin1 character and Bug#9819 "Cursors: Mysql Server
Crash while fetching from table with 5 million records."
A fix for a possible memory leak when fetching into an SP cursor
in a long loop.
The patch uses a common implementation of cursors in the binary protocol and
in stored procedures and implements materialized cursors.
For implementation details, see comments in sql_cursor.cc
2005-09-22 02:11:21 +04:00
evgen@moonbone.local
b7e8c8b112
Fix bug #13180 thd->allow_sum_funcs wasn't reset before query processing.
...
thd->allow_sum_func was left 'true' after previous statement thus allowing
sum funcs to be present in conditions.
thd->allow_sum_func should be set to 0 for each query and each prepared
statement reinitialization. This is done in lex_start() and
reset_stmt_for_execute().
2005-09-22 01:38:39 +04:00
shuichi@mysql.com
a5a4c412f1
Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/shuichi/apps/mysql/bk/mysql-5.0b
2005-09-21 11:18:04 -07:00
serg@serg.mylan
306aa15391
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-merged
2005-09-21 17:42:44 +02:00
serg@serg.mylan
3b41e3362b
aftermerge fix
2005-09-21 17:38:26 +02:00
lars@mysql.com
6d70588d9e
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-rollback-comment
2005-09-21 17:38:08 +02:00
jonas@perch.ndb.mysql.com
232ac1db8d
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-21 17:38:07 +02:00
jonas@perch.ndb.mysql.com
8f11620d9a
ndb merge fix
2005-09-21 17:37:33 +02:00
jonas@perch.ndb.mysql.com
9a33319d6c
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2005-09-21 17:27:04 +02:00
jonas@perch.ndb.mysql.com
ed8f33f057
bug#12950
...
ndb backup with charsets and simultanious updates
make sure that backup _dont_ read xfrm data
2005-09-21 17:24:39 +02:00
lars@mysql.com
83491f97f6
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-rollback-comment
2005-09-21 15:35:37 +02:00
jonas@perch.ndb.mysql.com
05d875f8c1
sql/item_func.cc
...
remove extra ";" after function
2005-09-21 14:36:55 +02:00
lars@mysql.com
ed7eac5973
Added clarification comment regarding added ROLLBACK to mysqlbinlog output
2005-09-21 14:27:41 +02:00
serg@serg.mylan
a083ff160e
merged
2005-09-21 13:53:22 +02:00
jonas@perch.ndb.mysql.com
f35c49f748
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
2005-09-21 13:22:59 +02:00
jonas@perch.ndb.mysql.com
6ed4539561
ndb post merge fixes (show engine ndb status)
2005-09-21 13:22:27 +02:00
serg@serg.mylan
23f35495ac
merged
2005-09-21 12:37:51 +02:00
msvensson@neptunus.(none)
f6b8032af5
Don't add all args to mysqltest to MYSQL_TEST env var
2005-09-21 10:24:46 +02:00
bell@sanja.is.com.ua
e6cb720095
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner5-5.0
2005-09-21 08:31:20 +03:00
bell@sanja.is.com.ua
506c6eb922
postmerge fixes
2005-09-21 08:29:47 +03:00
brian@zim.(none)
e3c87e16ae
Fixed a typo in handler.cc if CSV was built. I also added CSV to the default MAX builds so that more people test it.
2005-09-20 15:26:10 -07:00
sergefp@mysql.com
a26e1b7280
Merge mysql.com:/home/psergey/bk-trees/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-csc6030-r3
2005-09-21 02:20:55 +04:00
sergefp@mysql.com
f9475d1d15
BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index
...
statistics (like 4.0 did) (patch #3 , with review #1 & #2 feedback addressed)
2005-09-21 02:18:29 +04:00
bell@sanja.is.com.ua
3f66053a50
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner5-5.0
2005-09-20 21:27:28 +03:00
bell@sanja.is.com.ua
c1b185f5ff
WL#2787 (Add view definer/owner to the view definition (.frm) to check privileges on used tables and stored routines when using a VIEW.)
...
Part 2 postreview fixes.
2005-09-20 21:20:38 +03:00
evgen@moonbone.local
6383ab91db
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/12812-bug-5.0-mysql
2005-09-20 21:36:43 +04:00
evgen@moonbone.local
b7c42a65d1
item_func.cc:
...
Fixed mistake in fix for bug#12812
2005-09-20 21:35:57 +04:00