mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19807 commits 2784 branches 343 tags 1.6 GiB
Commit graph

9516 commits

Author SHA1 Message Date
monty@mysql.com
80acd88168 Added comment 2005-02-07 18:24:21 +02:00
monty@mysql.com
3fe60486e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-07 18:14:31 +02:00
monty@mysql.com
32f91f48e8 Fixed bug in HAVING when refering to RAND() through alias 
(BUG 8216)
 2005-02-07 18:13:57 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
95aaf76682 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/wl1967.extra1
 2005-02-07 15:27:17 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
0b1f98e83e Ensure that slaves have normal COMMIT behaviour after WL#1967 2005-02-07 13:15:48 +00:00
msvensson@neptunus.homeip.net
558af8e2ea Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
 2005-02-07 13:48:02 +01:00
msvensson@neptunus.homeip.net
28b21534bb Small changes after Tomas review 2005-02-07 13:46:13 +01:00
gluh@gluh.mysql.r18.ru
dc6e3cf5d4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-07 13:41:21 +03:00
jan@hundin.mysql.fi
ac9a456a5e Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/jan/mysql-5.0
 2005-02-07 11:23:19 +02:00
tomas@poseidon.ndb.mysql.com
a5ba7db771 Merge 2005-02-07 10:13:07 +01:00
tomas@poseidon.ndb.mysql.com
6bbaeed5b9 ha_ndbcluster.cc: 
corrected typo in previous changeset
 2005-02-07 09:58:37 +01:00
gluh@gluh.mysql.r18.ru
15273035ce Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-07 11:57:14 +03:00
jan@hundin.mysql.fi
a5b193511c Relaxed locking in INSERT...SELECT, single table UPDATE...SELECT and 
single table DELETE...SELECT clauses when innobase_locks_unsafe_for_binlog
is used and isolation level of the transaction is not serializable. 
InnoDB uses consistent read in these cases for a selected table.
 2005-02-07 10:12:40 +02:00
tomas@poseidon.ndb.mysql.com
0da4ee9131 Merge 2005-02-07 08:54:35 +01:00
tomas@poseidon.ndb.mysql.com
4873adace0 Corrected fragmentation calculation to take into account that LQH creates "2 fragments per fragment" in 4.1 and 5.0 
+added some comments to ndb fragmentation calulation
 2005-02-07 08:51:27 +01:00
guilhem@mysql.com
a70adb5d2a Merge 2005-02-05 18:07:50 +01:00
jimw@mysql.com
3c10ccd3f7 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-02-05 07:52:55 -08:00
sergefp@mysql.com
b9704ce78a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-outer-joins-cleanup
 2005-02-05 18:18:06 +03:00
sergefp@mysql.com
bc1fdfa402 Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only (2nd patch after Monty's comments). 2005-02-05 18:16:29 +03:00
guilhem@mysql.com
b97a519d72 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-02-05 15:29:38 +01:00
monty@mysql.com
23bf186c70 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-02-05 16:06:29 +02:00
monty@mysql.com
80b3e02462 Fixed bug detected by sp-tests 
Cleanup during reviews of new pushed code
 2005-02-05 16:05:46 +02:00
sergefp@mysql.com
fb113b94e4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug7816
 2005-02-05 01:53:12 +03:00
sergefp@mysql.com
72c473ec58 Merge mysql.com:/home/psergey/mysql-4.1-bug7816 
into mysql.com:/home/psergey/mysql-5.0-bug7716
 2005-02-05 01:52:17 +03:00
guilhem@mysql.com
44c2dcff36 Fix for BUG#8055 "Trouble with replication from temporary tables and ignores": 
when we close the session's temp tables at session end, we automatically write to binlog *one* DROP TEMPORARY TABLE *per tmp table*.
 2005-02-04 22:43:54 +01:00
jimw@mysql.com
f98a2c27a1 Merge 2005-02-04 12:01:30 -08:00
jimw@mysql.com
8c8553af81 Merge changes 2005-02-04 11:59:02 -08:00
jimw@mysql.com
b509f2b373 Merge mysql.com:/home/jimw/my/mysql-4.1-6067 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-04 10:39:13 -08:00
mysqldev@mysql.com
79b88ead4a Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/mysqldev/tulin/mysql-4.1
 2005-02-04 18:45:02 +01:00
tulin@mysql.com
d017a604fe Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/mysqldev/tulin/mysql-5.0
 2005-02-04 17:32:18 +01:00
serg@serg.mylan
47f354bca7 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-02-04 15:31:39 +01:00
serg@serg.mylan
cc1ee6475f indexless boolean fulltext search was depending on default_charset_info - Bug#8159 
ftbw->off wasn't cleared on reinit - Bug#8234
 2005-02-04 15:24:06 +01: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
msvensson@neptunus.homeip.net
94978c214a Updated after review. 2005-02-04 15:08:08 +01:00
tulin@mysql.com
2339b328fc ha_ndbcluster.cc: 
fixed change in struct in 4.1->5.0 merge
 2005-02-04 14:33:08 +01:00
mysqldev@mysql.com
753ea29f86 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/mysqldev/tulin/mysql-4.1
 2005-02-04 14:29:52 +01:00
mysqldev@mysql.com
abf7837fbb resolved merge conflict 2005-02-04 14:27:09 +01:00
tomas@poseidon.ndb.mysql.com
27a69e573a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-02-04 14:27:08 +01:00
tomas@poseidon.ndb.mysql.com
7fd685ffe8 added test to trigger drifferent fragmentations in ndb 
corrected documentation on fragmentation
    set "fragmentation medium" to mean 2 fragments per node instead of 1
    set default fragmentation to small instead of medium
    bug#8284 adjust fragmentation to max_rows
 2005-02-04 14:25:08 +01:00
gluh@gluh.mysql.r18.ru
e9ce96c5cd Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
 2005-02-04 15:47:12 +03:00
gluh@gluh.mysql.r18.ru
34915f7a91 A fix: bug#6931: Date Type column problem when using UNION-Table 
bug#7833:  Wrong datatype of aggregate column is returned
 2005-02-04 15:31:36 +03:00
timour@mysql.com
e6150c7289 Merge mysql.com:/home/timka/mysql/src/4.1-dbg 
into mysql.com:/home/timka/mysql/src/4.1-bug-8023
 2005-02-04 11:58:59 +02:00
msvensson@neptunus.homeip.net
e54ea9189d Merge of query cache from 4.1 to 5.0 2005-02-04 10:56:53 +01:00
gluh@gluh.mysql.r18.ru
11435fdfad Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-04 12:37:18 +03:00
pekka@mysql.com
8e4fca2a55 Merge 2005-02-04 10:35:09 +01:00
sergefp@mysql.com
38339e1c51 Fix for BUG#7716: in in_string::set() take into account that the value returned 
by item->val_str() may be a substring of the passed string. 
Disallow string=its_substring assignment in String::operator=().
 2005-02-04 09:14:22 +03:00
jimw@mysql.com
f32c61fbaf Handle backslashes correctly in strings that also have doubled quotes when 
we are using the NO_BACKSLASH_ESCAPES SQL mode. (Bug #6368)
 2005-02-03 16:14:02 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
b823638f38 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug6726
 2005-02-03 23:14:47 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
d794406f64 Bug#6726 - failure to parse NOT BETWEEN 
Fix and test for parse bug
 2005-02-03 23:08:43 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
1cb1dcb0f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8057
 2005-02-03 21:16:36 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
b8ceaa4a1f Bug#8057 
Fix crash with LAST_INSERT_ID() in UPDATE,
  Tests included,
 2005-02-03 21:11:12 +00: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
gluh@gluh.mysql.r18.ru
be5532d36a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-03 20:46:53 +03:00
monty@mysql.com
b233ddba8e After merge fixes 2005-02-03 18:00:50 +02: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
43eb7cf303 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-02-03 16:50:06 +02:00
gluh@gluh.mysql.r18.ru
dd1dba19f0 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-03 17:33:57 +03:00
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
jan@hundin.mysql.fi
8fc13ecc97 Fixed a bug: deadlock without any locking, simple select and update (Bug #7975). 2005-02-03 10:54:38 +02:00
msvensson@neptunus.homeip.net
3181f5d2b6 Merged "query cache for ndb" to 5.0 2005-02-03 09:33:48 +01:00
gluh@gluh.mysql.r18.ru
cacb8d74b4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-03 11:12:01 +03:00
monty@mysql.com
12bf600d18 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-02-02 22:41:18 +02:00
monty@mysql.com
209190d3df Review fixed 2005-02-02 22:39:21 +02:00
monty@mysql.com
e791e86444 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-02 20:30:57 +02:00
monty@mysql.com
3936edd7fa Fixed during review of new pulled code 2005-02-02 20:28:01 +02:00
jimw@mysql.com
5f0c4ff140 Merge fixes for #8248, #5569. 2005-02-02 08:21:11 -08:00
serg@serg.mylan
601a78eead Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-02-02 16:56:47 +01:00
serg@serg.mylan
33fc4b10b6 configure.in 
don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc
    hide from the user options that do nothing
sql/sql_update.cc
    better fix for uninitialized used_index
 2005-02-02 12:08:20 +01:00
marko@hundin.mysql.fi
459fa7f1f9 After merge fixes 2005-02-02 11:50:27 +02:00
timour@mysql.com
2ad4cb38db Merge mysql.com:/home/timka/mysql/src/4.1-dbg 
into mysql.com:/home/timka/mysql/src/4.1-bug-8023
 2005-02-02 09:55:41 +02:00
igor@rurik.mysql.com
9a779d6441 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-02-01 23:54:39 -08:00
igor@rurik.mysql.com
0fb0dab4ca func_str.result, func_str.test: 
Added a test case for bug #7751.
item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.
 2005-02-01 23:34:31 -08:00
timour@mysql.com
52e904c25c Fix for BUG#8023. 
Allow LIMIT clause after DUAL.
 2005-02-02 08:38:24 +02:00
jimw@mysql.com
e86457cef0 Fix QUOTE() to not reuse the input field for output, which resulted in 
incorrect results when the input was a constant across a multi-row SELECT
statement. (Bug #8248)
 2005-02-01 18:29:10 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
a90d28eb6e Fix compile problem - line missing. 2005-02-01 23:43:09 +00:00
jimw@mysql.com
76ff72d73f Merge mysql.com:/home/jimw/my/mysql-4.0-5569 
into mysql.com:/home/jimw/my/mysql-4.0-clean
 2005-02-01 15:38:27 -08:00
jimw@mysql.com
891e8d076c Fix value of YEAR field when set from a non-numeric string. (Bug #6067) 2005-02-01 15:08:31 -08:00
heikki@hundin.mysql.fi
11c0260147 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-02-02 00:22:19 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
9cfe250419 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/wl1967
 2005-02-01 19:57:42 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
a67924ecbc WL#1967 
Support for COMMIT/ROLLBACK optional arguments
 2005-02-01 19:48:05 +00:00
serg@serg.mylan
9bedb0f212 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-02-01 18:02:36 +01:00
reggie@bob.(none)
b018755ea6 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bob.(none):/home/reggie/bk/mysql41
 2005-02-01 08:46:56 -06: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
monty@mysql.com
0751cb8ff1 Remove #if 0 as this only confuses the code withing adding anything 2005-02-01 15:36:48 +02:00
bell@sanja.is.com.ua
85f62aa67c Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
 2005-02-01 13:55:40 +02:00
gluh@gluh.mysql.r18.ru
92f04aedf3 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-01 12:20:03 +03:00
bell@sanja.is.com.ua
48da18cd45 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-02-01 11:05:29 +02:00
marko@hundin.mysql.fi
dabb56a7cb After merge fixes 2005-02-01 10:24:09 +02:00
reggie@bob.(none)
6c272a5a35 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into bob.(none):/home/reggie/bk/mysql5.0
 2005-01-31 22:26:12 -06:00
reggie@bob.(none)
fe675641eb Merge bob.(none):/home/reggie/bk/mysql41 
into bob.(none):/home/reggie/bk/mysql5.0
 2005-01-31 22:24:04 -06:00
jimw@mysql.com
de16b5f48f Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-31 17:32:22 -08:00
jimw@mysql.com
b7dda3f7c0 Merge 2005-01-31 16:27:17 -08:00
jimw@mysql.com
4b8d81ff1e Merge mysql.com:/home/jimw/my/mysql-4.1-6511 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-31 15:30:34 -08:00
reggie@bob.(none)
16334eb414 Bug #6607 Create table... LIKE... with Windows Symlinks 
sql_table.cc:
  use fn_format to resolve symlinks in mysql_create_like_table
 2005-01-31 17:24:18 -06:00
acurtis@pcgem.rdg.cyberkinetica.com
941b959cb4 Bug#7011 
Fix for merge from 4.1
 2005-01-31 20:49:37 +00: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
brian@zim.(none)
6471b65ad0 Removed duplicate close call and added archive to the debug build and test. 2005-01-31 12:17:34 -08:00
brian@zim.(none)
630e020d3e Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into zim.(none):/home/brian/mysql/mysql-4.1
 2005-01-31 11:03:57 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
adb91423ac Bug#7011 
Merge from 4.1
 2005-01-31 15:57:32 +00:00