serg@sergbook.mysql.com
2c6bc59307
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-02 12:33:42 +02:00
mskold@mysql.com
3d50cc0457
Fixed failed merge
2005-01-01 22:47:50 +01:00
mskold@mysql.com
94845764ca
Fixed failed merge
2005-01-01 22:40:40 +01:00
mskold@mysql.com
efbf87be07
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-01-01 21:57:41 +01:00
kent@mysql.com
27a2ba89c1
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-01 19:31:55 +01:00
kent@mysql.com
dc175d4665
mysql-test-run.pl:
...
Added --ps-protocol and --embedded-server
2005-01-01 19:27:41 +01:00
heikki@hundin.mysql.fi
637e643233
log0recv.c:
...
Fix a wrong memset in InnoDB Hot Backup code; the bug probably did not affect anything since we do not assume that the header of a log file is filled with zeros before writing the header info there; the bug found by Felix von Leitner
2005-01-01 13:49:53 +02:00
serg@sergbook.mysql.com
203cc19e48
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2004-12-31 18:00:49 +01:00
heikki@hundin.mysql.fi
7c31f2ff43
row0upd.c:
...
Fix a little bug in InnoDB: we looked at the physical size of a stored SQL NULL value from a wrong field in the index; this has probably caused no bugs visible to the user, only caused some extra space usage in some rare cases; we may later backport the fix to 4.0
2004-12-31 15:05:41 +02:00
mskold@mysql.com
20c89180fa
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2004-12-31 13:50:04 +01:00
lenz@mysql.com
8f499239e3
- updated compile-dist to include NDB cluster
2004-12-31 13:12:36 +01:00
lenz@mysql.com
bd5e4d81e7
Merge mysql.com:/space/my/mysql-4.0
...
into mysql.com:/space/my/mysql-4.1-build
2004-12-31 12:57:05 +01:00
serg@sergbook.mysql.com
b8cbe63bfe
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2004-12-31 12:55:42 +01:00
lenz@mysql.com
24af30e951
- Bootrap now uses "compile-dist" by default to create the source distribution
2004-12-31 12:46:18 +01:00
serg@sergbook.mysql.com
45ce994e5d
post-merge
2004-12-31 11:52:14 +01:00
lenz@mysql.com
f455778fc1
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-12-31 10:52:19 +01:00
lenz@mysql.com
12527e5c47
- added the "Archive", "CSV" and "Example" storage engines to the Linux
...
"Max" RPM
2004-12-31 10:38:51 +01:00
mronstrom@mysql.com
c6491a6873
Checking size to no of free + 1 was not correct when
...
entry was released before check. Thus empty it is when
size == no of free
This caused a memory leak which inserted a hard limit of
max 64 unique indexes in the cluster.
2004-12-31 02:18:21 +01:00
dlenev@brandersnatch.localdomain
cd98fcf4e9
Merged fixes for bug #7297 "Two digit year should be interpreted
...
correctly even with zero month and day" and bug #7515 "from_unixtime(0)
now returns NULL instead of the Epoch" into 4.1 tree.
2004-12-30 23:44:42 +03:00
mskold@mysql.com
76b2df6043
Merged bugfix
2004-12-30 21:36:16 +01:00
serg@sergbook.mysql.com
c7e756f959
merged
2004-12-30 21:11:40 +01:00
serg@sergbook.mysql.com
12bf7dcd04
unsufficient privilege checks in GRANT, when a grantor has column-level privileges
2004-12-30 21:01:11 +01:00
marty@linux.site
1ddb554b8b
Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browser
2004-12-30 19:56:09 +01:00
dlenev@mysql.com
4ef7ac5c09
Manual merge of fix for bugs of #7297 and #7515 into 4.1 tree.
2004-12-30 21:37:32 +03:00
dlenev@mysql.com
2600fb3bdf
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg7297
2004-12-30 21:18:45 +03:00
dlenev@mysql.com
2878395ab1
Fix for bug #7515 "from_unixtime(0) now returns NULL instead of
...
the Epoch". (With after review fixes).
2004-12-30 21:18:10 +03:00
dlenev@mysql.com
e0280694cd
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2004-12-30 20:41:29 +03:00
sergefp@mysql.com
60e7950942
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-look
2004-12-30 20:10:32 +03:00
joerg@mysql.com
fb378f15d5
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2004-12-30 16:47:37 +01:00
joerg@mysql.com
df1c8a1f2e
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1
2004-12-30 16:44:50 +01:00
kent@mysql.com
9d860c060b
Many files:
...
Perl version of mysql-test-run
new file
2004-12-30 16:34:01 +01:00
joerg@mysql.com
8311f83f06
Clean up the handling of "server" and "client" directories, while still avoiding the double listing of
...
common directories in 'SUBDIRS' macro ("make distclean" had failed due to that).
Solves bug#7368: "regex make error in 4.1.8"
2004-12-30 14:03:19 +01:00
sergefp@mysql.com
27e0f12ff1
Fix func_concat.result: allow -0.00 to be converted to string both with and without leading minus
2004-12-30 14:56:31 +03:00
dlenev@brandersnatch.localdomain
d70bd3f8fb
Fix for bug #6914 "Problems using time()/date() output in expressions".
...
When we cast datetime value to DATE (TIME) type we should throw away its
time (date) part. This was not done properly if CAST() function was used
in datetime expressions.
2004-12-30 13:39:01 +03:00
heikki@hundin.mysql.fi
2aa98f89aa
srv0start.c:
...
Print a more descriptive error and refuse to start InnoDB if the size of ibdata files is smaller than what is stored in the tablespace header; innodb_force_recovery will override this
2004-12-29 17:06:26 +02:00
lenz@mysql.com
e8e6d0577f
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-12-28 17:38:30 +01:00
serg@serg.mylan
cf6e2214d8
client/mysqldump.c
...
compilation failure fixed
cleanup
2004-12-28 17:33:49 +01:00
timour@mysql.com
1613bf2731
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-dbg
2004-12-28 13:22:39 +02:00
timour@mysql.com
064c73490b
Fix for BUG#7455.
...
The fix checks if the trim string argument is NULL. If so, the standard
mandates that the function result must be also NULL.
2004-12-28 11:57:56 +02:00
lenz@mysql.com
878ed021e9
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-12-28 10:08:37 +01:00
heikki@hundin.mysql.fi
2f9c038ecf
row0mysql.c:
...
Manually merge the latest FOREIGN KEY lock wait + DROP TABLE fix from 4.0
2004-12-27 21:22:06 +02:00
heikki@hundin.mysql.fi
a4d046d52a
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-12-27 20:40:18 +02:00
lars@mysql.com
15e2dd99dc
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/bkroot/mysql-4.1
2004-12-27 19:25:58 +01:00
heikki@hundin.mysql.fi
15dd6d358b
Merge
2004-12-27 20:21:31 +02:00
lars@mysql.com
967fac4ef6
WL#2319 V2: Exclude tables from dump
...
- Added a hash to keep track of database-table pairs.
- Specified database-table tables do not get dumped
2004-12-27 19:10:30 +01:00
heikki@hundin.mysql.fi
72d446ace5
row0mysql.c:
...
Fix the previous bug fix: dropping a table with FOREIGN KEY checks running on it caused a cascade of failed drops while the foreign key check was waiting for a lock
2004-12-27 20:06:40 +02:00
lenz@mysql.com
9682485c1e
- make sure that MYSQL_VERSION_ID created by "configure" does not contain any
...
non-numerical characters (if $VERSION was e.g. "4.1.8a", $MYSQL_VERSION_ID
resulted in "40108a", which broke the build as MYSQL_VERSION_ID must be
numerical)
2004-12-27 18:15:32 +01:00
heikki@hundin.mysql.fi
2ca0c44fe3
row0mysql.c:
...
Merge the two FOREIGN KEY bug fixes from 4.0, and add a TODO comment
2004-12-27 17:28:17 +02:00
heikki@hundin.mysql.fi
3595bcd72e
Merge hundin.mysql.fi:/home/heikki/mysql-4.0
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-12-27 17:19:27 +02:00
heikki@hundin.mysql.fi
b8d576d087
row0ins.c:
...
Fix bug: if we dropped a table where an INSERT was waiting for a lock to check a FOREIGN KEY constraint, then an assertion would fail in lock_reset_all_on_table(), since that operation assumes no waiting locks on the table or its records
row0mysql.c:
Fix bug: InnoDB failed to drop a table in the background drop queue if the table was referenced by a foreign key constraint
2004-12-27 17:15:38 +02:00