- 04 Oct, 2006 2 commits
-
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug19356/my51-bug19356 BitKeeper/etc/collapsed: auto-union sql/sql_prepare.cc: Auto merged
-
unknown authored
The executing code had a safety assertion so that it refused to free Items that it didn't create. However, there is a case, undefined user variables, which would put Items into the list to be freed. Instead, do something that is more risky in expectation that the code will be refactored soon, as Kostja wants to do: Remove the assertions from prepare() and execute(). Put one assertion at a higher level, before stmt->set_params_from_vars(), which may then create new to-be-freed Items . mysql-test/r/ps_11bugs.result: Create tests to prove that undefined variables work, as keys and not, and that variables explicitly assigned to Null work. mysql-test/t/ps_11bugs.test: Create tests to prove that undefined variables work, as keys and not, and that variables explicitly assigned to Null work. sql/sql_prepare.cc: Move a safety assertion up one level and higher, because there is legitimately a case where thd->free_list is not NULL going into Prepared_statement::{prepare,execute} methods. Kostja plans to refactor this code so that it is both safe and works. (Now it works, but isn't very safe.)
-
- 29 Sep, 2006 9 commits
-
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778 mysql-test/r/warnings.result: Auto merged mysql-test/t/warnings.test: Auto merged sql/field.cc: Auto merged
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
-
unknown authored
mysql-test/r/partition.result: Altered results after errmsg update.
-
unknown authored
into rama.(none):/home/jimw/my/mysql-5.1-clean include/m_ctype.h: Auto merged include/m_string.h: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/opt_range.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/mysql_priv.h: Resolve conflict sql/mysqld.cc: Resolve conflict sql/set_var.cc: Resolve conflict sql/slave.h: Resolve conflict sql/sql_class.h: Resolve conflict
-
unknown authored
include/my_sys.h: Fix bad merge sql/set_var.cc: Fix bad __attribute__ usage.
-
unknown authored
into rama.(none):/home/jimw/my/mysql-5.0-clean include/m_ctype.h: Auto merged include/m_string.h: Auto merged include/my_global.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_class.h: Auto merged include/my_sys.h: Resolve conflict sql/mysql_priv.h: Resolve conflict sql/mysqld.cc: Resolve conflict sql/opt_range.cc: Resolve conflict sql/sql_acl.cc: Resolve conflict
-
unknown authored
into rama.(none):/home/jimw/my/mysql-5.1-clean
-
unknown authored
into rama.(none):/home/jimw/my/mysql-5.0-clean
-
- 28 Sep, 2006 29 commits
-
-
unknown authored
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
-
unknown authored
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my51-bug22224 BitKeeper/deleted/.del-CMakeLists.txt~1: Null Merge storage/innobase/include/univ.i: Null Merge
-
unknown authored
This change has already been made to 5.1. CMakeLists.txt: Removed dependancy on ib_config.h Added conditionals for InnoDB and BDB directories. innobase/include/univ.i: ib_config.h is not required for Windows.
-
unknown authored
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305 mysql-test/r/analyse.result: Auto merged sql/sql_analyse.cc: Auto merged
-
unknown authored
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305 mysql-test/r/analyse.result: Auto merged sql/sql_analyse.cc: Auto merged mysql-test/t/analyse.test: manual merge
-
unknown authored
mysql-test/r/analyse.result: Added Results mysql-test/t/analyse.test: Added test cases to make sure field_str and field_real return correctly. sql/sql_analyse.cc: According the manaul, when declaring a FLOAT(M, N), N equals the number of decimal places and M equals the total number of digits in the number.
-
unknown authored
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my51-bug21449 sql/stacktrace.c: Auto merged
-
unknown authored
sql/stacktrace.c: URL is case sensitive
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint include/mysql_com.h: Auto merged mysql-test/include/have_ndb.inc: Auto merged sql/mysql_priv.h: Auto merged sql/share/errmsg.txt: Auto merged support-files/mysql.spec.sh: Auto merged
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug21476/my51-bug21476 client/mysqltest.c: Auto merged
-
unknown authored
client/mysqltest.c: Free the dynstr.
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint client/mysql.cc: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged mysql-test/t/func_time.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_string.cc: Auto merged
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint mysql-test/r/func_time.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged mysql-test/t/func_time.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_string.cc: Auto merged strings/strtod.c: Auto merged client/mysql.cc: Manual merge. mysql-test/r/ctype_utf8.result: Manual merge.
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint include/mysql_com.h: Auto merged
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint extra/yassl/src/Makefile.am: Auto merged extra/yassl/taocrypt/benchmark/Makefile.am: Auto merged extra/yassl/taocrypt/src/Makefile.am: Auto merged extra/yassl/taocrypt/test/Makefile.am: Auto merged extra/yassl/testsuite/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/strict.result: Auto merged sql/Makefile.am: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged
-
unknown authored
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint BitKeeper/etc/ignore: auto-union netware/Makefile.am: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
-
unknown authored
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/work/my51-work mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
-
unknown authored
into mysql.com:/usr/home/ram/work/5.0-maint.b22227
-
unknown authored
into mysql.com:/home/cps/mysql/trees/5.1-runtime-new sql/handler.h: Auto merged sql/mysql_priv.h: Auto merged sql/sp.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_show.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_table.cc: Auto merged mysql-test/r/sp.result: manual merge mysql-test/t/sp.test: manual merge storage/csv/ha_tina.cc: manual merge storage/myisam/ha_myisam.cc: manual merge
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
-