mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49596 commits 2774 branches 343 tags 1.6 GiB
Commit graph

19469 commits

Author SHA1 Message Date
gshchepa/uchum@gleb.loc
1926819d5b Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-06 22:31:25 +05:00
gshchepa/uchum@gleb.loc
adbe17c8a1 sp.result: 
Post-merge fix.
 2007-09-06 20:42:36 +05:00
gshchepa/uchum@gleb.loc
4732821e9d Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-06 19:15:31 +05:00
gshchepa/uchum@gleb.loc
582b69686c Merge gleb.loc:/home/uchum/work/bk/5.1-opt-29938 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-05 11:43:40 +05:00
gshchepa/uchum@gleb.loc
adfbea368d Fixed bug #29938. 
mysqldump --skip-events --all-databases dumped data of the mysqld.event table,
and during the restoration from this dump events were created in spite
of the --skip-events option.

The mysqldump client has been modified to ignore mysql.event table data
in case of --skip-events options.
 2007-09-05 11:35:29 +05:00
mhansson@dl145s.mysql.com
313453f192 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/data0/mhansson/my51-bug30234-push
 2007-09-03 16:24:33 +02:00
mhansson@dl145s.mysql.com
b1cc84ec1d Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  dl145s.mysql.com:/data0/mhansson/my50-bug30234-push
 2007-09-03 12:44:17 +02:00
mhansson/martin@linux-st28.site
7ed22abe1a Merge linux-st28.site:/home/martin/mysql/src/bug30234-push/my50-bug30234-push 
into  linux-st28.site:/home/martin/mysql/src/bug30234-push/my51-bug30234-push
 2007-09-03 12:02:45 +02:00
mhansson/martin@linux-st28.site
df5c9e69f0 Bug #30234: Unexpected behavior using DELETE with AS and USING 
DELETE FROM ... USING ... statements with the following type of 
ambiguous aliasing gave unexpected results:
DELETE FROM t1 AS alias USING t1, t2 AS alias WHERE t1.a = alias.a;
This query would leave table t1 intact but delete rows from t2.
Fixed by changing DELETE FROM ... USING syntax so that only alias 
references (as opposed to alias declarations) may be used in FROM.
 2007-09-03 11:55:35 +02:00
gluh@mysql.com/eagle.(none)
33eaf2cd95 Bug#29408 Cannot find view in columns table if the selection contains a function 
Use view db name as thread default database, in order to ensure
that the view is parsed and prepared correctly.
 2007-09-03 12:22:56 +05:00
msvensson@pilot.(none)
122f5f6cd0 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-09-01 11:43:44 +02:00
msvensson@pilot.(none)
66ae874371 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-09-01 11:42:43 +02:00
msvensson@pilot.(none)
0ccf3502ef Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-09-01 11:41:59 +02:00
msvensson@pilot.(none)
c5ea7b0641 Use eval around "rmtree" and use our own version of rmtree if it fails 2007-09-01 11:41:38 +02:00
tsmith@ramayana.hindu.god
b5c13a0f46 Correct fix for test result. 2007-08-31 10:53:51 -06:00
gshchepa/uchum@gleb.loc
a6d644e7b5 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30126 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-31 17:50:52 +05:00
gshchepa/uchum@gleb.loc
df7771de65 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30126 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-31 17:05:37 +05:00
gshchepa/uchum@gleb.loc
3e49bbd8e7 Fixed bug #30126. 
When dumping database from a 4.x server, the mysqldump client
inserted a delimiter sign inside special commentaries of the form:
  /*!... CREATE DATABASE IF NOT EXISTS ... ;*/
During restoration that dump file was splitten by delimiter signs on
the client side, and the rest of some commentary strings was prepended
to following statements.

The 4x_server_emul test case option has been added for use with the
DBUG_EXECUTE_IF debugging macro. This option affects debug server
builds only to emulate particular behavior of a 4.x server for
the mysqldump client testing. Non-debugging builds are not affected.
 2007-08-31 16:59:07 +05:00
tsmith@ramayana.hindu.god
d70e4b0c92 Correct test result file for bug #27014 2007-08-31 05:21:12 -06:00
tsmith@ramayana.hindu.god
47dc161f5b Fix test results for bug #27014 2007-08-31 01:28:42 -06:00
tsmith@ramayana.hindu.god
cefe7a3c8b Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-30 14:56:24 -06:00
tsmith@ramayana.hindu.god
ebe3894004 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-30 14:54:19 -06:00
tsmith@ramayana.hindu.god
58ecaaa859 Disable rpl_ndb_2other, which has never worked on bigendian machines. 2007-08-30 14:13:05 -06:00
msvensson@pilot.(none)
45667e6429 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-30 07:25:18 +02:00
tsmith@sita.local
653f7341bb Post-merge fixes, and disable buggy test case on embedded 2007-08-29 16:58:00 -06:00
brian@piggy.tangent.org
52ae4496c5 Added ORDER BY to udf select so that results are ordered. 2007-08-29 14:36:08 -07:00
tsmith@sita.local
e32bdff6f0 Merge sita.local:/Users/tsmith/m/bk/maint/51-target22 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-08-29 15:28:38 -06:00
msvensson@pilot.(none)
8efb5ab34e Merge pilot.(none):/data/msvensson/mysql/my51-m-imsuite 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-29 19:08:35 +02:00
msvensson@pilot.(none)
61dbfb3a01 Move instance manager tests to it's own suite 2007-08-29 19:02:33 +02:00
gkodinov/kgeorge@magare.gmz
de14b6a502 Merge bk-internal:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B30393-5.1-opt
 2007-08-29 19:05:03 +03:00
msvensson@pilot.(none)
50320790d5 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-29 17:54:40 +02:00
msvensson@pilot.(none)
b1fdece307 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-29 17:54:16 +02:00
msvensson@pilot.(none)
ac5309cb04 Remove any old pidfile before starting mysqld to make sure that 
'mysqld_wait_started' don't return prematurely because of an old
pidfile
 2007-08-29 17:54:02 +02:00
gkodinov/kgeorge@magare.gmz
25dfe20588 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30244-5.1-opt
 2007-08-29 16:32:26 +03:00
msvensson@pilot.(none)
1a1bbf2da0 Remove unportable use of "system rm" 2007-08-29 14:44:23 +02:00
msvensson@pilot.(none)
4c571eb3e8 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-29 14:40:38 +02:00
msvensson@pilot.(none)
2028c2b696 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-29 14:39:59 +02:00
msvensson@pilot.(none)
f164a136e1 Fix typo: '$$' => '$' 2007-08-29 14:39:40 +02:00
gkodinov/kgeorge@magare.gmz
56b6db1fd2 Bug #30244: row_count/found_rows does not replicate well 
The functions ROW_COUNT/FOUND_ROWS are indeed not safe to be used in 
 statement based replication.
 Added code to declare them as such and switch the statement they're in
 to row based logging for mixed mode.
 2007-08-29 14:54:32 +03:00
gkodinov/kgeorge@magare.gmz
30585c3d2e Bug #30393: Test "group_by" fails with a difference in "row count" 
and strategy (explain)
  
The fix for WL3527 adds tests that test if the index usage hints
combinations don't cause syntax errors.
The EXPLAIN for one of these tests can be affected by the size of the
rowid on the disk (affected by the presence of large file support). 
Fixed to avoid the platform dependent test result by removing the 
irrelevant columns from the EXPLAIN result.
 2007-08-29 14:46:49 +03:00
msvensson@pilot.(none)
758f2fc71e Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-29 12:47:28 +02:00
msvensson@pilot.(none)
aa57f6106c Remove unportable use of "system rm" 2007-08-29 12:47:00 +02:00
msvensson@pilot.(none)
9ffb05dbbf Remove unportable "system rm" 2007-08-29 12:44:43 +02:00
msvensson@pilot.(none)
e10fb4ffb3 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-29 11:55:03 +02:00
msvensson@pilot.(none)
523cddeec3 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-29 11:53:36 +02:00
msvensson@pilot.(none)
b68689172f Remove unportable use of "exec chmod" 2007-08-29 11:53:15 +02:00
msvensson@pilot.(none)
387990f78d Add 'mtr_rmtree' 2007-08-29 11:51:34 +02:00
gkodinov/kgeorge@magare.gmz
625c44fe67 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B30377-5.0-opt
 2007-08-29 12:47:24 +03:00
mhansson/martin@linux-st28.site
f672e5bca6 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  linux-st28.site:/home/martin/mysql/src/bugx/my50-bugx
 2007-08-29 10:49:19 +02:00
gkodinov/kgeorge@magare.gmz
acf0ebe69f Merge magare.gmz:/home/kgeorge/mysql/work/B30377-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B30377-5.1-opt
 2007-08-29 11:38:05 +03:00