mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
16899 commits 2784 branches 343 tags 1.6 GiB
Commit graph

8388 commits

Author SHA1 Message Date
sergefp@mysql.com
f8b45c6dfc Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/dbdata/psergey/mysql-5.0-nov-clean
 2004-11-21 11:58:19 +03:00
sergefp@mysql.com
e6a7386c12 Fix for BUG#4177: 
* Make index merge quick selects code allow perform several scans.
 * Delay additional handler objects creation till row retrieval is started.
 2004-11-21 11:51:19 +03:00
serg@serg.mylan
d5c1768139 post-merge fix 2004-11-20 20:19:08 +01:00
serg@serg.mylan
2d3dd65cc1 merged 2004-11-20 18:36:41 +01:00
gluh@gluh.mysql.r18.ru
15ada105ac changed field names, fields order according to WL description 
fixed bug: "create view v7 as select * from information_schema.tables;" failed
 2004-11-20 01:17:18 +03:00
dlenev@mysql.com
4e52cc2ded Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6266
 2004-11-19 21:51:37 +03:00
dlenev@mysql.com
aaee135243 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6439
 2004-11-19 21:38:51 +03:00
dlenev@mysql.com
5627dddb93 Manual merge of fix for bug #6439 "from_unixtime() function returns 
wrong datetime values for too big argument" from 4.0 tree to 4.1 tree.
 2004-11-19 19:19:45 +03:00
dlenev@mysql.com
cb7e272e46 Manual merge of fix for bug #6266 "Invalid DATETIME value is not handled 
properly" with main tree.
 2004-11-19 18:35:36 +03:00
bar@mysql.com
770c9be8c2 Bug #6658 MAX(column) returns incorrect coercibility 
Also, Item_sum_hybrid->charset was removed as redundant,
and switched to use collation.collation instead.
 2004-11-19 19:35:36 +04:00
dlenev@mysql.com
40083741ee Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-bg6439
 2004-11-19 17:54:14 +03:00
tomas@poseidon.ndb.mysql.com
fdfc731155 ha_ndbcluster.cc: 
merge error
 2004-11-19 09:27:16 +00:00
tomas@poseidon.ndb.mysql.com
2048819f7a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-19 09:18:36 +00:00
guilhem@mysql.com
6c438ba9a4 log_event.cc: 
post-conflict-merge fix (duplicate comment)
 2004-11-19 00:57:26 +01:00
tomas@poseidon.ndb.mysql.com
eb11d34403 moved ndb_use_transactions out of opts and to be set default true in THD::init 2004-11-18 22:45:48 +00:00
guilhem@mysql.com
631f6f3c30 Merge 2004-11-18 23:31:23 +01:00
guilhem@mysql.com
7743dbbb56 When mysqlbinlog prints LOAD DATA INFILE, let it print the thread id. Some customer would have benefited 
much from this in his recovery. All this change does is adding one commented (#) line before the LOAD DATA
command, so it is quite innocuous.
 2004-11-18 22:59:17 +01:00
tomas@poseidon.ndb.mysql.com
2ec794a970 Merge 2004-11-18 21:54:53 +00:00
petr@mysql.com
ad2bd09d13 coding style fix 2004-11-18 19:06:02 +03:00
mskold@mysql.com
7bbee8c95d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-18 15:55:18 +01:00
petr@mysql.com
d067e9e90f Merge mysql.com:/home/cps/mysql/trees/mysql-5.0 
into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final
 2004-11-18 16:49:13 +03:00
petr@mysql.com
30789e7aa2 Merge mysql.com:/home/cps/mysql/trees/mysql-5.0 
into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final
 2004-11-18 14:53:21 +03:00
mskold@mysql.com
a4d061a5d9 Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key .. 2004-11-18 12:11:56 +01:00
pekka@mysql.com
bc31325180 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-11-18 11:55:53 +01:00
petr@mysql.com
890211a7c4 WL 2059 Engine-specific status variables framework and WL 1922 
InnoDB status variables
 2004-11-18 13:00:42 +03:00
timour@mysql.com
57bdbd4e78 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into mysql.com:/home/timka/mysql/src/5.0-grind
 2004-11-18 11:24:51 +02:00
timour@mysql.com
0a11036e1c Fixed one warning and two errors reported by VC 6.0. 2004-11-18 11:24:18 +02:00
gluh@gluh.mysql.r18.ru
a68a9fe268 remove unused parts of code 
fix for 'show create schema_table'
fix for usage schema tables in subselect
'wrong schema table charset' fix
 2004-11-18 12:16:06 +03:00
serg@serg.mylan
c7532a698d merged 2004-11-17 20:07:13 +01:00
serg@serg.mylan
e68bd85b77 merged 2004-11-17 18:04:36 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
2074aeecb8 Use negate_expression() instead of new Item_func_not() 2004-11-17 15:49:12 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
b7b13be5e0 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/wl638.3
 2004-11-17 15:49:11 +00:00
bell@sanja.is.com.ua
1675523e15 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
 2004-11-17 17:49:10 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
8c0d21d186 WL#638 - Fix precedence for parsing NOT ... LIKE expression s 
Rework parser expression rules
  Rework handling for "||" concat/or
  Eliminate some shift/reduce conflicts
  Add support for "xxx IS [ NOT ] truth_value"
 2004-11-17 15:49:10 +00:00
gluh@gluh.mysql.r18.ru
a288f3b3e1 Fix for Auto_increment filed value in 'show table status' 
code cleanup
 2004-11-17 18:48:12 +03:00
guilhem@mysql.com
d34421c127 Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code. 
Moving the part of user_var.test using UCS2 to ctype_ucs.test
 2004-11-17 16:41:30 +01:00
bell@sanja.is.com.ua
96c2c9b8cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
 2004-11-17 14:20:28 +02:00
bell@sanja.is.com.ua
f8edd9f9f1 fixing compiler warnings 2004-11-17 14:17:09 +02:00
tomas@poseidon.ndb.mysql.com
2c677ed687 Merge 2004-11-17 10:59:16 +00:00
konstantin@mysql.com
ed2674d0a7 Fix warnings and compilation failures (Windows). 2004-11-17 13:45:05 +03:00
tomas@poseidon.ndb.mysql.com
1700bf3844 Enabled usage of new system variables for ndb 
- ndb_use_exact_count
  - ndb_autoincrement_prefetch_sz
  - ndb_use_transactions
  - ndb_force_send
moved "inlined" functions to .cc file since they are virtual anyways
enabled printout od ndb errors in warnings even if mapping existst to mysql error code
 2004-11-17 08:15:53 +00:00
tomas@poseidon.ndb.mysql.com
0acc6f83b2 enabled having system tables in ndb 2004-11-17 08:10:26 +00:00
sergefp@mysql.com
bfd6c218b2 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
 2004-11-17 01:26:23 +03:00
lenz@mysql.com
0eaefa29c3 - added a cast to avoid a compiler error on HP-UX 2004-11-16 22:05:29 +01:00
heikki@hundin.mysql.fi
2b1117702e Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2004-11-16 22:50:29 +02:00
heikki@hundin.mysql.fi
b560503386 ha_innodb.cc: 
Anthony's http://lists.mysql.com/internals/18505 patch for DROP DATABASE broke caused it to return errno if .ibd files were present (bas_ext() was obsolete in ha_innodb.cc); fix this
 2004-11-16 22:49:28 +02:00
konstantin@mysql.com
a38ac4b26d Fix comment. 2004-11-16 23:27:31 +03:00
heikki@hundin.mysql.fi
ea59300d62 ha_innodb.cc: 
Manually ported this bug fix from 4.0: 
 Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
 2004-11-16 20:45:52 +02:00
heikki@hundin.mysql.fi
dd64377dc2 ha_innodb.cc: 
Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
 2004-11-16 20:37:42 +02:00
sergefp@mysql.com
1cc999fbd4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
 2004-11-16 21:36:31 +03:00