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

10329 commits

Author SHA1 Message Date
ingo@mysql.com
b9bc1e9108 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg
 2006-02-10 20:00:22 +01:00
kent@mysql.com
5fe2e8fd7d mysql-test-run.pl: 
Display instance manager port
mysql-test-run.sh:
  Give port space for more than one slave
 2006-02-10 19:56:34 +01:00
kent@mysql.com
f8e08f38fe Merge 2006-02-10 19:47:46 +01:00
kent@mysql.com
d23d02be18 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2006-02-10 19:18:45 +01:00
petr@mysql.com
2e01c8b0d0 Merge mysql.com:/home/cps/mysql/devel/5.0-mike 
into  mysql.com:/home/cps/mysql/devel/5.1-merge
 2006-02-10 21:03:49 +03: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
f0d95d0af3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-10 18:04:46 +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
andrey@lmy004.
3e89e1ccb2 fix for bug #17289 Events: missing privilege check for drop database 
Events were executed with all privileges possible on planet Earth :(
WL#1034
 2006-02-10 15:02:57 +01:00
jmiller@mysql.com
0cf61d620f Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-02-10 12:58:55 +01:00
jmiller@mysql.com
7ce371210f test updates 2006-02-10 12:52:35 +01:00
msvensson@neptunus.(none)
4217699e56 Bug#17280 mysqltest, --echo sometimes does not expand $variables 
- Evaluate all variables in the text before printing it to result file
 2006-02-10 12:11:16 +01:00
msvensson@neptunus.(none)
332a1a1f18 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-10 11:27:30 +01:00
knielsen@mysql.com
344c334141 Merge mysql.com:/usr/local/mysql/mysql-5.1-sp-destruct 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2006-02-10 10:44:09 +01:00
tomas@poseidon.ndb.mysql.com
f8b0345503 MySQL Bugs: #17283: Issues with killing "bankTransactionMaker" (and others) in 86 tests 2006-02-10 10:34:18 +01:00
bar@mysql.com
f057c9b4e7 Bug#16234 XML: Crash if ExtractValue() 
Also fixes 16314: XML: extractvalue() crash if vertical bar
xml.result, xml.test:
  Adding test case
item_xmlfunc.cc:
  Using root element as a context node,
  instead of NULL, with relative paths.
 2006-02-10 13:24:10 +04:00
knielsen@mysql.com
1bc91adcef Fix missing test cleanup 2006-02-10 10:18:57 +01:00
msvensson@neptunus.(none)
5690dd8b85 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-10 09:14:22 +01: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
c5794763e4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
 2006-02-10 10:24:30 +03:00
petr@mysql.com
f3d73e8cbe Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/devel/5.1-im-fixes
 2006-02-10 03:38:29 +03:00
petr@mysql.com
392f93c0aa Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
 2006-02-10 03:37:13 +03:00
petr@mysql.com
8488498545 IM changes by GUI team: add a version_no column to the 
SHOW INSTANCE STATUS output
 2006-02-10 03:35:07 +03:00
petr@mysql.com
1c7bc08537 a bunch of IM fixes from the GUI team 2006-02-10 02:15:55 +03:00
tomas@poseidon.ndb.mysql.com
76f6331aed changed to use temporary heap table on a ndb test 
corrected multiple --log-bin options in mysql-test-run
 2006-02-10 00:15:07 +01:00
tomas@poseidon.ndb.mysql.com
fe0ff3e21c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-09 23:48:52 +01:00
andrey@lmy004.
541e67342f from fix for bug#16414 (Events: Crash or hang if event drops itself) 
WL #1034
 2006-02-09 23:15:47 +01:00
tomas@poseidon.ndb.mysql.com
246d0ea290 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-09 23:15:46 +01:00
andrey@lmy004.
24c010892c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-events_i_s
 2006-02-09 23:15:46 +01:00
aivanov@mysql.com
f8f8af970e Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged
 2006-02-10 01:15:45 +03:00
tomas@poseidon.ndb.mysql.com
930641a5c1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-09 21:28:22 +01:00
andrey@lmy004.
67985360f0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-events_i_s
 2006-02-09 20:20:22 +01:00
tomas@poseidon.ndb.mysql.com
3c0ed6d410 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-02-09 19:55:50 +01:00
aivanov@mysql.com
e22d2f1150 Fixed BUG#9680: Wrong error from cascading update 
Applied 9680.patch (by Osku Salerma)
 2006-02-09 20:43:10 +03:00
jmiller@mysql.com
a66d8a5b3b test updates 2006-02-09 15:29:57 +01: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
110ac55e4b 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 15:13:20 +02:00
msvensson@neptunus.(none)
d1a7592a8a Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-09 13:30:34 +01:00
konstantin@mysql.com
2a267fed2f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-09 14:22:34 +03:00
jmiller@mysql.com
3c426cd787 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-02-09 12:15:42 +01:00
konstantin@mysql.com
e1f807af26 Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-09 13:35:59 +03:00
msvensson@neptunus.(none)
63aca4de7b Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-09 10:35:47 +01:00
msvensson@neptunus.(none)
63f9b6ce43 Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster 
into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster
 2006-02-09 10:31:35 +01:00
msvensson@neptunus.(none)
35fc3dcc99 Force stop of old cluster 2006-02-09 10:25:14 +01:00
msvensson@neptunus.(none)
74af19958e Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-09 09:57:07 +01:00
msvensson@neptunus.(none)
c2df73e2c2 Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster 
into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster
 2006-02-09 09:46:56 +01:00