istruewing@chilla.local
80b97a6b54
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-12-20 20:14:28 +01:00
pgalbraith@bk-internal.mysql.com
23f0c6d765
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-12-09 02:34:42 +01:00
istruewing@chilla.local
05dde1f311
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-12-08 15:55:56 +01:00
msvensson@neptunus.(none)
971c783f7d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-04 19:11:55 +01:00
iggy@rolltop.ignatz42.dyndns.org
b70d2b9341
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my51-bug17951
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
2006-12-04 12:38:41 -05:00
iggy@rolltop.ignatz42.dyndns.org
76d43f1fdd
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my50-bug17951
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my51-bug17951
2006-12-04 12:30:58 -05:00
baker@bk-internal.mysql.com
dbe5f0acc5
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-12-03 21:19:35 +01:00
brian@zim.(none)
31d67280f7
This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h
2006-12-01 17:26:52 -08:00
istruewing@chilla.local
cc4e2a85c6
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-12-01 22:59:51 +01:00
istruewing@chilla.local
fe206c71a7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-12-01 22:56:43 +01:00
andrey@example.com
8fcf14210d
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug24395-v2/my51
2006-12-01 16:27:48 +01:00
andrey@example.com
afb930947d
Merge example.com:/work/bug24395-v2/my50
...
into example.com:/work/bug24395-v2/my51
2006-12-01 11:37:33 +01:00
monty@mysql.com/narttu.mysql.fi
908ff4b1d1
After merge fixes
...
Marked some functions as noreturn
2006-11-30 23:23:23 +02:00
monty@narttu.mysql.fi
430d215c58
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2006-11-30 22:38:12 +02:00
monty@mysql.com/narttu.mysql.fi
3a35c30027
Fixed compiler warnings (Mostly VC++):
...
- Removed not used variables
- Changed some ulong parameters/variables to ulonglong (possible serious bug)
- Added casts to get rid of safe assignment from longlong to long (and similar)
- Added casts to function parameters
- Fixed signed/unsigned compares
- Added some constructores to structures
- Removed some not portable constructs
Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
(Added new parameter to net_clear() to define when we want the communication buffer to be emptied)
2006-11-30 03:40:42 +02:00
istruewing@chilla.local
172156d62d
Merge chilla.local:/home/mydev/mysql-5.0-bug23139
...
into chilla.local:/home/mydev/mysql-5.1-bug23139
2006-11-29 11:17:35 +01:00
monty@mysql.com/nosik.monty.fi
0e149b7170
Removed compiler warnings
...
Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Removed some %lld, as these are not portable
2006-11-27 18:16:08 +02:00
monty@mysql.com/nosik.monty.fi
fa81a82e7f
Fixed a LOT of compiler warnings
...
Added missing DBUG_RETURN statements (in mysqldump.c)
Added missing enums
Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes
Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
2006-11-27 01:47:38 +02:00
monty@nosik.monty.fi
89570bf966
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2006-11-22 14:11:36 +02:00
monty@nosik.monty.fi
38a92caeb7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-21 23:12:45 +02:00
monty@mysql.com/nosik.monty.fi
f6682e2743
Added --debug-info to most clients to detect memory leaks in mysql-test-run
...
Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
2006-11-21 22:32:58 +02:00
istruewing@chilla.local
c1bee74dff
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-11-15 14:39:05 +01:00
istruewing@chilla.local
502912b8d7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-11-12 14:15:01 +01:00
lars/lthalmann@dl145h.mysql.com
3776e9622b
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-11-07 19:26:31 +01:00
msvensson@neptunus.(none)
899dca14ee
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-03 17:53:10 +01:00
cmiller@zippy.cornsilk.net
b074e13483
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-02 17:51:59 -05:00
kostja@bodhi.local
965669d1f9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-11-02 03:24:11 +03:00
joerg@trift2.
0d27df6f1a
Merge trift2.:/MySQL/M51/clone-5.1
...
into trift2.:/MySQL/M51/push-5.1
2006-11-01 13:26:03 +01:00
msvensson@shellback.(none)
5a049ba807
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-30 13:45:24 +01:00
jonas@perch.ndb.mysql.com
f6fcb302ab
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-28 00:01:24 +02:00
istruewing@chilla.local
1264d85341
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-merge
2006-10-27 15:07:45 +02:00
istruewing@chilla.local
8a4838a5e1
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-bug22119
2006-10-25 17:28:35 +02:00
lars/lthalmann@dl145h.mysql.com
1ef49b93e7
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-10-25 17:12:09 +02:00
istruewing@chilla.local
d1ca3e7d1d
Merge chilla.local:/home/mydev/mysql-5.0-bug22119
...
into chilla.local:/home/mydev/mysql-5.1-bug22119
2006-10-25 15:40:12 +02:00
svoj@april.(none)
9ea75866d5
Merge mysql.com:/home/svoj/devel/mysql/BUG22053/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG22053/mysql-5.1-engines
2006-10-25 16:53:23 +05:00
petr/cps@owlet.local
eda71e24c3
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/home/cps/mysql/devel/5.1-rename-bug
2006-10-24 17:00:23 +04:00
tsmith/tim@siva.hindu.god
aeced431e3
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-10-23 23:41:07 -06:00
gkodinov@dl145s.mysql.com
bb0422a0b0
Merge bk-internal:/home/bk/mysql-5.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-10-20 11:12:35 +02:00
svoj@april.(none)
8b01686765
Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
2006-10-19 19:59:57 +05:00
gkodinov@dl145s.mysql.com
ea8ba03556
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-10-19 16:00:06 +02:00
holyfoot/hf@mysql.com/deer.(none)
b8e31d05f1
bug #23369 (Embedded library can't be linked)
...
Problem is that some files moved to storage/*/ still are dependent
on sql/ code (usually use members of THD structure)
that can get different being compiled with another #define-s
Code added to recompile these for the embedded server
2006-10-18 17:03:37 +05:00
stewart@willster.(none)
71636edc16
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
2006-10-18 18:51:39 +10:00
istruewing@chilla.local
8c6ba6ebb2
Merge chilla.local:/home/mydev/mysql-5.1--team
...
into chilla.local:/home/mydev/mysql-5.1-ateam
2006-10-16 12:43:03 +02:00
petr/cps@mysql.com/owlet.local
6846f8d9c4
Fix for Bug #17544 "Cannot do atomic log rotate",
...
Bug #21785 "Server crashes after rename of the log table" and
Bug #21966 "Strange warnings on create like/repair of the log
tables"
According to the patch, from now on, one should use RENAME to
perform a log table rotation (this should also be reflected in
the manual).
Here is a sample:
use mysql;
CREATE TABLE IF NOT EXISTS general_log2 LIKE general_log;
RENAME TABLE general_log TO general_log_backup, general_log2 TO general_log;
The rules for Rename of the log tables are following:
IF 1. Log tables are enabled
AND 2. Rename operates on the log table and nothing is being
renamed to the log table.
DO 3. Throw an error message.
ELSE 4. Perform rename.
The very RENAME query will go the the old (backup) table. This is
consistent with the behavoiur we have with binlog ROTATE LOGS
statement.
Other problems, which are solved by the patch are:
1) Now REPAIR of the log table is exclusive operation (as it should be), this
also eliminates lock-related warnings. and
2) CREATE LIKE TABLE now usese usual read lock on the source table rather
then name lock, which is too restrictive. This way we get rid of another
log table-related warning, which occured because of the above fact
(as a side-effect, name lock resulted in a warning).
2006-10-13 17:26:46 +04:00
bar@bar.intranet.mysql.r18.ru
d19c38dbc6
Merge mysql.com:/usr/home/bar/mysql-5.0-rpl.b22052
...
into mysql.com:/usr/home/bar/mysql-5.1-rpl
2006-10-12 09:40:01 +05:00
istruewing@chilla.local
61a5ddbd19
Bug#21627 - Warnings in build of myisampack
...
Added proper casts
No test case. myisampack must be tested manually.
2006-10-11 16:36:24 +02:00
andrey@example.com
2e2339e125
Merge example.com:/work/bug23074/my50-bug23074
...
into example.com:/work/bug23074/my51-bug23074
2006-10-11 11:48:33 +02:00
istruewing@chilla.local
bd69350e43
Bug#8283 - OPTIMIZE TABLE causes data loss
...
After merge fix. Renamed 'info' -> 'sort_param'.
2006-10-10 20:01:39 +02:00
istruewing@chilla.local
b15a23a79e
Merge chilla.local:/home/mydev/mysql-5.0-bug8283
...
into chilla.local:/home/mydev/mysql-5.1-bug8283
2006-10-09 22:24:55 +02:00
brian@zim.(none)
faff46eefe
Added license information display to output of plugins schema, and tagged all plugins with GPL flag.
2006-10-05 00:41:29 -07:00