Commit graph

1496 commits

Author SHA1 Message Date
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
msvensson@neptunus.(none)
5f7f1329ee Merge bk-internal:/home/bk/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-11-30 17:15:05 +01:00
mskold/marty@linux.site
34cfad6486 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-11-30 15:48:28 +01:00
mskold/marty@linux.site
d7e375680a Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-11-30 15:31:20 +01:00
mskold/marty@linux.site
6db1610c21 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-11-30 14:45:54 +01:00
mskold/marty@mysql.com/linux.site
9169edf348 Removed return of illegal pointer, changed signatures to ndb_mgm_get_clusterlog_severity_filter and ndb_mgm_get_clusterlog_loglevel 2006-11-30 13:30:59 +01: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
msvensson@shellback.(none)
521464755c Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
2006-11-29 19:32:36 +01: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
msvensson@shellback.(none)
7ddc43e305 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-29 15:44:09 +01:00
jonas@perch.ndb.mysql.com
e699ca7304 ndb - bug#24105
Handle not started nodes correctly (for X restart)
  i.e dont wait for NF_COMPLETEREP
      but settle with NODEFAIL_REP
2006-11-29 13:10:14 +01:00
mskold/marty@linux.site
77a59a1f48 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-11-29 11:55:52 +01: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
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
msvensson@neptunus.(none)
e135cbde89 Merge bk-internal:/home/bk/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-11-28 16:54:49 +01:00
jonas@perch.ndb.mysql.com
9381d8c431 ndb - bug#24544
fix so backup message is printed even in case of "ndb_mgm -e"
2006-11-28 15:11:13 +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
mskold/marty@mysql.com/linux.site
9f572b7d4b bug#24470 MySQL Servers crashes during creating new tables with blob column: fix of error handling at resource shortage 2006-11-27 11:49:43 +01: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
msvensson@neptunus.(none)
58a8b34e20 Merge bk-internal:/home/bk/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-11-23 18:28:16 +01:00
jonas@perch.ndb.mysql.com
60b19639b9 ndb - bug#24543
Resend if master dies during alloc node id
2006-11-23 14:34:24 +01: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
jonas@perch.ndb.mysql.com
32f4f8908e ndb - no bugs number
1) Make sure not to read uninitialized data in unique index code
      harmless (atleast before dynattr)
  2) Dont update p_latest_trans_gci
      for dirty unique index lookup
2006-11-21 14:23:42 +01:00
jonas@perch.ndb.mysql.com
b455689440 ndb - bug#24331
Make sure LCP scan record is correct initialized
2006-11-21 14:21:11 +01:00
jonas@perch.ndb.mysql.com
9e0be46731 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-11-21 14:18:52 +01:00
msvensson@neptunus.(none)
dad28e635d Fix DBUG_ENTER to print the correct function name 2006-11-21 12:53:05 +01:00
jonas@perch.ndb.mysql.com
60dbbadd64 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-11-21 12:06:34 +01:00
jonas@perch.ndb.mysql.com
1a1b112a3e Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-11-21 11:59:21 +01: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
msvensson@neptunus.(none)
ad47d85a90 Bug#24361 valgrind error when shutting down mysqld connected to cluster
- Disconnect from transporter before starting to delete objects
2006-11-17 13:18:09 +01:00
pekka@orca.ndb.mysql.com
caaadb9b05 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-misc
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-misc
2006-11-16 18:15:03 +01:00
holyfoot/hf@mysql.com/deer.(none)
f8263518eb bug #22634 (partitioned tables with DATA DIRECTORY option corrupts table)
In fact the problem is inside the ARCHIVE engine.
It stores real datapath inside the ARM file, but doesn't implement
specific ha_archive::rename_table function.
As the ALTER TABLE statement first creates the table with the temporary
name and then renames it to the normal one, we get the temporary name
saved in ARM what leads to "can't open file" error.
Code modified to store only path in the ARM, without filename.
2006-11-16 15:13:48 +04: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
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
Justin.He/justin.he@dev3-47.dev.cn.tlan
c4151cc450 Merge dev3-47.dev.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-47.dev.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/bug19203-5.1-new-ndb-bj
2006-11-14 09:56:30 +08:00
Justin.He/justin.he@dev3-47.dev.cn.tlan
40888f48b9 BUG#19808, Online config. Wrong error message if DataMemory less than a data on cluster 2006-11-14 09:33:43 +08:00