Commit graph

678 commits

Author SHA1 Message Date
peter@mysql.com
d21402052c One more commit to do the merge of new 4.1 tree 2002-10-06 13:42:16 +04:00
bell@sanja.is.com.ua
199f667c19 merging 2002-10-04 14:15:59 +03:00
peter@mysql.com
de57e9ba35 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-03 22:48:53 +04:00
monty@mashka.mysql.fi
2e52a69b12 Merge work:/my/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-10-03 16:56:09 +03:00
peter@mysql.com
0dc8dc2d5d Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-03 15:07:03 +04:00
bar@bar.mysql.r18.ru
2dae97b139 Failed to compile on FreeBSD:
no ulong type, one should use unsigned long instead
2002-10-03 13:12:31 +05:00
peter@mysql.com
66b1435ee2 Merging... 2002-10-03 00:13:08 +04:00
peter@mysql.com
f1155a98a4 Changeset to deal with 4.1 -> 4.0 merge 2002-10-02 23:43:27 +04:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +03:00
monty@mashka.mysql.fi
d69250a969 Fixes and code cleanups after merge with 4.0.3
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()

Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
2002-10-02 13:33:08 +03:00
lenz@mysql.com
3cf7acb756 - Applied required modifications for automake 1.5
- some additional small fixes
 - added "depcomp" for automake 1.5
2002-10-01 21:57:10 +02:00
lenz@mysql.com
019b5ab7b4 - backported gcc 3.0 linking fix from 4.0
- some cosmetical fixups (typos, comments)
2002-09-24 22:24:30 +02:00
monty@mashka.mysql.fi
efaaf0b4b8 Updated VC++ project files for 4.0.4
Only write short usage if one starts mysqldump without any options
Added query cache on windows
Added error message if one can't read privilege tables
2002-09-24 17:11:59 +03:00
monty@mashka.mysql.fi
ce4b584a85 Increased max possible max_allowed_packet to 1G
Small optimization to not do external locking of temporary MyISAM tables.
2002-09-19 17:49:41 +03:00
monty@mashka.mysql.fi
f638ee6df9 Added code to flush a bulk_insert index.
This fixes a bug when doing multi-row inserts on table with an auto_increment key that is not in the first key segment.
2002-09-18 21:04:49 +03:00
monty@mashka.mysql.fi
dfd0f82b93 Update mysql-test results after merge 2002-09-18 02:21:29 +03:00
monty@mashka.mysql.fi
7f55d92637 fixed so that --ssl and --skip-ssl works with the MySQL clients.
Fixed core dump bug when sending wrong string to AES_DECRYPT()
2002-09-17 23:46:53 +03:00
monty@mashka.mysql.fi
c85c33a5c1 Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables
Fixed bug in SELECT ... ORDER BY ... LIMIT
Fixed bug in ALTER TABLE and RENAME TABLE with --lower-case-table-names
Fixed hang when using --with-openssl
2002-09-16 15:55:19 +03:00
monty@mashka.mysql.fi
f3a186c905 Portability fixes.
Improve mysql-test to be more robust.
Fix that GRANT doesn't delete SSL options
Change innobase_flush_log_at_trx_commit to uint.
Don't rotate logs if we read a rotate log entry from the master.
2002-09-11 06:40:08 +03:00
monty@mashka.mysql.fi
0281a6b160 Fixed searching after ssl directories.
Fixed that GRANT ... REQUIRE options are not forgot when doing new GRANT
Changed fn_ext to point at first '.' after directory.
FLUSH LOGS removed numerical extension for all future update logs.
Fixed the mysqld --help reports right values for --datadir and --bind-address
--log-binary=a.b.c now properly strips of .b.c
Fix that one can DROP UDF functions that was not loaded at startup
Made AND optional in REQUIRE
Added REQUIRE NONE
2002-09-05 16:17:08 +03:00
bell@sanja.is.com.ua
d9989c635e merged 2002-09-03 10:06:10 +03:00
bell@sanja.is.com.ua
b07aaeb295 subselect with union
new error handling
Item_ref bug fixed
2002-09-03 09:50:36 +03:00
monty@narttu.mysql.fi
7134ffec21 Merge with 4.0.3
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
2002-08-30 12:40:40 +03:00
monty@hundin.mysql.fi
e720b5a6fb Portability fixes for windows 2002-08-28 17:00:58 +03:00
monty@hundin.mysql.fi
7dac7062fa Changed relay_log_space to ulonglong
Removed compiler warnings.
2002-08-23 15:14:01 +03:00
monty@hundin.mysql.fi
03b0179af9 Use our version of RWLOCKS on UNIXWARE 7
More DBUG info for replication
Better error messages from replication
Fixed bug in replication code when connecting to 'localhost' (time was not released properly)
Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
Removed warning when setting an AUTO_INCREMENT field to NULL
2002-08-21 22:04:22 +03:00
monty@hundin.mysql.fi
f7c8bd0e47 Portability fixes for 4.0.3 build.
Don't update MyISAM index file on UPDATE if index is not changed
2002-08-17 18:02:56 +03:00
monty@hundin.mysql.fi
5773b6504a Fixed bug in blocking handling when compiling with OPENSSL (caused hangup in client code)
Fixed bug in SELECT DISTINCT ... ORDER BY not-used-column.
Fixed bug in pthread_mutex_trylock with HPUX 11.0
2002-08-17 00:35:51 +03:00
monty@hundin.mysql.fi
65334e1c58 Fix for HPUX 11 and pthread_mutex_lock 2002-08-16 16:50:57 +03:00
monty@hundin.mysql.fi
a0e9e22320 Fixed typo so that ulonglong are properly converted to double on AIX with gcc 3.1 2002-08-16 12:50:21 +03:00
monty@hundin.mysql.fi
3ef9d44edc merge with 3.23.52 2002-08-12 04:04:43 +03:00
monty@hundin.mysql.fi
b779b63862 Fixed problem with BIGINT and shutdown on AIX
Moved IF(test,column,NULL) code to 4.0
Changed mysys_priv.h to include my_pthread.h or my_no_pthread.h.
Removed some CR's in os2 files.
2002-08-12 03:28:02 +03:00
lenz@mysql.com
7d33814c1b After discussing it with Monty by phone once more:
- Only define alloca as a compiler builtin, if we use GCC and there
   is no alloca.h installed
2002-08-10 01:47:51 +02:00
monty@hundin.mysql.fi
ac6e640c4d Fix for SSL and new my_getopt
Fix for syntax error bug in SET TRANSACTION ISOLATION
2002-08-09 16:47:16 +03:00
walrus@mysql.com
c32aef4013 server-key.pem regenerated
server-cert.pem	regenerated
client-key.pem	regenerated
client-cert.pem	regenerated
cacert.pem	regenerated
sslopt-case.h	changed optarg to argument, decomment --ssl-key
2002-08-08 21:43:44 +02:00
walrus@mysql.com
d52b1cf5f8 sslopt-case.h changed optarg to argument, decomment ssl-key option 2002-08-08 21:27:17 +02:00
monty@hundin.mysql.fi
ea3fe233e3 Portability fix for AIX 2002-08-08 22:09:25 +03:00
lenz@mysql.com
666342d312 - portability fix for AIX in include/my_sys.h: define alloca as a
compiler builtin when using gcc
2002-08-08 20:09:57 +02:00
monty@hundin.mysql.fi
8832927d5c Added nety_retry_count as a changeable variable
Make safe_mysqld a symlink to mysqld_safe in binary distribution
Fixed problem with CTRL-C when using mysqld --bootstrap
2002-08-08 20:49:06 +03:00
monty@hundin.mysql.fi
087261482a merge with 3.23.52 2002-08-08 15:24:47 +03:00
monty@hundin.mysql.fi
8be1cdeb89 merge 2002-08-08 12:05:18 +03:00
monty@mashka.mysql.fi
1bb7665a9c merge 2002-08-08 03:29:36 +03:00
monty@hundin.mysql.fi
a31406e34e Fix for Intel compiler (ecc)
Minor cleanups to other patches.
Make --temp-pool default
2002-08-08 03:14:44 +03:00
monty@mashka.mysql.fi
2c4fa340cc Lots of code fixes to the replication code (especially the binary logging and index log file handling)
Fixed bugs in my last changeset that made MySQL hard to compile.
Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables.
Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions
Extended my_chsize() to allow one to specify a filler character.
Extend vio_blocking to return the old state (This made some usage of this function much simpler)
Added testing for some functions that they caller have got the required mutexes before calling the function.
Use setrlimit() to ensure that we can write core file if one specifies --core-file.
Added --slave-compressed-protocol
Made 2 the minimum length for ft_min_word_len
Added variables foreign_key_checks & unique_checks.
Less logging from replication code (if not started with --log-warnings)
Changed that SHOW INNODB STATUS requre the SUPER privilege
More DBUG statements and a lot of new code comments
2002-08-08 03:12:02 +03:00
monty@hundin.mysql.fi
842e8fca83 Backported pthread_mutex_trylock code from MySQL 4.0 to fix problem on HPUX.
Removed Heikki's patch for handling this.
2002-08-06 17:15:51 +03:00
lenz@mysql.com
bbbfcdca68 - Added missing files to distribution
- removoved getopt.h (has been replaced by my_getopt.h)
2002-08-06 13:59:07 +02:00
heikki@hundin.mysql.fi
01bed722c7 my_pthread.h, configure.in:
In HP-UX-10.20, but not in HP-UX-11.0, the return value of pthread_mutex_trylock is inverted
2002-08-06 12:32:56 +03:00
monty@mashka.mysql.fi
274f80626e Changed initialization of RND() to be less predictable.
Use MYSQL_CONFIG_NAME instead of "my" as the configuration file name.
2002-08-06 03:21:12 +03:00
monty@mashka.mysql.fi
621b5da80e Fixed bug with GROUP BY on NULL fields.
(Merge of code from 4.0)
2002-08-05 18:10:53 +03:00
jani@rhols221.adsl.netsonic.fi
65c090085e Fix for QNX 6.2. 2002-08-05 15:23:11 +03:00