1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-06 13:10:12 +03:00
Commit Graph

5988 Commits

Author SHA1 Message Date
sergefp@mysql.com
c0c50efdef Fix for BUG#8218:
Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is 
copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up 
pointing to the wrong List.
2005-02-12 22:58:54 +03:00
mskold@mysql.com
7760b1cad8 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-12 14:57:39 +01:00
bar@mysql.com
9ba7392306 Bug#8235 Connection collation change & table create with default result in crash 2005-02-12 16:27:22 +04:00
serg@serg.mylan
40da910d4c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-12 09:38:15 +01:00
serg@serg.mylan
42bb0901a3 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-12 00:10:07 +01:00
serg@serg.mylan
d355174522 make LOAD INDEX to work 2005-02-12 00:05:13 +01:00
igor@rurik.mysql.com
cdb40830d2 Manual merge 2005-02-11 15:00:29 -08:00
igor@rurik.mysql.com
1bb04b0642 distinct.result:
Adjustment of the result file after the revision of the fix for bug #7520.
2005-02-11 13:44:54 -08: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
igor@rurik.mysql.com
634424ca16 select.result:
After revision of the fix for bug #7520.
table.cc:
  Revised the fix for bug #7520.
  Made it compliant with 5.0 code where the bug does not exist.
2005-02-11 10:39:26 -08:00
matthias@three.local.lan
9c7d94d408 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-11 17:57:35 +01:00
ingo@mysql.com
601a4fdfa2 Merge 2005-02-11 11:59:35 +01:00
igor@rurik.mysql.com
a697e5da15 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-10 23:48:35 -08:00
igor@rurik.mysql.com
4ef431ad55 select.result:
Adjusted results of the test case for bug #7520 for 4.1.
2005-02-10 23:47:57 -08:00
igor@rurik.mysql.com
06ff30f6c0 Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-10 22:17:18 -08:00
igor@rurik.mysql.com
8b3d59ad42 select.result, select.test:
Added a test case for bug #7520.
table.cc:
  Fixed bug #7520.
  The bug was caused by a wrong calculation of the field max_key_length for
  a TABLE structure when there was an index on a blob field.
2005-02-10 22:15:38 -08:00
joreland@mysql.com
ec5ac47eb8 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-11 06:46:05 +01:00
jimw@mysql.com
c4187750ff Fix all of the enum and set columns in privilege tables to be
case-insensitive. (Bug #7989)
2005-02-10 20:25:14 -08:00
bell@sanja.is.com.ua
ea8caabb10 Better emulation correct SELECT tree for fields expressions of merging view during name resolving (BUG#6394) 2005-02-10 23:01:59 +02:00
matthias@three.local.lan
54684534fd Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-10 20:28:47 +01:00
mats@mysql.com
6611d3d2f8 Merge mysql.com:/home/bkroot/mysql-5.0
into mysql.com:/home/bk/b7853-mysql-5.0
2005-02-10 19:15:53 +01:00
bell@sanja.is.com.ua
5040e7cdb4 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-repl-5.0
2005-02-10 20:08:11 +02:00
joreland@mysql.com
1bda3aaa24 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-10 17:12:53 +01:00
bell@sanja.is.com.ua
9b1bf2da5a merge 2005-02-10 18:01:06 +02:00
joreland@mysql.com
87349f0d81 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-10 16:19:44 +01:00
konstantin@mysql.com
7d735c7207 manual merge 2005-02-10 16:58:02 +03:00
msvensson@neptunus.homeip.net
a172575854 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
2005-02-10 14:41:52 +01:00
monty@mysql.com
ccb2f3381b Things missing in last changset
After merge fixes
Don't give duplicate warnings for some ::store() functions
2005-02-10 15:41:51 +02:00
msvensson@neptunus.homeip.net
8fb1f824ea Change script to avoiud multiple --debug flags when starting master servers 2005-02-10 14:13:23 +01:00
bell@sanja.is.com.ua
cfedc23bce Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2005-02-10 13:05:17 +02:00
jimw@mysql.com
845139731b Merge mysql.com:/home/jimw/my/mysql-4.1-zlib
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-09 16:36:24 -08:00
monty@mysql.com
a1a39fab84 Merge with 4.1 2005-02-10 02:27:37 +02:00
matthias@three.local.lan
74ba5b0808 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-09 21:47:54 +01:00
bell@sanja.is.com.ua
70797f571f 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-09 21:14:06 +02:00
bell@sanja.is.com.ua
90c0024217 reverted patch for BUG#7351 (because of performance ussie) 2005-02-09 21:08:08 +02:00
serg@serg.mylan
db13afd89d auto-ROLLBACK if binlog was not closed properly
auto-commit on Xid_log_event
2005-02-09 20:04:28 +01:00
tomas@poseidon.ndb.mysql.com
264bac2f1d ndb_port_base is obsolete with WL#2278 2005-02-09 19:29:37 +01:00
monty@mysql.com
ab5aed6047 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-09 19:22:35 +02:00
lenz@mysql.com
afa2a462a1 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1-merge
2005-02-09 17:58:29 +01:00
lenz@mysql.com
420d29159f Merge mysql.com:/space/my/mysql-4.1-merge
into mysql.com:/space/my/mysql-5.0
2005-02-09 17:52:31 +01:00
lenz@mysql.com
a0089319d2 - make sure to include the embedded test results in the source distribution 2005-02-09 17:49:43 +01:00
msvensson@neptunus.homeip.net
b8490b5524 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
2005-02-09 16:26:06 +01:00
msvensson@neptunus.homeip.net
0ed971878d Fix so that master and master1 does not write to same .trace file 2005-02-09 16:23:22 +01:00
matthias@three.local.lan
83b1d82add Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-09 15:33:01 +01:00
wax@kishkin.ru
a0507f98b9 merge 2005-02-09 19:13:20 +05:00
bell@sanja.is.com.ua
6cda5f53da postreview changes
(used t3, moved after last bug, renamed)
2005-02-09 16:02:37 +02:00
mleich@mysql.com
48bc6d477d Merge mysql.com:/home/matthias/Arbeit/mysql-5.0/src
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-09 11:00:15 +01:00
bell@sanja.is.com.ua
b0a1ee8751 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2005-02-09 11:41:55 +02:00
jimw@mysql.com
5ebbc834fe Fix removal of tables from cache when the database they are contained
within is dropped and lower_case_table_names is set. (Bug #8355)
2005-02-08 15:14:14 -08:00