mariadb

Tree: 565660edfa

Author	SHA1	Message	Date
Alexey Kopytov	321646095d	Fix for bug #41078 : With CURSOR_TYPE_READ_ONLY mysql_stmt_fetch() returns short string value. Multibyte character sets were not taken into account when calculating max_length in Item_param::convert_str_value(). As a result, string parameters of a prepared statement could be truncated later when calculating string length in characters by dividing length in bytes by the charset's mbmaxlen value (e.g. in Field_varstring::store()). Fixed by taking charset's mbmaxlen into account when calculating max_length in Item_param::convert_str_value(). sql/item.cc: Multiply string's length in characters by charset's mbmaxlen when calculating max_length. tests/mysql_client_test.c: Added a test case for bug #41078.	17 years ago
Mattias Jonsson	5f58510a09	Backport of test results for Bug#38719 from 6.0 to 5.1 post push fix, Bug#38719, additional test cases updated	17 years ago
Mattias Jonsson	830c42a06a	Backport of bug#38719 from 6.0 to 5.1 handler::get_dup_key used the called handler for the info call, but used table->file handler for errkey. Fixed by using table->file->info instead. mysql-test/r/partition_error.result: Bug#38719: Partitioning returns a different error code for a duplicate key error Added test for verification mysql-test/t/partition_error.test: Bug#38719: Partitioning returns a different error code for a duplicate key error Added test for verification	17 years ago
Mattias Jonsson	bf442fcaae	Backport of bug#36001 from 6.0 to 5.1	17 years ago
Mattias Jonsson	85cc17d3cd	Bug#36001: Partitions: spelling and using some error messages Backport from 6.0 Changed error message to show that it is partitioning that does not support foreign keys yet. Changed spelling from British english to American english. mysql-test/r/partition.result: Bug#36001: Partitions: spelling and using some error messages Backport from 6.0 Changed spelling from British english to American english. mysql-test/r/partition_mgm_err.result: Bug#36001: Partitions: spelling and using some error messages Backport from 6.0 Changed spelling from British english to American english. mysql-test/t/partition.test: Bug#36001: Partitions: spelling and using some error messages Backport from 6.0 Added test for verifying error message sql/share/errmsg.txt: Bug#36001: Partitions: spelling and using some error messages Backport from 6.0 Changed spelling from British english to American english. sql/sql_table.cc: Bug#36001: Partitions: spelling and using some error messages Backport from 6.0 Using a better error message.	17 years ago
Sergey Glukhov	d0ece331a2	5.0->bugteam->5.1-bugteam merge	17 years ago
Sergey Glukhov	ddf6ac40ea	automerge	17 years ago
Georgi Kodinov	0b87d4363b	merge of bug 26724 to 5.1-bugteam	17 years ago
Georgi Kodinov	41728a3104	Bug #26724 : mysql command line client, ignores input to internal cmd after space Removed the misleading "NOTE:" from the \h command. client/mysql.cc: Bug #26724: removed the misleading note from the \h command	17 years ago
Vladislav Vaintroub	93a5269618	merge	17 years ago
Sergey Glukhov	544fa7593b	Bug#25830 SHOW TABLE STATUS behaves differently depending on table name(for 5.0 only) replace wild_case_compare with my_wildcmp which is multibyte safe function mysql-test/r/lowercase_utf8.result: test result mysql-test/t/lowercase_utf8-master.opt: test case mysql-test/t/lowercase_utf8.test: test case sql/sql_show.cc: replace wild_case_compare with my_wildcmp which is multibyte safe function	17 years ago
Matthias Leich	fecaef26af	Merge of fix for Bug 42836 into GCA tree	17 years ago
Tatiana A. Nurnberg	ec8de22f9f	Bug#42027: Incorrect parsing of debug and verbose options for mysqldumpslow Options got normalised to long rather than short options since we gave primary name and alias in wrong order. Consequently querying for the option using the short options (the correct primary name) didn't work, rendering the options in question inaccessible. We restore the right order of the universe, or at least the alii for --debug and --verbose. scripts/mysqldumpslow.sh: Normalise --verbose/-v and --debug/-d to short options, not long options.	17 years ago
Andrei Elkin	924950b631	commenting windows disable for rpl_cross_version to relate to Bug #42879	17 years ago
Andrei Elkin	7cfdb74544	merging from 5.1-bt	17 years ago
Davi Arnaut	d3a10ec6ef	Bug#41077: Warning contains wrong future version Substitute all references of MySQL version "5.2" to "6.0" in deprecation warning messages.Deprecated constructs are being removed in the 6.0 tree.	17 years ago
Georgi Kodinov	ef14af3b15	merged 5.1-main -> 5.1-bugteam	17 years ago
Georgi Kodinov	aa0587b0cf	merged 5.0-bugteam -> 5.1-bugteam	17 years ago
Georgi Kodinov	e1a197caba	merged 5.1-main -> 5.1-bugteam	17 years ago
Andrei Elkin	cd1960ff26	rpl_cross_version.test is disable for win till a proper fixing bug#42451	17 years ago
Anurag Shekhar	dd83d6c230	Merging changes in branch.	17 years ago
Alexey Kopytov	d945db1ddd	Take additional precision into account	17 years ago
Alexey Kopytov	ff1e778cc5	Automerge.	17 years ago
Alexey Kopytov	65e2c68a4d	Fixed PB failures on IA64 hosts introduced by the patch for bug #21205 . mysql-test/t/gis.test: IA64 gcc backend lacks -fno-fused-madd option, so we have to adjust results.	17 years ago
Patrick Crews	3355ebff22	automerge	17 years ago
Alexey Kopytov	1cc7fbcd4e	Automerge.	17 years ago
Alexey Kopytov	4e356b1fe3	Added missing DROP TABLE to type_float.result. mysql-test/r/type_float.result: Added missing DROP TABLE.	17 years ago
Alexey Kopytov	6d1dc3270b	Fixed parser test failure introduced by the patch for bug #21205 . mysql-test/r/parser.result: Take additional precision into account.	17 years ago
Alexey Kopytov	8efeeb8bd2	Merge mysql-5.0-bugteam -> mysql-5.1-bugteam	17 years ago
Alexey Kopytov	9665fcfff3	Fixed several test failures in the funcs_1 suite introduced by the patch for bug #21205 . mysql-test/suite/funcs_1/r/memory_func_view.result: Take additional precision into account. mysql-test/suite/funcs_1/r/memory_views.result: Take additional precision into account. mysql-test/suite/funcs_1/r/myisam_func_view.result: Take additional precision into account. mysql-test/suite/funcs_1/r/myisam_views.result: Take additional precision into account.	17 years ago
Alexey Kopytov	b41215add2	Fixed bdb_gis and ndb_gis test failures in PB introduced by the patch for bug #21205 . mysql-test/r/bdb_gis.result: Take additional precision into account. mysql-test/r/ndb_gis.result: Take additional precision into account. mysql-test/t/type_float.test: Added missing DROP TABLE.	17 years ago
Ramil Kalimullin	c647f777b8	Auto-merge	17 years ago
Ramil Kalimullin	0e4333f6cc	Fix for bug#21476: stack overflow crashes server; error-message stack reservation too small Problem: some tests fail on HP-UX due to insufficient stack reservation. Fix: increase stack reservation. sql/mysql_priv.h: Fix for bug#21476: stack overflow crashes server; error-message stack reservation too small - raised STACK_MIN_SIZE to pass execution_constants.test on HP-UX.	17 years ago
Alexey Kopytov	d97de79b65	Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.	17 years ago
Alexey Kopytov	d8ac91387b	Merge from dev tree.	17 years ago
Alexey Kopytov	fb3e5910ec	Merge from dev tree.	17 years ago
Patrick Crews	aedef27a85	BUG#32667: lowercase_table3.test reports to error log Cleaned up SQL code in the test. Needed to move the FLUSH TABLES statement prior to the DROP TABLE t1 to prevent a warning of Table open on delete and a test fail.	17 years ago
Davi Arnaut	e0f56aa9e7	Empty merge.	17 years ago
Davi Arnaut	f29aa74aa1	Remove test case for bug 40264. Dirty close tricky does not work on Windows. mysql-test/r/query_cache_notembedded.result: Remove test case result. mysql-test/t/query_cache_notembedded.test: Remove test case.	17 years ago
Tatiana A. Nurnberg	ce6e5950bd	auto-merge	17 years ago
Matthias Leich	59c8a307fe	Fix for Bug#42836 Funcs_1 storedproc and storedproc_08 tests failing	17 years ago
Tatiana A. Nurnberg	694323952a	Bug#42146 - DATETIME fractional seconds parse error Bug#38435 - LONG Microseconds cause MySQL to fail a CAST to DATETIME or DATE Parsing of optional microsecond part in datetime did not fail gracefully when field width was larger than the allowed six places. Now handles up to the correct six places, and disregards any extra digits without messing up what we've already got. mysql-test/r/type_datetime.result: show graceful handling of overly long microsecond parts (correct truncation). mysql-test/t/type_datetime.test: show graceful handling of overly long microsecond parts (correct truncation). sql-common/my_time.c: Special case for time-parsing: for microsecond part, leading zeroes are actually meaningful! Also, don't break the entire date on more than the allowed six digits in microsecond part, just truncate the extra digits.	17 years ago
Alexey Kopytov	a41bdfa52a	Merge from team tree	17 years ago
Alexey Kopytov	dd35a152f9	Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.	17 years ago
Andrei Elkin	de9da6dd32	merging from the main to a local branch	17 years ago
Alexey Kopytov	9373b1b880	Merge from dev tree.	17 years ago
Rafal Somla	bdbe393db1	Modifications to MTR and mysqltest to improve feedback from the latter when testcase checks are made. MTR spawns mysqltest to run check-testcase test before and after each testcase it runs. It can also run check-warnings using mysqltest. Since it happened on PB that these checks hanged, this patch provides additional feedback to help investigating such failures: - mysqltest is modified to give feedback about main steps in execution of a testcase if run in verbose mode (including connection to the server), - MTR is modified to run mysqltest in verbose mode when doing check-testcase or check-warnings. The diagnostic output from mysqltest is preserved so that it is saved upon test failure. client/mysqltest.cc: Add verbose messages informing about main steps in execution of a testcase. mysql-test/mysql-test-run.pl: - When doing check-testcase or check-warnings run mysqltest in verbose mode. - Do not delete the mysqltest's error log if errors are detected during these	17 years ago
Matthias Leich	05b6c2713e	Merge 5.0 -> 5.1, in fact null merge because all modifications needed are alraedy in 5.1	17 years ago
Magnus Svensson	841145eed2	Merge	17 years ago
Matthias Leich	5d0054012d	Merge actual tree -> local GCA tree, no conflicts	17 years ago

1 2 3 4 5 ...

56505 Commits (565660edfa7b8da911ecd5ed2634f29a65a2950c) All Branches Search

56505 Commits (565660edfa7b8da911ecd5ed2634f29a65a2950c)

All Branches