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

17397 commits

Author SHA1 Message Date
msvensson@pilot.blaudden
f6240e374d Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 17:00:43 +02:00
msvensson@pilot.blaudden
4ca2b73f24 Use mysqltest builtin $MYSQL_SERVER_VERSIOn to mask version that mysql_upgrade reports 2007-04-18 16:56:53 +02:00
msvensson@pilot.blaudden
a4681af19c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 16:50:14 +02:00
msvensson@pilot.blaudden
84d60374e5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-18 16:49:10 +02:00
msvensson@pilot.blaudden
76285bdf31 Update mysql_upgrade tests for 5.1 
Add "two liner" to mysqld --bootstrap that allows
wo write scripts that can be run both by mysql and mysqld --bootstrap
Remove duplicate create of MySQL system tables
 2007-04-18 16:23:19 +02:00
msvensson@pilot.blaudden
01133f8e6f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-18 14:18:55 +02:00
msvensson@pilot.blaudden
a247bd582e Make it possible to define how many slaves to start by 
writing --slave-num=n in <testname>-master.opt file
 2007-04-18 13:50:54 +02:00
msvensson@pilot.blaudden
dd0d2146c3 Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-18 13:22:32 +02:00
msvensson@pilot.blaudden
20e622dcf3 Bug#25452 mysql_upgrade access denied 
- Improve mysql_upgrade and add comments describing it's logic
 - Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
  was started from
 - Don't look for mysql_fix_privilege_tables.sql randomly, compile
  in the mysql_fix_privilege_tables.sql file and use that to upgrade
  the system tables of MySQL
 - Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
 - Fix bug#26639, bug#24248 and bug#25405
 2007-04-18 13:21:39 +02:00
dkatz@damien-katzs-computer.local
9f4df9b91d Test result differences between mysql versions. 2007-04-16 14:37:38 -04:00
dkatz@damien-katzs-computer.local
227115fa2b Merge damien-katzs-computer.local:/Users/dkatz/50b 
into  damien-katzs-computer.local:/Users/dkatz/51merge
 2007-04-16 14:08:03 -04:00
dkatz@damien-katzs-computer.local
138f003738 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/50b
 2007-04-16 13:49:17 -04:00
tomas@whalegate.ndb.mysql.com
5ee4948dec Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-04-16 14:51:55 +02:00
tomas@whalegate.ndb.mysql.com
a30755427a Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
 2007-04-16 14:51:08 +02:00
tomas@whalegate.ndb.mysql.com
be01d89661 some more tests + drop stuff after done 2007-04-16 14:15:30 +02:00
tomas@whalegate.ndb.mysql.com
1bf8aad558 Bug #27710 Creating unique index fails during single user mode 
- enable indexes to be used always, if in single user, reject will happen before, and if it is kerlel doing stuff, it should always be allowed
 2007-04-16 14:07:31 +02:00
tomas@whalegate.ndb.mysql.com
03c6d037fc Bug #27710 Creating unique index fails during single user mode 
- enable indexes to be used always, if in single user, reject will happen before, and if it is kerlel doing stuff, it should always be allowed
 2007-04-16 13:08:09 +02:00
tomas@whalegate.ndb.mysql.com
2c723aa91f Bug #27712 Single user mode. Creating logfile group and tablespace is allowed 2007-04-16 11:43:14 +02:00
evgen@moonbone.local
bfac9ea67e subselect.result: 
After merge fix.
 2007-04-15 12:16:32 +04:00
evgen@moonbone.local
392fb72f5c Merge moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
 2007-04-15 12:05:13 +04:00
evgen@moonbone.local
51badaddbc subselect.test, subselect.result: 
After merge fix.
 2007-04-15 09:22:45 +04:00
evgen@moonbone.local
922a5a969c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysql
 2007-04-15 08:41:35 +04:00
evgen@moonbone.local
3113ce6383 Bug#27321: Wrong subquery result in a grouping select. 
The Item_outer_ref class based on the Item_direct_ref class was always used
to represent an outer field. But if the outer select is a grouping one and the 
outer field isn't under an aggregate function which is aggregated in that
outer select an Item_ref object should be used to represent such a field.
If the outer select in which the outer field is resolved isn't grouping then
the Item_field class should be used to represent such a field.
This logic also should be used for an outer field resolved through its alias
name.

Now the Item_field::fix_outer_field() uses Item_outer_field objects to
represent aliased and non-aliased outer fields for grouping outer selects
only.
Now the fix_inner_refs() function chooses which class to use to access outer
field - the Item_ref or the Item_direct_ref. An object of the chosen class
substitutes the original field in the Item_outer_ref object.
The direct_ref and the found_in_select_list fields were added to the
Item_outer_ref class.
 2007-04-15 08:31:34 +04:00
holyfoot/hf@hfmain.(none)
13a7fdac24 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-14 14:56:07 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
8b49f27530 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-14 14:54:59 +05:00
epotemkin@bk-internal.mysql.com
9e2dcb5e91 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-04-13 23:32:23 +02:00
msvensson@pilot.blaudden
2aef31fa51 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-13 15:13:12 +02:00
msvensson@pilot.blaudden
86a364319d Add option manual-ddd 
Change syntax for starting manual ddd or gdb to avoid having to
change working dir
 2007-04-13 15:06:05 +02:00
msvensson@pilot.blaudden
7df5e05b4d Add missing option --manual-ddd 
Change syntax to start manual gdb/ddd to avoid having to
cd to the mysql-test directory before calling the command
 2007-04-13 14:40:52 +02:00
tomas@whalegate.ndb.mysql.com
2a917850d2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-13 08:15:49 +02:00
tomas@whalegate.ndb.mysql.com
592e0f2250 correct merge error 2007-04-13 01:52:45 +02:00
tomas@whalegate.ndb.mysql.com
ac8d2dead6 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-13 01:45:44 +02:00
tomas@whalegate.ndb.mysql.com
5d89ca3a89 Bug#27775 mediumint auto_increment with ndb_restore 
- autoincrement column of size medium int not handled in ndb_restore
- added testcase also for other types, tiny, small... etc
 2007-04-13 01:37:24 +02:00
dkatz@damien-katzs-computer.local
dac9f99327 Bug #27322 failure to allocate transaction_prealloc_size causes crash 
Fix for when memory pre-allocation fails.
 2007-04-12 18:03:26 -04:00
gshchepa/uchum@gshchepa.localdomain
4b2aab14ba Bug#5507: TRUNCATE does not work with views. 
Support of views wasn't implemented for the TRUNCATE statement.
Now TRUNCATE on views has the same semantics as DELETE FROM view:
mysql_truncate() checks whether the table is a view and falls back
to delete if so.
In order to initialize properly the LEX::updatable for a view
st_lex::can_use_merged() now allows usage of merged views for the
TRUNCATE statement.
 2007-04-12 23:21:37 +05:00
tomas@whalegate.ndb.mysql.com
ba60730808 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt
 2007-04-12 18:29:43 +02:00
tomas@whalegate.ndb.mysql.com
6015317269 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt
 2007-04-12 18:29:24 +02:00
msvensson@pilot.blaudden
9a53086995 Update result file to 5.1 format of SHOW CREATE 2007-04-12 14:29:10 +02:00
tomas@whalegate.ndb.mysql.com
98c2e79af4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-12 11:29:05 +02:00
tomas@whalegate.ndb.mysql.com
2e620e3db6 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-12 11:12:43 +02:00
tomas@whalegate.ndb.mysql.com
f9a900f80e Bug #27758 Restoring NDB backups makes table usable in SQL nodes 
- parse indexname using "split" instead of sscanf, as not to break at space
- test case with space in key
- enclose names in printout
 2007-04-12 11:07:30 +02:00
jonas@perch.ndb.mysql.com
890b19c895 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-04-12 07:40:15 +02:00
jonas@perch.ndb.mysql.com
3ddd25f2f3 ndb - mysql-test-run testcase for bug#27757 2007-04-12 07:19:10 +02:00
igor@olga.mysql.com
e04289704d Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-04-11 15:12:49 -07:00
msvensson@pilot.blaudden
3a8b0edcb5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-11 23:43:58 +02:00
msvensson@pilot.blaudden
cd2f78fdd8 Bug#27669 mysqldump: Got error: 2026: SSL connection error when trying to connect 
- Add testcase for SSL connection from mysqldump to mysqld
 2007-04-11 23:42:53 +02:00
igor@olga.mysql.com
4bf11f99eb Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-04-11 13:48:02 -07:00
msvensson@pilot.blaudden
4774c40089 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-11 22:08:00 +02:00
igor@olga.mysql.com
e1efba0225 Post-merge fix. 2007-04-11 12:45:27 -07:00
msvensson@pilot.blaudden
900e0d685d Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-11 21:03:29 +02:00