Commit graph

40 commits

Author SHA1 Message Date
gluh@eagle.(none)
4f5868114a Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-12-13 15:56:04 +04:00
holyfoot/hf@hfmain.(none)
19d11753a8 Merge mysql.com:/home/hf/work/30284/my50-30284
into  mysql.com:/home/hf/work/30284/my51-30284
2007-11-24 14:57:51 +04:00
istruewing@stella.local
a545de21d1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  stella.local:/home2/mydev/mysql-5.1-bug4692
2007-11-14 15:22:54 +01:00
istruewing@stella.local
500d5c788e Merge stella.local:/home2/mydev/mysql-5.0-bug4692
into  stella.local:/home2/mydev/mysql-5.1-bug4692
2007-11-14 12:51:36 +01:00
svoj@june.mysql.com
b5c9a981d4 Merge mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-5.1-engines
2007-11-14 14:55:12 +04:00
istruewing@stella.local
241cd5f969 Bug#4692 - DISABLE/ENABLE KEYS waste a space
Fixed absurd compiler warnings of a Suse 10.1 system.
2007-11-05 10:57:52 +01:00
istruewing@stella.local
7aa8144460 Merge stella.local:/home2/mydev/mysql-5.0-bug4692
into  stella.local:/home2/mydev/mysql-5.1-bug4692
2007-10-30 09:51:05 +01:00
monty@mysql.com/nosik.monty.fi
e53a73e26c Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
Faster thr_alarm()
Added 'Opened_files' status variable to track calls to my_open()
Don't give warnings when running mysql_install_db
Added option --source-install to mysql_install_db

I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems
index_read()      -> index_read_map()
index_read_idx()  -> index_read_idx_map()
index_read_last() -> index_read_last_map()
2007-08-13 16:11:25 +03:00
jani@linux-th5m.site
f1807e1f25 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into  linux-th5m.site:/home/my/mysql-5.1-marvel
2007-05-24 15:26:10 +03:00
svoj@april.(none)
820651cd53 Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.1-engines
2007-05-17 02:16:31 +05:00
monty@mysql.com/narttu.mysql.fi
088e2395f1 WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:

- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t

Removed declaration of byte, gptr, my_string, my_size_t and size_s. 

Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
  instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
  as this requires fewer casts in the code and is more in line with how the
  standard functions work.
- Added extra length argument to dirname_part() to return the length of the
  created string.
- Changed (at least) following functions to take uchar* as argument:
  - db_dump()
  - my_net_write()
  - net_write_command()
  - net_store_data()
  - DBUG_DUMP()
  - decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
  argument to my_uncompress() from a pointer to a value as we only return
  one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
  the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
  casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.

Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
  needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
  explicitely as this conflict was often hided by casting the function to
  hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
  get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
  size_t. This was needed to properly detect errors (which are
  returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
  (portability fix)
- Removed windows specific code to restore cursor position as this
  causes slowdown on windows and we should not mix read() and pread()
  calls anyway as this is not thread safe. Updated function comment to
  reflect this. Changed function that depended on original behavior of
  my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
  m_size is the number of elements in the array, not a string/memory
  length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
  Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
  - Replaced some calls to alloc_root + memcpy to use
    strmake_root()/strdup_root().
  - Changed some calls from memdup() to strmake() (Safety fix)
  - Simpler loops in client-simple.c
2007-05-10 12:59:39 +03:00
serg@janus.mylan
68fd66e853 wl#3700 - post-review fixes:
s/ulonglong/key_part_map/, comments
2007-03-17 00:13:25 +01:00
serg@janus.mylan
a07fd5fa8f WL#3700: Handler API change: all index search methods - that is,
index_read(), index_read_idx(), index_read_last(), and
records_in_range() - instead of 'uint keylen' argument take
'ulonglong keypart_map', a bitmap showing which keyparts are
present in the key value.
Fallback method is provided for handlers that are lagging behind.
2007-01-29 10:40:26 +01:00
gkodinov/kgeorge@macbook.local
23acc5b630 mi_check.c:
added a missing DBUG_RETURN
2007-01-08 17:27:28 +02:00
gkodinov/kgeorge@macbook.local
a30c09c33f Merge macbook.local:/Users/kgeorge/mysql/work/mysql-5.0-opt
into  macbook.local:/Users/kgeorge/mysql/work/merge-5.1-opt
2007-01-08 12:32:48 +02:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
acurtis/antony@ltamd64.xiphis.org
54133c7e38 Merge xiphis.org:/home/antony/work2/mysql-5.1-engines
into  xiphis.org:/home/antony/work2/mysql-5.1-engines-merge
2006-12-26 12:33:21 -08:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01: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
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
gkodinov/kgeorge@macbook.gmz
a01e7b12ce Merge macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.0-opt
into  macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.1-opt
2006-09-27 13:03:41 +03:00
ingo@chilla.local
db0e7774aa Merge chilla.local:/home/mydev/mysql-5.0-ateam
into  chilla.local:/home/mydev/mysql-5.1-ateam
2006-07-06 13:18:00 +02:00
ingo@mysql.com
b487d8c252 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-amerge
2006-06-02 14:57:27 +02:00
ingo@mysql.com
e4f12577a6 Merge mysql.com:/home/mydev/mysql-5.0-bug19604
into  mysql.com:/home/mydev/mysql-5.1-bug19604
2006-05-31 10:27:53 +02:00
serg@serg.mylan
c250645c6e don't try to "estimate" a number of words that a plugin parser can produce 2006-05-30 20:06:29 +02:00
serg@serg.mylan
32711e7b00 Now ftparser does not need to bother about memory management -
it can tell MySQL to make a copy of everything (bug#17123)
2006-05-30 18:15:18 +02:00
ingo@mysql.com
83bd32079d Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug10405
2006-05-06 09:49:16 +02:00
ingo@mysql.com
f9cd0b3d95 Merge mysql.com:/home/mydev/mysql-5.0-bug10405
into  mysql.com:/home/mydev/mysql-5.1-bug10405
2006-05-03 16:39:14 +02:00
monty@mysql.com
343644dd5d Added support for key_block_size for key and table level (WL#602)
Added support for key_block_size to MyISAM.
Simplify interface to 'new Key' to make it easier to add new key options.
mysqld option --new is used to define where key options are printed.
(In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
Fixed some compiler warnings and a memory leak in ssl
2006-05-03 15:59:17 +03:00
brian@zim.(none)
cb07d52a7e This patch cleans up two tests which were a bit fragile from other failing tests. It also removes some variables associated with removed RAID support. 2006-02-24 13:20:51 -08:00
SergeyV@selena.
29941c07ed Merge selena.:H:/MYSQL/bkt/mysql-5.0
into  selena.:H:/MYSQL/bkt/mysql-5.1
2005-12-01 23:47:44 +03:00
monty@mysql.com
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +02:00
ndbdev@dl145c.mysql.com
f40c1576b0 Merge 2005-09-06 09:20:15 +02:00
brian@zim.(none)
57403ddc9d Merge zim.(none):/home/brian/mysql/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.1

Resolved to minor issues.
2005-08-30 14:40:02 -07:00
tulin@dl145b.mysql.com
a6c21a0791 merge 2005-07-19 21:56:10 +02:00
ndbdev@dl145b.mysql.com
8d44b54295 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-10 07:22:27 +02:00
tulin@dl145c.mysql.com
be861a7ccf merge 2005-05-19 09:04:24 +02:00
brian@zim.(none)
3e4607a3b8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/mysql-5.1
2005-04-26 19:07:13 -07:00
brian@zim.(none)
2a7c71e309 Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
Renamed from myisam/mi_check.c (Browse further)