mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
28904 commits 2793 branches 343 tags 1.7 GiB
Commit graph

7653 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
8a977e4b38 Merge neptunus.(none):/home/msvensson/mysql/bug17137/my41-bug17137 
into  neptunus.(none):/home/msvensson/mysql/bug17137/my50-bug17137
 2006-03-08 10:17:12 +01:00
msvensson@neptunus.(none)
8162610a39 Bug#17137 Running "truncate table" on temporary table leaves the table open on a slave 
- Decrease "slave_open_temp_tables" during reopen of truncated table.
 - Add test "rpl_trunc_temp"
 2006-03-08 10:15:48 +01:00
aelkin@mysql.com
42cc473df3 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-02-14 20:19:00 +02:00
aelkin@mysql.com
6423fe2d49 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-02-14 20:15:17 +02:00
evgen@moonbone.local
131217eb6f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/16272-bug-5.0-mysql
 2006-02-14 19:46:35 +03:00
evgen@moonbone.local
8f904e9cab Fixed bug#16272: IF function with decimal args can produce wrong result 
The Item_func_if::fix_length_and_dec() function when calculating length of 
result doesn't take into account unsigned_flag. But it is taken when 
calculating length of temporary field. This result in creating field that 
shorter than needed. Due to this, in the reported query 40.0 converted to 9.99.

The function Item_func_if::fix_length_and_dec() now adds 1 to the max_length if 
the unsigned_flag isn't set.
 2006-02-14 16:22:37 +03:00
aelkin@mysql.com
5bd5967bdb Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-02-14 12:44:26 +02:00
aelkin@mysql.com
4f85993945 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-02-14 12:42:27 +02:00
bar@mysql.com
cc3623aecf Many files: 
Backporting character_set_filesystem from 5.0 to 5.1.
 2006-02-14 08:24:01 +04:00
aelkin@mysql.com
e7a0822a47 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
 2006-02-13 19:17:02 +02:00
aelkin@mysql.com
0866e4267a Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
 2006-02-13 19:15:02 +02:00
aelkin@mysql.com
312f68133c Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-02-13 19:13:33 +02:00
tomas@poseidon.ndb.mysql.com
9663f6cbee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-10 18:16:34 +01:00
tomas@poseidon.ndb.mysql.com
cbac75de91 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2006-02-10 17:53:13 +01:00
tomas@poseidon.ndb.mysql.com
27a14f93eb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-10 17:50:17 +01:00
tomas@poseidon.ndb.mysql.com
7050a7586e Bug #17249 ndb, delete statement with join where clause fails when table do not have pk 
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
 2006-02-10 17:40:22 +01:00
aelkin@mysql.com
14ced05e55 BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part. 
This changeset is assumed to stay in 4.1.
 2006-02-10 15:12:27 +02:00
petr@mysql.com
f037d4772e Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/devel/5.0-mike
 2006-02-10 10:56:27 +03:00
petr@mysql.com
1c7bc08537 a bunch of IM fixes from the GUI team 2006-02-10 02:15:55 +03:00
ramil@mysql.com
e1dabf65e4 Merge mysql.com:/usr/home/ram/work/4.1.heap 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-02-09 18:23:37 +04:00
aelkin@mysql.com
dd2a44c497 BUG#16217 forced to introduce a separate mysql client command to adopt its 
internal charset to one associated with currently being handled query. 
To note such a query can come from interactive client either.

There was a discussion within replication team and Monty who's suggestion won.
It avoids straightforward parsing of all `set' queries that could affect client side 
character set. 
According to the idea, mysql client does not parse `set' queries but rather cares of
`charset new_cs_name' command.
This command is generated by mysqlbinlog in form of exclaiming comment (Lars' suggestion)
so that enlightened clients like `mysql' knows what to do with it.

Interactive human can switch between many multi-byte charsets during the session 
providing the command explicitly. 
To note that setting new internal mysql's charset does not
trigger sending any `SET' sql statement to the server.
 2006-02-09 16:23:09 +02:00
aelkin@mysql.com
7b6afbd534 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-02-09 15:20:39 +02:00
bell@sanja.is.com.ua
daaf883f97 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-02-09 10:26:06 +02:00
tomas@poseidon.ndb.mysql.com
8d1e578cef Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-08 14:08:45 +01:00
tomas@poseidon.ndb.mysql.com
6295103f96 Bug#17233, disabled test in waiting for bug fix 2006-02-08 14:07:52 +01:00
ramil@mysql.com
34abab41db Removed 'delayed' to make the test deterministic (as the bug itself has nothing to do with 'delayed'). 2006-02-08 16:00:39 +04:00
bell@sanja.is.com.ua
ded01c3b6f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-02-08 10:36:42 +02:00
pekka@mysql.com
14249f23ed Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-02-07 21:52:56 +01:00
bell@sanja.is.com.ua
6916a4bfe6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-02-07 22:10:44 +02:00
gunnar@mysql.com.
f6590a3b89 Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com.:/data/BK/mysql-5.0
 2006-02-07 20:50:28 +01:00
pekka@mysql.com
05353723f0 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-02-07 20:04:54 +01:00
pekka@mysql.com
9aa06f3bc1 ndb - bug#15918 fix 2006-02-07 19:57:31 +01:00
gunnar@mysql.com.
a0b0cb5551 Merge mysql.com.:/data/BK/mysql-5.0 
into  mysql.com.:/data/BK/mysql-5.0_8461_b
 2006-02-07 17:15:12 +01:00
gunnar@mysql.com.
001224c09d item_func.cc: 
fix for bug#8461

  BUG 8461 - TRUNCATE returns incorrect result if 2nd argument is negative
  Reason: Both TRUNCATE/ROUND converts INTEGERS to DOUBLE and back to INTEGERS
  Changed the integer routine to work on integers only.
  This bug affects 4.1, 5.0 and 5.1
  Fixing in 4.1 will need to change the routine to handle different types individually.
  5.0 did had different routines for different types already just the INTEGER routine was bad.
 2006-02-07 13:26:35 +01:00
bell@sanja.is.com.ua
84900213dd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2006-02-07 14:23:16 +02:00
bell@sanja.is.com.ua
5923d50533 kill.test fixed for kill on Mac OS X (which do not send OK) 2006-02-07 13:45:16 +02:00
svoj@april.(none)
328b59a5ed Merge april.(none):/home/svoj/devel/mysql/merge/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0
 2006-02-07 15:30:32 +04:00
svoj@april.(none)
a67d8f9043 Merge april.(none):/home/svoj/devel/mysql/BUG14496/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
 2006-02-07 13:49:03 +04:00
tomas@poseidon.ndb.mysql.com
3f6671d72a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-07 00:06:28 +01:00
tomas@poseidon.ndb.mysql.com
5bbb5c29b7 Bug #17154 load data infile of char values into a table of char(PK) hangs 
Bug #17158  	load data infile of char values into table of char with no (PK) fails to load
Bug #17081  	Doing "LOAD DATA INFILE" directly after delete can cause missing data
 2006-02-07 00:03:39 +01:00
igor@rurik.mysql.com
b25b4e9b5e Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-06 11:40:39 -08:00
igor@rurik.mysql.com
3af0eabc7f Fixed bug #16203. 
If check_quick_select returns non-empty range then the function cost_group_min_max
cannot return 0 as an estimate of the number of retrieved records.
Yet the function erroneously returned 0 as the estimate in some situations.
 2006-02-06 11:35:13 -08:00
pem@mysql.com
c289a3b60e Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0
 2006-02-06 17:58:15 +01:00
pem@mysql.com
62d2511df5 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0
 2006-02-06 16:07:13 +01:00
pem@mysql.com
2d340a875c Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug16568/mysql-5.0
 2006-02-06 14:09:14 +01:00
aelkin@mysql.com
217499df86 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-02-04 10:25:46 +02:00
pekka@mysql.com
c696582df4 ndb - replace+tinyblob back-patch from 5.0 [ discard on 4.1->5.0 merge ] 2006-02-03 15:23:58 +01:00
pekka@mysql.com
7b892368c3 ndb - bugfix: tinyblob + replace => mysqld crash (no bug#) 2006-02-03 14:35:29 +01:00
igor@rurik.mysql.com
f61517d60b Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-02 21:23:36 -08:00
igor@rurik.mysql.com
b32ce5ac79 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-02 13:47:21 -08:00