summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | * | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-0713-56/+620
| | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | * | | | | | | | Added a test for a problem that was fixed by automerge and fixed a typo.unknown2004-05-072-4/+25
| | | | | | | | | * | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-0613-56/+599
| | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | | WL#1622: Post-merge fixesunknown2004-05-052-9/+8
| | | | | | | | | | * | | | | | | | Manual merge for WL#1622 code, will need fixesunknown2004-05-0513-57/+601
| | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | | More small WL#1622 fixes: Allocate name of Prepared Statement on PS's mem_root.unknown2004-04-301-4/+2
| | | | | | | | | | | * | | | | | | | WL#1622 "SQL Syntax for Prepared Statements" - cosmetic code review fixesunknown2004-04-304-14/+30
| | | | | | | | | | | * | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-3013-54/+580
| | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-28176-5766/+9264
| | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-1412-6/+452
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-141849-0/+503285
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | * | | | | | | | | | | Post-merge fixesunknown2004-04-141-2/+1
| | | | | | | | | | | | * | | | | | | | | | | Mergedunknown2004-04-1313-55/+582
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * | | | | | | | | | | WL#1622 "SQL Syntax for Prepared Statements": post-review fixes:unknown2004-04-135-166/+150
| | | | | | | | | | | | | * | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-099-6/+26
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-04-0813-24/+570
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Mergeunknown2004-04-0813-24/+570
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | * | | | | | | | | | | | Correct handling of parameter variables with NULL values in PREPARE queriesunknown2004-04-073-2/+17
| | | | | | | | | | | | | | | * | | | | | | | | | | | Post-merge fixesunknown2004-04-0513-24/+555
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | * | | | | | | | | | | | Many files:unknown2004-04-0513-24/+555
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbunknown2004-06-084-24/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/jonas/src/mysql-4.1unknown2004-06-072-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | BUG#4034unknown2004-06-072-4/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/jonas/src/mysql-4.1unknown2004-06-073-20/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | BUG#4037 fix printout of limitsunknown2004-06-072-3/+7
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2004-06-071-17/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | updating test's result now that SHOW BINLOG EVENTS quotes and escapes user va...unknown2004-06-071-17/+17
* | | | | | | | | | | | | | | | | | | | | | | | | | | | some ndb printout cleanupunknown2004-06-083-111/+35
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbunknown2004-06-0753-7526/+279
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ndb source tree cleanup, see respective fileunknown2004-06-0753-7526/+279
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-0777-3699/+7869
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-073-4/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Fix for bug#3946: Error in LPAD() when padstring is longer than 1 characterunknown2004-06-073-4/+21
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | mysqld.cc:unknown2004-06-071-2/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | mysqldump.c:unknown2004-06-071-2/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | client.c:unknown2004-06-071-26/+25
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-073-7/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Bug #3928 regexp [[:>:]] and UTF-8unknown2004-06-073-7/+51
| | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | Last patch before push into main tree. Updated from code review and final onc...unknown2004-06-074-44/+85
| * | | | | | | | | | | | | | | | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-055-79/+173
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | mysql_stmt_field_count()unknown2004-06-064-0/+13
| | * | | | | | | | | | | | | | | | | | | | | | | More comments in prepared statements code.unknown2004-06-062-79/+160
| * | | | | | | | | | | | | | | | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-0516-6/+3438
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-05-2516-6/+3438
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | Added tests for archive. Cleaned up a merge mistake and added some informatio...unknown2004-05-257-4/+2719
| | | * | | | | | | | | | | | | | | | | | | | | | | Mergeunknown2004-05-224-63/+132
| | | * | | | | | | | | | | | | | | | | | | | | | | Archive mergeunknown2004-05-222-41/+100
| | | * | | | | | | | | | | | | | | | | | | | | | | Resolving merge issues between archive and most recent changes by Monty/NDBunknown2004-05-2111-232/+821
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | First commit of archive example. Archive is a simple storage engine that hand...unknown2004-05-2011-5/+722
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Few more cleanups in client_test:unknown2004-06-051-264/+13