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

49981 commits

This branch
This branch
All branches
Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
78fb6b274b moving these tests to suite ndb_team 2007-09-05 19:13:36 +02:00
tomas@whalegate.ndb.mysql.com
e8c2807aac tests actually work in statement based 2007-09-05 18:44:47 +02:00
tomas@whalegate.ndb.mysql.com
06b267cbb7 correct include file 2007-09-05 18:02:46 +02:00
lzhou/zhl@dev3-63.(none)
c0f5b574f4 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug27543
 2007-09-05 15:37:30 +00:00
tomas@whalegate.ndb.mysql.com
173a9473be correct include file 2007-09-05 17:31:26 +02:00
lzhou/zhl@dev3-63.(none)
b2b22e93a2 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug30024
 2007-09-05 15:03:11 +00:00
lzhou/zhl@dev3-63.(none)
53c2c7fa3f BUG#27543 Backup and restore can compatible with different endians for blob attribute 2007-09-05 13:01:30 +00:00
tomas@whalegate.ndb.mysql.com
1657c2d88a getting rid of flush altogether, fix with post_epoch hendeling and/or changes in Rows_log_event 
- problem is the database name accessed in Rows_log_event write... get_db() which is a pointer to the share string...
- point to table map instead?
- or copy it?
- or make sure that anything interacting with the share happens _after_ the epoch

Problem with flush is that STMT_END_F may not be included as it shoudld...
 2007-09-05 11:43:42 +02:00
joerg@trift2.
04d12fc9d6 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-09-05 09:35:02 +02:00
joerg@trift2.
04b56132a7 libmysql/libmysql.c : Correct a wrong automerge: Don't duplicate "DBUG_ENTER()". 2007-09-05 09:30:50 +02:00
tomas@whalegate.ndb.mysql.com
39edaf9f8d this flush with flag TRUE causes spurious errors in the binlog... as it will insert a STMT_END_F... and hence an invalid binlog (missing table mappings) 2007-09-05 09:22:58 +02: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
brian@zim.(none)
e235ccd13a Discovered a bug while working with backup. Since it is possible to execute a statement in a pre/post statment clause that can return a result, we need to test for that and free it. 2007-09-04 20:03:12 -07:00
malff/marcsql@weblab.(none)
5cd66ca65f Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
 2007-09-04 16:50:09 -06:00
malff/marcsql@weblab.(none)
f4b671d8bc Fixed whitespace 2007-09-04 16:40:27 -06:00
malff/marcsql@weblab.(none)
3a7bcd72f3 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-09-04 14:38:26 -06:00
tomas@whalegate.ndb.mysql.com
29af14afa2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-09-04 22:25:23 +02:00
malff/marcsql@weblab.(none)
0f58ed7e74 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
 2007-09-04 12:25:54 -06:00
joerg@trift2.
3042b5bfec Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-09-04 19:56:08 +02:00
joerg@trift2.
a751c743c0 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-09-04 19:49:42 +02:00
joerg@trift2.
7fc80ef6eb Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-09-04 19:43:44 +02:00
joerg@trift2.
1aa9d47832 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-09-04 19:41:33 +02:00
joerg@trift2.
150b9a5f20 Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-09-04 19:37:45 +02:00
thek@adventure.(none)
11c97a2646 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-09-04 17:46:01 +02:00
thek@adventure.(none)
e480b31794 Merge adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-09-04 17:43:29 +02:00
rafal@quant.(none)
1835b16255 Disabling rpl_ndb_2other test. 2007-09-04 15:24:04 +02:00
df@pippilotta.erinye.com
48380a6366 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-09-04 11:39:34 +02:00
df@pippilotta.erinye.com
08337dd084 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-09-04 11:07:07 +02:00
df@pippilotta.erinye.com
c5a33802b5 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-09-04 11:06:02 +02:00
df@pippilotta.erinye.com
ab791bc13d Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-09-04 10:54:32 +02:00
df@pippilotta.erinye.com
59b504a5e3 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.48 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-09-04 10:49:54 +02: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
anozdrin/alik@station.
7dee4ac78c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  station.:/mnt/raid/alik/MySQL/5.1-rt-build
 2007-09-03 17:24:59 +04:00
thek@adventure.(none)
b1d1204576 Merge adventure.(none):/home/thek/Development/cpp/bug21074/my50-bug21074 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2007-09-03 13:46:10 +02:00
thek@adventure.(none)
530d6fd983 Merge adventure.(none):/home/thek/Development/cpp/bug21074/my50-bug21074 
into  adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074
 2007-09-03 13:44:02 +02:00
thek@adventure.(none)
a8b9bd9f67 - Fix cross compatibility issues by exchanging pthread_yield with my_sleep(0) 2007-09-03 13:42:32 +02:00
anozdrin/alik@station.
c39d032da2 Rewrite test case for BUG 25843 to avoid SHOW BINLOG EVENTS 
statement.
 2007-09-03 15:13:34 +04:00
anozdrin/alik@station.
c7de965215 Make mysql compilable on gcc-4.2.1. 
c++config.h now has the following code:
// For example, <windows.h> is known to #define min and max as macros...
#undef min
#undef max

So, our defines in my_global.h are undefined when <new> header
is included.

Move definitions of min()/max() to the end of my_global.h.
 2007-09-03 15:12:28 +04: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
jonas@perch.ndb.mysql.com
9529e06c9a ndb - merge error code 
forgot to update next TC no
 2007-09-03 11:32:48 +02:00
jonas@perch.ndb.mysql.com
d1c8dc8320 ndb - merge error code(s) 2007-09-03 11:29:58 +02:00
joerg@trift2.
83bb61d8a3 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-09-03 11:13:44 +02:00
joerg@trift2.
53303665a3 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-09-03 11:09:54 +02:00
thek@adventure.(none)
fea7bf2409 Merge adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-09-03 11:07:32 +02:00
thek@adventure.(none)
0184f50f27 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2007-09-03 10:59:44 +02:00
thek@adventure.(none)
85d7007848 Merge adventure.(none):/home/thek/Development/cpp/bug21074/my50-bug21074 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2007-09-03 10:54:33 +02:00
thek@adventure.(none)
a860751b57 Merge adventure.(none):/home/thek/Development/cpp/bug21074/my50-bug21074 
into  adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074
 2007-09-03 10:52:14 +02:00