monty@narttu.mysql.fi
693b906f6e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-30 23:27:16 +02: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
baker@bk-internal.mysql.com
082de8dfce
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-30 01:45:16 +01:00
monty@narttu.mysql.fi
717284b85c
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2006-11-29 23:07:15 +02:00
kent@mysql.com/kent-amd64.(none)
ea5c7f9756
Many files:
...
Changed paths to ndb include directory to include "storage"
Makefile.am:
Adjusted path to yaSSL libtool libraries
ssl.m4:
Use libtool way of specifying yaSSL libraries
2006-11-29 18:36:51 +01:00
baker@bk-internal.mysql.com
94dc5d5379
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-29 18:31:13 +01:00
brian@zim.(none)
8a9c481e0d
Varchar hack to clean strings removed.
2006-11-28 18:30:41 -08:00
baker@bk-internal.mysql.com
f175a892ab
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-28 22:22:52 +01:00
kent@kent-amd64.(none)
2264dc7da0
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/mysql-5.1-build
2006-11-28 18:31:53 +01:00
monty@mysql.com/nosik.monty.fi
93f246d4c1
Fixed portablity problem
...
Removed warnings from mysqltest scripts
2006-11-28 05:43:30 +02:00
kent@kent-amd64.(none)
e99c548bcd
Merge mysql.com:/home/kent/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/mysql-5.1
2006-11-27 23:12:05 +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
baker@bk-internal.mysql.com
098571df33
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-22 05:54:30 +01: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
brian@zim.(none)
39458a6e1b
This straightens up usage of have_ variables, and removes dead -skip-isam option.
2006-11-20 14:04:07 -08:00
msvensson@shellback.(none)
d2c45ec3c5
Bug#24361 valgrind error when shutting down mysqld connected to cluster
...
- Disconnect from transporter before starting to delete objects
2006-11-20 21:11:45 +01:00
brian@zim.(none)
f0c661f1ac
Refactored a number of engines to have correct init/deinit. Added pass support for "data" from plugin to plugin generic init to use memory location.
2006-11-19 18:01:54 -08:00
brian@zim.(none)
c13bf0e466
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/unmerge-5.1
2006-11-15 18:04:35 -08:00
brian@zim.(none)
5649195493
This finished the bzero() on varchar patch I wrote a few months ago. It also completes the data_length() method I added to Fields to determine the length of data for a particular data type. I have many uses for this :)
2006-11-15 17:55:17 -08:00
lars@black.(none)
63c906f749
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-13 12:45:31 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
eb28e03189
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug24190_many_field_in_rec_is_0
2006-11-12 18:04:19 +02:00
baker@bk-internal.mysql.com
52e03bac84
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-11 02:25:40 +01:00
brian@zim.(none)
b46c727a66
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-11-10 17:25:39 -08:00
brian@zim.(none)
739f2c27d0
This patch fixes the example engine, the example parser, and the example daemon to compile. AKA You can now test that the interface is actually working :)
2006-11-10 17:21:59 -08:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
d3976edabe
Bug #24190 many exportable definitions of field_in_record_is_null
...
mysql had several(2) exportable definitions of field_in_record_is_null function.
Fixed with adding static.
2006-11-10 17:22:43 +02:00
tsmith@quadxeon.mysql.com
18080530d7
Applied innodb-5.1-ss1004
...
Fixes:
- Bug #15815 : Very poor performance with multiple queries running concurrently
- Bug #22868 : 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #24089 : Race condition in fil_flush_file_spaces()
2006-11-09 05:01:19 +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
aaeef40e72
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-11-02 03:30:16 +03: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
jonas@perch.ndb.mysql.com
a172a5dc63
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-27 16:38:12 +02:00
jonas@perch.ndb.mysql.com
ebcc594ea3
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-27 16:37:16 +02:00
iggy/Administrator@amd64.
c5960a9818
Post Merge Cleanup
2006-10-26 15:41:47 -04:00
pekka@orca.ndb.mysql.com
0dac23f627
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-tux
2006-10-25 17:32:32 +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
knielsen@ymer.(none)
e43c5fca48
Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp
...
into ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
2006-10-25 10:44:22 +02:00
jonas@perch.ndb.mysql.com
d9d7c7859a
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-25 08:49:35 +02:00
jonas@perch.ndb.mysql.com
5230dcebcc
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-25 08:45:06 +02: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
jonas@perch.ndb.mysql.com
cfd146d911
5.1.12 - release clone
...
ndb - revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
2006-10-23 09:48:36 +02:00