1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-29 00:08:14 +03:00
Commit Graph

40 Commits

Author SHA1 Message Date
Justin.He/justin.he@dev3-240.dev.cn.tlan
f8a85abf3c Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
2007-08-30 16:17:32 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
01884a431f Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
2007-08-16 11:12:05 +08:00
gni/root@dev3-221.dev.cn.tlan
a60888f169 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug27683
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug27683
2007-08-08 18:23:32 +08:00
tomas@whalegate.ndb.mysql.com
fc50cd5ab2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-merge
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-07-13 10:35:03 +02:00
tomas@whalegate.ndb.mysql.com
e22ba29c2b fix ndb_version.h so that it is usable and make some functions public to handle ndb version 2007-07-11 14:36:44 +02: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
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
gni@dev3-221.dev.cn.tlan
305d0eaf02 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
2007-05-08 09:52:27 +08:00
gni@dev3-221.dev.cn.tlan
40060d2f2e Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240
2007-04-24 17:29:00 +08:00
gni@dev3-221.dev.cn.tlan
4648c56769 BUG#22240 Upgrading from cluster 5.0 to 5.1 does not resize VARCHARS as expected. With --no-upgrade (-u) option, user can decide if ignore the upgrade, the default action is to upgrade them. 2007-04-24 09:45:15 +08:00
tomas@whalegate.ndb.mysql.com
2e620e3db6 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-12 11:12:43 +02:00
tomas@poseidon.
12fd06a6cb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
2007-03-19 10:54:47 +01:00
tomas@poseidon.mysql.com
f4e0bc78dd Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-09 01:01:20 +07:00
tomas@poseidon.mysql.com
12bf7fbee5 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
2007-03-08 10:41:22 +07:00
tomas@poseidon.mysql.com
97ceb61fff corrected manual merge 2007-03-07 14:20:37 +07:00
tomas@poseidon.mysql.com
bd49cdd273 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
2007-03-07 13:44:54 +07:00
gni/root@dev3-221.dev.cn.tlan
d2a0c95aef Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
2007-02-15 16:27:21 +08:00
gni/root@dev3-221.dev.cn.tlan
525801e31b Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug24363
2007-02-15 13:44:01 +08:00
gni/root@dev3-221.dev.cn.tlan
53f7d72a5b BUG#24363 If the table structure has been changed, the default action about the restore will fail.
You can skip the table structure check with --skip-table-check (-s) option.
2007-02-05 16:48:08 +08:00
monty@narttu.mysql.fi
8a80e36ac3 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
2007-01-27 03:46:45 +02: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
gni/root@dev3-127.(none)
153e456cf1 BUG #14612 If a restore is done on a slave cluster, yet the apply_status and schema tables don't exist,
ndb_restore tool should create them.
2006-10-18 18:12:55 +08:00
jonas@perch.ndb.mysql.com
84e4df338d 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-10 15:27:47 +02:00
jonas@perch.ndb.mysql.com
94b8e56144 ndb -
ndb_restore Return OK even if temporary errors
    (otherwise mysql-test-run/ndb_restore can fail on really slow machines)
2006-10-10 15:26:39 +02:00
stewart@willster.(none)
3551165c90 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987

Merge 5.0-ndb into 5.1-ndb
2006-10-05 23:13:29 +10:00
dli@dev3-76.dev.cn.tlan
273de17cce Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-19651
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-19651
2006-09-28 20:52:28 +08:00
jonas@perch.ndb.mysql.com
c19ab931c6 ndb -
Fix bootstrap/compile error
2006-04-25 17:02:48 +02:00
tomas@poseidon.ndb.mysql.com
fde6059554 ndb_restore: more compatablitity checks 2006-04-25 17:02:46 +02:00
tomas@poseidon.ndb.mysql.com
cc138b5a3b Bug#18594 ndb_restore log boken in 5.1
- added compatability with 5.0
- added test case for compatability with 5.0 and 5.1
2006-04-21 01:51:58 +02:00
pekka@mysql.com
a2263a1fbf ndb - bug#17813 schema.query => blob 2006-03-23 04:59:14 +01:00
tomas@poseidon.ndb.mysql.com
ce10983ead forgot to commit in prev patch 2006-02-13 17:07:13 +01:00
tomas@poseidon.ndb.mysql.com
9a3b27dae9 manual merge 2006-02-13 14:25:31 +01:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
082e9a8132 WL #2747: After push fixes 2006-01-19 13:32:58 -05:00
mikron@c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
6bf5c9113d WL #2747: Fix such that backup and restore works for user defined
partitioned tables in NDB
2006-01-17 09:25:12 +01:00
tomas@poseidon.ndb.mysql.com
4b731ddfb4 wl2325 wl2324 2006-01-12 19:51:02 +01:00
jonas@perch.ndb.mysql.com
161645c81e wl2723 - ndb opt. nr 2006-01-11 11:35:25 +01:00
ndbdev@dl145c.mysql.com
86344c4a83 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-09-06 09:21:23 +02:00
ndbdev@dl145b.mysql.com
e6d3d73ce0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-22 13:53:59 +02:00
tomas@poseidon.ndb.mysql.com
911d878ca9 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-07-15 15:08:38 +02:00
brian@zim.(none)
2a7c71e309 Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00