Commit graph

423 commits

Author SHA1 Message Date
mskold@mysql.com
adb94fcb2c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-18 13:16:25 +01:00
jimw@mysql.com
7eb8c130f7 Merge 2005-02-17 16:16:58 -08:00
svoj@mysql.com
349112292f bug#6958
Fixed that negative arguments to certain integer options wrap around.
2005-02-17 15:04:04 +04:00
mskold@mysql.com
66343612d1 Merge 2005-02-11 22:30:37 +01:00
mskold@mysql.com
828a785610 Condition pushdown v.2 2005-02-11 22:05:24 +01:00
hf@deer.(none)
b94a482ee9 Precision Math implementation 2005-02-09 02:50:45 +04:00
msvensson@neptunus.homeip.net
c9d7cd043b Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0-cluster-extra
2005-02-04 15:13:45 +01:00
guilhem@mysql.com
a85df46c01 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-02-03 18:55:29 +01:00
guilhem@mysql.com
ac053d80e9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-02-03 16:25:57 +01:00
guilhem@mysql.com
ed1696f6b9 WL#1062 "log charset info into all Query_log_event":
we store 7 bytes (1 + 2*3) in every Query_log_event.
In the future if users want binlog optimized for small size and less safe,
we could add --binlog-no-charset (and binlog-no-sql-mode etc): charset info
is something by design optional (even if for now we don't offer possibility to disable it):
it's not a binlog format change.
We try to reduce the number of get_charset() calls in the slave SQL thread to a minimum
by caching the charset read from the previous event (which will often be equal to the one of the current event).
We don't use SET ONE_SHOT for charset-aware repl (we still do for timezones, will be fixed later).
No more errors if one changes the global value of charset vars on master or slave
(as we log charset info in all Query_log_event).
Not fixing Load_log_event as it will be rewritten soon by Dmitri.
Testing how mysqlbinlog behaves in rpl_charset.test.
mysqlbinlog needs to know where charset file is (to be able to convert a charset number found
in binlog (e.g. in User_var_log_event) to a charset name); mysql-test-run needs to pass
the correct value for this option to mysqlbinlog.
Many result udpates (adding charset info into every event shifts log_pos in SHOW BINLOG EVENTS).
Roughly the same job is to be done for timezones :)
2005-02-03 16:22:16 +01:00
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
msvensson@neptunus.homeip.net
3181f5d2b6 Merged "query cache for ndb" to 5.0 2005-02-03 09:33:48 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
a67924ecbc WL#1967
Support for COMMIT/ROLLBACK optional arguments
2005-02-01 19:48:05 +00:00
msvensson@neptunus.homeip.net
efd5ed2f9e WL#2269 Enable query cache for NDB
- Added a thread that fetches commit_count for open tables. This
will mean that NDB will not have to be contacted for every use of a cached query.
2005-02-01 15:43:08 +01:00
mskold@mysql.com
f21a737197 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-01 10:05:22 +01:00
heikki@hundin.mysql.fi
c2a59e83af Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-31 22:30:40 +02:00
dlenev@mysql.com
2276bfa374 Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and
CONVERT_TZ() function does not work well together" and bug #7705 
"CONVERT_TZ() crashes with subquery/WHERE on index column" in 5.0
tree.
2005-01-28 10:22:50 +03:00
dlenev@mysql.com
c80c503a1b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
2005-01-28 09:32:43 +03:00
ingo@mysql.com
160541b5d4 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-27 08:32:46 +01:00
ingo@mysql.com
1b02e18820 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-26 21:09:16 +01:00
patg@patrick-galbraiths-computer.local
9103a44908 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-26 11:53:33 -08:00
dlenev@brandersnatch.localdomain
80282016c2 Fix for bug #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ() function
does not work well together". Now using simplier and more correct
implementation of st_lex::unlink_first_table()/link_first_table_back() 
(It also nicely handles case when global table list is created because
of implictly used time zone tables). (2nd attempt)

Fix for bug #7705 "CONVERT_TZ() crashes with subquery/WHERE on index
column". Implemented new approach for caching objects for constant
time zone arguments. Now instead of determining whenever these arguments
are constants and performing time zone lookup at fix_fields() stage, we
do it on first get_date() invocation.

Cleanup of global @@time_zone variable handling.
2005-01-26 22:25:02 +03:00
mskold@mysql.com
d4c7c4ff5b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-01-26 11:34:18 +01:00
dlenev@mysql.com
560f2bd4d6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
2005-01-26 11:23:14 +03:00
heikki@hundin.mysql.fi
9a6e0d06e0 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-25 22:12:22 +02:00
heikki@hundin.mysql.fi
d7e5c4d617 sql_class.h, set_var.cc, mysqld.cc:
Add settable variables for semi-sync replication
2005-01-25 22:11:21 +02:00
patg@patrick-galbraiths-computer.local
1bceba0995 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-25 09:35:57 -08:00
ingo@mysql.com
bcd1c31a53 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-25 09:47:01 +01:00
patg@patrick-galbraiths-computer.local
d6727ff70f Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-24 11:31:21 -08:00
serg@serg.mylan
c76405a7ee merged 2005-01-24 19:41:42 +01:00
serg@serg.mylan
79240013b2 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-24 15:50:13 +01:00
serg@serg.mylan
67ba2e367a fixes/cleanups according to Coverity report 2005-01-24 15:48:25 +01:00
ingo@mysql.com
c4a0eb142b Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-24 10:48:52 +01:00
ingo@mysql.com
12879fc30d WL#2126 - Multi_read_range.
Addendum for correct multi_range_count system variable handling.
Fixed a typo.
Added to sys_variables.
Added to init_vars.
2005-01-21 17:38:46 +01:00
timour@mysql.com
36f1e91b69 Merge of fix for BUG#4258 from 4.1.
Needs additional manual merge.
2005-01-21 17:38:36 +02:00
dlenev@brandersnatch.localdomain
348218d21d Fix for bug #7637: "Test failure: 'user_limits' on QNX and 64-bit systems"
Made user_limits.test scheduling independant (this solves failure on QNX).

Made sys_var_max_user_conn variable int sized. Changed 
max_user_connections from ulong to uint to be able to use it in 
sys_var_max_user_conn::value_ptr() (solves failures on 64-bit platforms).
2005-01-20 00:54:01 +03:00
timour@mysql.com
7fb0de20f3 Final patch for BUG#4285.
This patch collects all previous patches into one.

The main problem was due to that there is are two variables -
dflt_key_cache and sql_key_cache with have more or less duplicate
function. The reson for the bug was that the default value in the key
cache hash was set to dflt_key_cache, then sql_key_cache was set to a
new key cache object, and then dflt_key_cache was set to sql_key_cache
which was different from the dflt_key_cache_var. After sending SIGHUP,
the server was using the original default value for the key cache hash,
which was different from the actual key cache object used for the
default key cache.
2005-01-19 12:55:54 +02:00
mskold@mysql.com
6bb027a97c Merge 2005-01-17 09:44:34 +01:00
patg@patrick-galbraiths-computer.local
5dd710a958 change to have_<> variable for federated engine 2005-01-13 13:03:05 -08:00
mskold@mysql.com
290489e657 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-01-13 10:49:01 +01:00
paul@kite-hub.kitebird.com
231632e34f user_limits.result:
Fix test result affected by error message rewording.
errmsg.txt:
  Reword error messages.
set_var.cc:
  Reorder variables.
mysqld.cc:
  Reorder options.
2005-01-12 20:38:05 -06:00
vtkachenko@mail.mysql.com
306df48731 Merge 2005-01-12 21:03:06 +01:00
vtkachenko@mail.mysql.com
9f640bbad9 logging_ok:
Logging to logging@openlogging.org accepted
innodb.result, innodb.test, set_var.cc, mysqld.cc:
  change variable innodb_free_tickets_to_enter to innodb_concurrency_tickets
2005-01-12 20:55:06 +01:00
mskold@mysql.com
2e3a60f7fd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-01-10 09:31:17 +01:00
paul@kite-hub.kitebird.com
61041e55fe Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2005-01-08 19:46:52 -06:00
paul@kite-hub.kitebird.com
7585b5cb61 set_var.cc:
Whack duplicate variable line. (Affects SHOW VARIABLES.)
2005-01-08 19:43:15 -06:00
vtkachenko@intelp4d.mysql.com
ad7dad8d03 Many files:
- Create innodb_thread_concurrency as dynamic variable
  - Add innodb_thread_sleep_delay variable
  - Add innodb_free_tickets_to_enter variable
2005-01-08 15:01:37 +01:00
paul@kite-hub.kitebird.com
7e807dc727 Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2005-01-07 14:18:38 -06:00
paul@kite-hub.kitebird.com
76b823cebe set_var.cc:
Reorder variables to properly alphabetize SHOW VARIABLES output.
2005-01-07 14:17:08 -06:00
mskold@mysql.com
346aeda888 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-01-07 15:34:25 +01:00