database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-17 14:41:26 +03:00
Code
30,150 Commits 2,986 Branches 353 Tags
Commit Graph

9884 Commits

Author SHA1 Message Date
kent@mysql.com
9b14ee2ebc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-22 01:17:06 +01:00
patg@krsna.patg.net
4e666f2f99 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new
 2005-11-21 15:31:12 -08:00
patg@krsna.patg.net
88776a8244 BUG #14524 
Post-review fixes to original changeset http://lists.mysql.com/internals/32422
 2005-11-21 15:21:04 -08:00
bell@sanja.is.com.ua
fe44e364ca Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-21 21:14:36 +02:00
bell@sanja.is.com.ua
87a199fc2a Avoiding removing dummy TABLE allocated on the stack (BUG#14726). 2005-11-21 21:11:02 +02:00
bar@mysql.com
3d1c1d7f68 cast.result: 
Fixing test results accordingly.
item_timefunc.cc:
  Displaying BINARY or CHAR in error messages,
  depending on the character set.
 2005-11-21 21:11:28 +04:00
bar@mysql.com
435c2ba671 Additional fix for Bug#14255 CAST(x AS BINARY(N)) does not pad 
cast.result:
cast.test:
  Avoid 0x00 byte in test results, use HEX instead.
 2005-11-21 19:59:58 +04:00
bar@mysql.com
174d28e4cc Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b14255
 2005-11-21 17:57:14 +04:00
bar@mysql.com
2f72e05903 Bug#10446 Illegal mix of collations: 
item_strfunc.h, item_strfunc.cc, item.cc:
  Try to convert a const item into destination 
  character set. If conversion happens without
  data loss, then cache the converted value
  and return it during val_str().
  Otherwise, if conversion loses data, return
  Illeral mix of collations error, as it happened
  previously.
ctype_recoding.result, ctype_recoding.test:
  Fixing tests accordingly.
 2005-11-21 17:26:31 +04:00
aivanov@mysql.com
d741ce9017 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-14554
 2005-11-21 15:56:29 +03:00
msvensson@neptunus.(none)
e6331657a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-11-21 12:28:36 +01:00
msvensson@neptunus.(none)
9301123eb3 Bug #14514 Creating table with packed key fails silently 
- Backport from 5.0
 2005-11-21 12:27:58 +01:00
aivanov@mysql.com
9a7efe36c6 Fixed BUG #14554: mysqldump does not separate "ROW" and trigger 
statement for tables created in the IGNORE_SPACE sql mode.
 2005-11-21 13:36:48 +03:00
mskold@mysql.com
c38fa304c3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-11-21 10:46:17 +01:00
serg@serg.mylan
5663843d3b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-21 10:18:54 +01:00
mskold@mysql.com
efdef780bc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-21 08:42:36 +01:00
pekka@mysql.com
ce21b10258 ndb - bug#14007 5.1 (merge 5.0->5.1) 2005-11-20 11:15:13 +01:00
kent@mysql.com
521f4b61f2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 21:35:11 +01:00
guilhem@mysql.com
b3845d1f60 Fix after merge of 5.0 into 5.1. Failed tests before merge: bdb-deadlock, ndb_cache2, ndb_multi2, 
ps_6bdb (this one fails circa once over 4 runs). After the merge: the same PLUS mysql_client_test&sp (due to problem in fix of BUG#14845 which has also
been noticed in 5.0 too and Konstantin is looking at it) PLUS mysqlcheck (just consequence of mysql_client_test).
And a replication bugfix (thd->spcont must be taken into account when calling tables_ok(), as in 5.0,
and so some brackets were missing which changed one test).
Pekka will look at the NDB code where I just used "ul": ndb_charset test, and storage/ndb/src/kernel/vm/SimulatedBlock.cpp
and storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp (SimulatedBlock.hpp automerged);
please also check storage/ndb/src/ndbapi/NdbRecAttr.cpp. Petr please check ha_tina.cc.
 2005-11-19 15:56:55 +01:00
dlenev@mysql.com
d1eb512948 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13825
 2005-11-19 15:11:57 +03:00
dlenev@mysql.com
574e711209 Fix for bug #13825 "Triggers: crash if release savepoint" and for general 
handling of savepoints in stored routines.

Fixed ha_rollback_to_savepoint()/ha_savepoint()/ha_release_savepoint()
functions to properly handle savepoints inside of stored functions and
triggers.
Also now when we invoke stored function or trigger we create new savepoint
level. We destroy it at the end of function/trigger execution and return back
to old savepoint level.
 2005-11-19 15:09:23 +03:00
guilhem@mysql.com
a7c3aed5f4 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
 2005-11-19 13:06:16 +01:00
kent@mysql.com
bcdd552d6e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 11:20:52 +01:00
kent@mysql.com
bd80dc6c2e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-19 11:11:09 +01:00
guilhem@mysql.com
24006266d0 Merge mysql.com:/home/mysql_src/mysql-5.0-van 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).
 2005-11-19 10:43:28 +01:00
patg@krsna.patg.net
f6cd0148b8 BUG #14524 
Patch that fixes crashing when partition uses blackole for 
underlying tables.
 2005-11-18 17:02:27 -08:00
konstantin@mysql.com
86f1896fb0 Bug#13510 "Setting password local variable changes current 
password": additional fix, also make sure that a syntax error is 
returned for set names="foo" when there is no such variable or no
stored procedure.
 2005-11-19 01:22:12 +03:00
konstantin@mysql.com
a86eaaf5c3 A test case for Bug#8568 "GROUP_CONCAT returns string, unless in 
a UNION in which case returns BLOB". The bug is not present anymore.
 2005-11-18 23:46:04 +03:00
evgen@moonbone.local
c9ab4d614e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13622-bug-5.0-mysql
 2005-11-18 22:11:34 +03:00
pem@mysql.com
4513ffd109 Removed forgotten test line in sp-code.test. 2005-11-18 18:05:04 +01:00
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
 2005-11-18 16:38:01 +01:00
pem@mysql.com
3a832faafe Post-review fixes, mainly fixing all print() methods for sp_instr* classes. 
Also added mysql-test files:
 include/is_debug_build.inc
 r/is_debug_build.require
 r/sp-code.result
 t/sp-code.test
 2005-11-18 16:30:27 +01:00
konstantin@mysql.com
159bf8832e A test case for Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA 
when COUNT(*) is 0". The bug itself cannot be repeated.
 2005-11-18 17:55:52 +03:00
mskold@mysql.com
ab812dd5d8 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-11-18 15:54:53 +01:00
mskold@mysql.com
38878cd724 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-11-18 15:51:15 +01:00
evgen@moonbone.local
badc2668ce Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13622-bug-5.0-mysql
 2005-11-18 17:26:44 +03:00
jimw@mysql.com
385082ede0 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-18 05:24:29 -08:00
konstantin@mysql.com
c20fe5dffd More authors. 2005-11-18 14:39:44 +03:00
mskold@mysql.com
16fcccce1a Disabled --ps-protocol during autodiscover test 2005-11-18 12:20:22 +01:00
mskold@mysql.com
2237d9b745 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-18 10:14:27 +01:00
mskold@mysql.com
96413a44d1 Using new error code HA_ERR_TABLE_DEF_CHANGED to signal wrong schema version of table 2005-11-18 09:54:49 +01:00
timour@mysql.com
9a644b948c WL#2486 - natural/using joins according to SQL:2003. 
Enabled view tests that didn't work before.
 2005-11-18 10:51:46 +02:00
igor@rurik.mysql.com
a0744fba27 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-11-17 20:26:34 -08:00
jimw@mysql.com
2ff5c55896 Fix mix_innodb_myisam_binlog test and results after merge 2005-11-17 20:17:49 -08:00
omer@mysql.com
46f140deb3 Updated authors.h file (and show_check.result file) to include QA team members 
Note: This change was reviewed by Brian before the commit.
 2005-11-17 17:35:50 -08:00
evgen@moonbone.local
a031778955 Manually merged 2005-11-18 01:16:15 +03:00
serg@serg.mylan
e0abc22bfc BUG#13406 - incorrect amount of "records deleted" in CSV. 
Fallback to row-wise delete if number or rows in the table is unknown
 2005-11-17 22:52:31 +01:00
jimw@mysql.com
f8ce7bc01e Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-17 13:37:30 -08:00
mskold@mysql.com
8ca38a90ad Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-11-17 15:38:15 +01:00
ingo@production.mysql.com
a7daeaf64f Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-4.1
 2005-11-17 13:44:34 +01:00