Commit graph

487 commits

Author SHA1 Message Date
serg@serg.mysql.com
1a1cafce63 merged 2002-10-25 22:07:04 +00:00
nick@mysql.com
eba70d6c80 Moved rand initialization from mysqld.cc to sql_class.cc:THD::THD() 2002-10-24 14:33:24 -06:00
nick@mysql.com
00d47646d5 Moved rand initialization from mysqld.cc to sql_class.cc:THD::THD() 2002-10-17 14:57:01 -06:00
monty@hundin.mysql.fi
9ecc5783d6 Fix after merge 2002-10-16 22:48:51 +03:00
monty@hundin.mysql.fi
fbf6ab4465 merge with 4.0.5 2002-10-16 19:30:24 +03:00
monty@hundin.mysql.fi
26b1bbdbd1 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-10-16 16:34:29 +03:00
monty@hundin.mysql.fi
67d3cd643b Merge with 3.23.54 2002-10-16 13:11:25 +03:00
jani@rhols221.adsl.netsonic.fi
4143937723 Fixed some bugs in mysql, mysqladmin and mysqld. 2002-10-15 23:34:55 +03:00
serg@serg.mysql.com
68cd8c47fc --tmpdir=dir1:dir2... uses (is_windows ? ";" : ":") as a delimiter 2002-10-12 17:43:40 +00:00
monty@hundin.mysql.fi
367e2d4396 Remove wrong clear of mysql_port when using --skip-show-databases 2002-10-08 16:40:50 +03:00
serg@serg.mysql.com
3217f2cc06 support for --tmpdir=dir1:dir2:... 2002-10-08 12:39:37 +00:00
bell@sanja.is.com.ua
199f667c19 merging 2002-10-04 14:15:59 +03: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
monty@hundin.mysql.fi
5ce2900d48 Merge hundin.mysql.fi:/my/mysql-3.23
into hundin.mysql.fi:/my/bk/mysql-4.0
2002-09-27 12:13:28 +03:00
monty@hundin.mysql.fi
649413f773 Don't reset Delayed_insert_threads on FLUSH STATUS 2002-09-27 12:01:26 +03: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
cb8580a2cd Changed table_list->name -> table_list->alias to find places where we where using alias instead of table_name.
This should fix some issues where --lower-case-table-names doesn't work properly under windows.
2002-09-20 14:05:18 +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
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
8b7521eb7f Merge with 3.23.53 2002-09-11 14:49:38 +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
heikki@hundin.mysql.fi
48063238e2 mysqld.cc:
update help innobase_flush_log_at_trx_commitcan have vals 0, 1, 2 
ha_innobase.h, ha_innobase.cc:
  make innobase_flush_log_at_trx_commit a long, like other params
2002-09-10 14:23:46 +03:00
monty@mashka.mysql.fi
5ee7d7e73c Merge 2002-09-05 17:17:22 +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
jani@rhols221.adsl.netsonic.fi
15ad3ee806 Fixed a bug in my_getopt and mysqld.cc 2002-09-05 14:22:52 +03:00
monty@mashka.mysql.fi
93e033fabc Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-09-03 15:46:13 +03:00
monty@mashka.mysql.fi
a01a0840dc Some trivial optimzations
Check if AND/OR expression can be NULL; Fixed bug in GROUP BY and-or-expression where expression could be NULL
Bug fix for SHOW OPEN TABLES when user didn't have privilege to access all open tables.
Better fix for ALTER TABLE on BDB tables.
2002-09-03 15:44:25 +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
serg@serg.mysql.com
7c4e5bd9a8 reverted min limit for ft_min_word_len back to 1 2002-09-01 17:45:38 +00:00
Sinisa@sinisa.nasamreza.org
f883e5eb27 A nasty fix when all rows are deleted with a write lock 2002-08-30 22:17:24 +03:00
Sinisa@sinisa.nasamreza.org
5ec7991dbb missing option 2002-08-30 17:12:52 +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
631f395f16 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-08-28 19:16:43 +03:00
monty@hundin.mysql.fi
e720b5a6fb Portability fixes for windows 2002-08-28 17:00:58 +03:00
miguel@hegel.br
8c71a53b9c Small fixes 2002-08-27 10:55:12 -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
3ee79d3a50 Fixed bug in mysqld when using configure --localstatedir 2002-08-23 10:33:18 +03:00
monty@hundin.mysql.fi
c7499a1039 Portabilityfix in mysqladmin.c
Fix when using --localstatedir
Cleaned up mysql.server
2002-08-23 02:48:52 +03:00
monty@hundin.mysql.fi
f36f9d00ff Fixed bug in wait_for_update() that I had introduced.
Changed option variables to my_bool (to avoid bugs in my_getopt())
Added new thread specific mutex LOCK_delete to be able to free LOCK_thread_count early.
Changed usage of LOCK_thread_count -> LOCK_status for statistics variables
2002-08-22 16:50:58 +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
a5edb20042 Fixed timing problem with rpl000001 replication test.
Fixed configure problems with HPUX and openbsd
SHOW SLAVE STATUS returns empty set if slave is not initialized
SHOW MASTER STATUS returns empty set if binary logging is not enabled.
Fixed shutdown problem on Solaris.
2002-08-18 16:04:26 +03:00
monty@hundin.mysql.fi
b9d7fcd279 Fixed bug in SAFEMALLOC for systems that requires longlong data to be aligned on 8 byte boundaries (like sparc)
Removed thread marking of safemalloc blocks (becasue of alignment problems)
Temporary fix for bigint comparison.
2002-08-17 05:18:06 +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
ae1ec6e16a Changed SQL variable delay_key_write to an enum
able delay_key_write as default (as it was in 4.0.2)
2002-08-13 02:18:39 +03:00
monty@hundin.mysql.fi
4dfe327a06 Fix after merge 2002-08-12 06:49:28 +03:00
monty@hundin.mysql.fi
3ef9d44edc merge with 3.23.52 2002-08-12 04:04:43 +03:00
monty@hundin.mysql.fi
c99c1fd384 Changed IF(expr, column, NULL) to take type from column
Fixed some windows portability problems and removed some compiler warnings
 Cleaned up QUOTE() function and fixed bug in \0 and \Z handling.
2002-08-12 03:33:46 +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