Commit graph

1951 commits

Author SHA1 Message Date
msvensson@pilot.(none)
2792966d7c Merge pilot.(none):/data/msvensson/mysql/bug28690/my51-bug28690
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-07 10:00:43 +02:00
msvensson@pilot.(none)
5ca0edd73f Merge pilot.(none):/data/msvensson/mysql/bug28690/my50-bug28690
into  pilot.(none):/data/msvensson/mysql/bug28690/my51-bug28690
2007-06-07 09:50:53 +02:00
msvensson@pilot.(none)
b5ebfe45ed Bug#28690 mysql-enterprise-gpl-5.0.40-linux-i686-glibc won't start on Debian Sarge
- Only use the "hack for bug in NTPL" if using NTPL, by dynamically
   checking the thd_lib_detected flag
2007-06-07 09:48:37 +02:00
tsmith@quadxeon.mysql.com
4b93804592 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
2007-06-05 17:51:30 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
2c8f4f9791 Added casts to avoid compiler warnings and fixed a wrong type.
---
Added casts and fixed wrong type.
---
Added casts and fixed wrong type.
---
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
---
Don't give warning that readonly variable is forced to be readonly
mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms
---
Disabled compiler warnings mainly for Win 64.
---
Added casts to remove compiler warnings on windows
Give warnings also for safe_mutex errors found by test system
Added some warnings from different machines in pushbuild
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  mysql.com:/home/my/mysql-5.1
---
Added escapes for double quotes and parenthesis.
---
Archive db fix plus added non-critical warnings
in ignore list.
---
Fixed previously added patch and added new ignored warning.
2007-05-31 17:45:22 +03:00
tsmith@quadxeon.mysql.com
91c484339c Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-05-30 23:48:20 +02:00
msvensson@pilot.(none)
dec1657ac2 Merge pilot.(none):/data/msvensson/mysql/bug27597/my51-bug27597
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-05-29 12:54:02 +02:00
msvensson@pilot.(none)
17e575ce96 Merge pilot.(none):/data/msvensson/mysql/bug27597/my50-bug27597
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-05-29 12:53:23 +02:00
msvensson@pilot.(none)
5ceeb93291 Merge pilot.(none):/data/msvensson/mysql/bug27597/my50-bug27597
into  pilot.(none):/data/msvensson/mysql/bug27597/my51-bug27597
2007-05-29 12:53:03 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
b035219762 Changed accidently added tabs back into spaces.
Fixed a bug that came in merge.
2007-05-28 14:37:39 +03:00
jani@linux-th5m.site
ee4d6b4fc0 Merged from main 5.1 2007-05-24 19:47:58 +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
jani@a88-113-38-195.elisa-laajakaista.fi
fc3b3a0a86 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-05-24 13:24:36 +03:00
svoj@june.mysql.com
e232d9ced6 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 15:31:28 +05:00
svoj@mysql.com/june.mysql.com
8a809def0a Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
2007-05-17 15:27:56 +05:00
svoj@mysql.com/june.mysql.com
f6a111dfef Addition to fix for
BUG#25712 - insert delayed and check table run together report crashed
            tables
Fixed wrongly applied patch.
2007-05-17 15:23:59 +05: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
svoj@mysql.com/april.(none)
bf473b1069 Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
2007-05-17 00:40:26 +05:00
svoj@mysql.com/april.(none)
3ea2ee357b BUG#25712 - insert delayed and check table run together report crashed
tables

In case system doesn't have native pread/pwrite calls (e.g. Windows)
and there is CHECK TABLE runs concurrently with another statement that
reads from a table, the table may be reported as crashed.

This is fixed by locking file descriptor when my_seek is executed on
MyISAM index file and emulated pread/pwrite may be executed concurrently.

Affects MyISAM tables on platforms that do not have native
pread/pwrite calls (e.g. Windows).

No deterministic test case for this bug.
2007-05-16 23:42:32 +05:00
msvensson@pilot.blaudden
47536706a0 Bug#27597 mysqld-debug broken
- Send errors from RTC(Runtime Error Check) to stderr instead of
popping up an MessageBox asking to debug
2007-05-14 16:04:36 +02:00
istruewing@chilla.local
3ed42fbb2d Bug#17332 - changing key_buffer_size on a running server
can crash under load
Post-post-review fixes.
Fixed a typo == -> =
Optimized normal flush at end of statement (FLUSH_KEEP),
but let other flush types be stringent.
Added comments.
Fixed debugging.
2007-05-14 11:33:47 +02:00
istruewing@chilla.local
e2fa2becfc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  chilla.local:/home/mydev/mysql-5.1-bug17332
2007-05-10 17:30:50 +02: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
acurtis/antony@ltamd64.xiphis.org
a4dbc0990c Merge xiphis.org:/home/antony/work2/mysql-5.1-engines
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
2007-05-04 23:35:14 -07:00
dkatz@damien-katzs-computer.local
33f8677d88 Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into  damien-katzs-computer.local:/Users/dkatz/mysql51
2007-04-30 17:47:58 -04:00
dkatz@damien-katzs-computer.local
b578abc0c1 Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into  damien-katzs-computer.local:/Users/dkatz/50_frm_files
2007-04-30 17:04:14 -04:00
istruewing@chilla.local
581b8504f3 WL#2936 - Falcon & MySQL plugin interface: server variables
Avoid compiler warnings
2007-04-30 18:49:38 +02:00
tsmith@quadxeon.mysql.com
bfb0448a4d Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-04-28 01:36:09 +02:00
tsmith@quadxeon.mysql.com
b90b0c7eb2 Bug #27390: mysqld_multi --config-file= not working as documented
Recognize the --no-defaults, --defaults-file and --defaults-extra-file
options.  Treat old --config-file argument as if --defaults-extra-file
had been specified instead.

Plus a few other defaults-related cleanups.
2007-04-28 01:27:54 +02:00
istruewing@chilla.local
e327818c28 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  chilla.local:/home/mydev/mysql-5.1-wl2936-two
2007-04-27 19:09:39 +02:00
serg@sergbook.mysql.com
31c1a1c9c3 fixed: memleak in --help, sigsegv on shutdown
Ingo's patch:
WL#2936 - Falcon & MySQL plugin interface: server variables
Added initialization for plugin string variables with their
default values.
Added deallocation of string values before a plugin and its
variables is deleted.
Added examples to plugin_example
2007-04-26 21:26:04 +02:00
istruewing@chilla.local
98ff6f0a95 WL#2936 - Falcon & MySQL plugin interface: server variables
Added initialization for the plugin structure created in
plugin_add().
Made a correct argument vector in mysql_install_plugin():
handle_options() assumes that arg0 (program name) always exists.
2007-04-24 10:40:23 +02:00
cmiller@zippy.cornsilk.net
bd31322626 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
2007-04-20 13:52:57 -04:00
cmiller@zippy.cornsilk.net
0b69216315 Avoid compiler warnings. 2007-04-20 13:49:06 -04:00
cmiller@zippy.cornsilk.net
dfdc475a57 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint--pthreadkeycreate
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
2007-04-19 17:23:41 -04:00
cmiller@zippy.cornsilk.net
28b3218e45 Bug #27964: pthread_key_create doesn't set errno, so don't report \
errno

Vasil Dimov (at Oracle) noted that pthread_key_create() does not
set errno, so if it fails then we return the wrong error code.

Instead, capture the return value, which is the real error value, 
and instead report that.
2007-04-19 17:07:11 -04:00
dkatz@damien-katzs-computer.local
cbcb418f76 Bug #25761 Table is partially created when disk is full, causing database corruption 2007-04-19 13:41:12 -04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
df75e6e50e Merge mysql.com:/home/ram/work/mysql-5.0-maint
into  mysql.com:/home/ram/work/b26851/b26851.5.0
2007-04-19 11:45:26 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
3a0042c757 Merge mysql.com:/home/ram/work/b26851/b26851.5.0
into  mysql.com:/home/ram/work/b26851/b26851.5.1
2007-04-19 11:07:19 +05:00
tsmith@siva.hindu.god
9232def96b Merge siva.hindu.god:/home/tsmith/m/bk/51
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-04-18 14:55:42 -06:00
tsmith@siva.hindu.god
39496731a2 Merge siva.hindu.god:/home/tsmith/m/bk/50
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
2007-04-18 14:50:32 -06:00
istruewing@chilla.local
3a0d2806df WL#2936 - Falcon & MySQL plugin interface: server variables
Fixed a compiler dependent expression to be more portable.
Initialized 'dummy' in construct_help_options() so that loaded
plugin show themselves as TRUE in the help output.
2007-04-18 14:37:57 +02:00
dkatz@damien-katzs-computer.local
227115fa2b Merge damien-katzs-computer.local:/Users/dkatz/50b
into  damien-katzs-computer.local:/Users/dkatz/51merge
2007-04-16 14:08:03 -04:00
dkatz@damien-katzs-computer.local
138f003738 Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into  damien-katzs-computer.local:/Users/dkatz/50b
2007-04-16 13:49:17 -04:00
monty@mysql.com/narttu.mysql.fi
72d135bec5 Clear field_alloc when it's moved to result set (allows us to always call free_root on field_alloc)
Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems)
Removed memory leak in mysql_test if sync_with_master fails.
Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed.
Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits"
2007-04-16 17:08:29 +03:00
serg@sergbook.mysql.com
6bc9bc92df Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
2007-04-16 10:37:50 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e62dbcf746 Fix for
bug #27715: mysqld --character-sets-dir buffer overflow
bug ##26851: Mysql Client --pager Buffer Overflow

Using strmov() to copy an argument may cause overflow 
if the argument's length is bigger than the buffer:
use strmake instead.
Also, we have to encrease the error message buffer size to fit 
the longest message.
2007-04-16 12:28:02 +05:00
serg@janus.mylan
3ecbb5a443 wl#2936 - fixing problems 2007-04-13 19:23:02 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
c66f50fa68 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel
2007-04-13 09:04:34 +03:00
dkatz@damien-katzs-computer.local
dac9f99327 Bug #27322 failure to allocate transaction_prealloc_size causes crash
Fix for when memory pre-allocation fails.
2007-04-12 18:03:26 -04:00