mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
52270 commits 2781 branches 343 tags 1.6 GiB
Commit graph

52270 commits

This branch
This branch
All branches
Author SHA1 Message Date
tsmith@ramayana.hindu.god
31a4940b3f Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-12-07 15:04:45 -07:00
tsmith@ramayana.hindu.god
4eb097ba12 Add a way to remove options which mysql-test-run.pl no longer uses. 2007-12-07 14:43:31 -07:00
evgen@moonbone.local
a836535cde Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  moonbone.local:/work/32482-5.1-opt-mysql
 2007-12-07 22:56:16 +03:00
evgen@moonbone.local
f1bff761d9 Bug#32482: Crash for a query with ORDER BY a user variable. 
The Item_func_set_user_var::register_field_in_read_map() did not check 
that the result_field was null.This caused server crashes for queries that
required order by such a field and were executed without using a temporary
table.

The Item_func_set_user_var::register_field_in_read_map() now checks the
result_field to be not null.
 2007-12-07 22:54:47 +03:00
mleich@five.local.lan
4fc04761b9 Merge five.local.lan:/work/merge/mysql-5.1-build 
into  five.local.lan:/work/merge/mysql-5.1-build-parts
 2007-12-07 18:45:09 +01:00
thek@adventure.(none)
392cc185b3 Bug #27440 read_only allows create and drop database 
When read_only option was enabled, a user without SUPER privilege could
perform CREATE DATABASE and DROP DATABASE operations.

This patch adds a check to make sure this isn't possible. It also attempts to 
simplify the logic used to determine if relevant tables are updated,
making it more human readable.
 2007-12-07 15:39:41 +01:00
gkodinov/kgeorge@macbook.gmz
2264ca3646 Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt
 2007-12-07 16:15:58 +02:00
joerg@trift2.
72e382ecc7 Merge trift2.:/MySQL/M51/embedtest-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-07 15:02:31 +01:00
joerg@trift2.
151504a3d0 Makefile.am 
Makefile syntax error, comment should precede the whole target.
 2007-12-07 14:46:52 +01:00
mskold/marty@mysql.com/quadfish.(none)
0c62882776 Removed illegal cast 2007-12-07 14:06:44 +01:00
mskold/marty@quadfish.(none)
9532e822f1 Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb 
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
 2007-12-07 14:04:58 +01:00
mskold/marty@mysql.com/quadfish.(none)
4619caa5d5 Removed illegal cast 2007-12-07 14:03:54 +01:00
joerg@trift2.
74799dc453 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-07 13:54:56 +01:00
joerg@trift2.
fd5000f650 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-12-07 13:51:41 +01:00
mskold/marty@quadfish.(none)
844936abdc Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb 
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
 2007-12-07 13:45:01 +01:00
mskold/marty@mysql.com/quadfish.(none)
6047fb2e44 Removed illegal cast 2007-12-07 13:42:44 +01:00
joerg@trift2.
5a40e40946 Merge trift2.:/MySQL/M51/embedtest-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-07 12:35:56 +01:00
joerg@trift2.
cc609742fa Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-07 12:33:48 +01:00
mskold/marty@mysql.com/quadfish.(none)
4dcfb096d7 bug#21072 Duplicate key error in NDB references wrong key: regenerated result 2007-12-07 12:20:04 +01:00
tsmith@ramayana.hindu.god
3b45ef82dd Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-12-07 03:59:53 -07:00
tsmith@ramayana.hindu.god
3d01ffd78d Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-12-07 03:56:03 -07:00
joerg@trift2.
2cf168d6aa Makefile.am 
In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.
 2007-12-07 11:54:59 +01:00
tsmith@ramayana.hindu.god
8c5f194505 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-12-07 03:51:23 -07:00
svoj@mysql.com/june.mysql.com
413112fb55 BUG#32817 - though CSV is marked as supported create table is rejected 
with error 1005.

CSV doesn't support nullable fields. Report descriptive error if create
table with nullable field is requested.
 2007-12-07 14:44:03 +04:00
tsmith@ramayana.hindu.god
04d363d1f6 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
 2007-12-07 03:42:39 -07:00
tsmith@ramayana.hindu.god
bf6292ea97 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-12-07 03:40:18 -07:00
tsmith@ramayana.hindu.god
6835272b37 Make tests more robust (clean up better after grant.test) 2007-12-07 03:39:37 -07:00
mskold/marty@mysql.com/quadfish.(none)
af908e61b7 bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes 2007-12-07 11:05:19 +01:00
mskold/marty@quadfish.(none)
e051994b10 Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb 
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
 2007-12-07 10:46:12 +01:00
mskold/marty@mysql.com/quadfish.(none)
fc6f839b03 bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes 2007-12-07 10:33:50 +01:00
tsmith@ramayana.hindu.god
45c7826088 Move the test case for bug #20901 from create.test to grant.test, so 
testing embedded server works correctly.
 2007-12-07 00:54:32 -07:00
holyfoot/hf@hfmain.(none)
d296c9d178 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/26921/my51-26921
 2007-12-07 10:22:02 +04:00
holyfoot/hf@hfmain.(none)
901dc028f9 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/26921/my51-26921
 2007-12-07 10:10:02 +04:00
holyfoot/hf@hfmain.(none)
d26de7bee0 Merge mysql.com:/home/hf/work/26921/my50-26921 
into  mysql.com:/home/hf/work/26921/my51-26921
 2007-12-07 09:39:31 +04:00
tsmith@ramayana.hindu.god
b922c9646c Fix compiler warning about wrong integer size (probably harmless) 2007-12-06 16:11:26 -07:00
tsmith@ramayana.hindu.god
44d74f631f ctype-simple.c: Backport quick fix to remove Windows compiler warnings 2007-12-06 15:05:24 -07:00
holyfoot/hf@hfmain.(none)
45edb712d4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/mrg/my51-mrg
 2007-12-06 22:31:22 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
3f27019281 partition_archive tests added 2007-12-06 22:17:42 +04:00
mleich@five.local.lan
dba250956a Fix for 
Bug#32856 testsuite parts: partition_basic_myisam fails 
                              in pushbuild
Skip test if symlink support is missing.
 2007-12-06 18:26:50 +01:00
tnurnberg@sin.intern.azundris.com
5cab4a77e1 Bug#31177: Server variables can't be set to their current values 
initialise limits properly for getopt_ll_limit()
(fixes falcon_opt test)
 2007-12-06 18:03:30 +01:00
mskold/marty@mysql.com/quadfish.(none)
27c025061d bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts 2007-12-06 17:15:21 +01:00
mattiasj@witty.ndb.mysql.com
c27d93c83a Bug#32948: FKs allowed to reference partitioned table 
Problem: when alter to partitioned table,
it does not see it as change of engine.

Solution: If alter includes partitioning, check if it is possible
to change engines (eg. is the table referenced by a FK)
 2007-12-06 14:43:06 +01:00
holyfoot/hf@hfmain.(none)
18e6de9f15 Merge mysql.com:/home/hf/work/32247/my51-32247 
into  mysql.com:/home/hf/work/mrg/my51-mrg
 2007-12-06 16:43:52 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
dc01dba255 Bug #32247 Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table). 
ha_partition::update_create_info() just calls update_create_info
of a first partition, so only get the autoincrement maximum
of the first partition, so SHOW CREATE TABLE can show
small AUTO_INCREMENT parameters.
Fixed by implementing ha_partition::update_create_info() in a way
other handlers work.
HA_ARCHIVE:stats.auto_increment handling made consistent with other engines
 2007-12-06 16:39:42 +04:00
tnurnberg@mysql.com/white.intern.koehntopp.de
dddced964b Bug#31752: check strmake() bounds 
post-fixes: prevent semi-related overflow, additional comments
 2007-12-06 11:48:27 +01:00
tnurnberg@white.intern.koehntopp.de
d349effe11 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/31177/51-31177
 2007-12-06 08:56:04 +01:00
tnurnberg@white.intern.koehntopp.de
987ec3f306 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/31177/50-31177
 2007-12-06 08:46:01 +01:00
tnurnberg@white.intern.koehntopp.de
fe8d3dddf2 Merge mysql.com:/misc/mysql/31177/50-31177 
into  mysql.com:/misc/mysql/31177/51-31177
 2007-12-06 01:46:49 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b1e77cfc31 Bug#31177: Server variables can't be set to their current values 
additional fixes for BDB and correct assignment of both signed
and unsigned 64-bit data to unsigned system variables
 2007-12-06 01:28:01 +01:00
tsmith@ramayana.hindu.god
ac811ce455 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
 2007-12-05 15:31:18 -07:00